mirror of
https://github.com/GravitLauncher/Launcher
synced 2024-11-15 11:39:11 +03:00
Merge tag 'v5.5.3' into dev
5.5.3 stable
This commit is contained in:
commit
967b81cc85
5 changed files with 8 additions and 3 deletions
|
@ -124,6 +124,10 @@ public static ClientProfile makeProfile(ClientProfile.Version version, String ti
|
||||||
builder.setMinJavaVersion(17);
|
builder.setMinJavaVersion(17);
|
||||||
builder.setRecommendJavaVersion(17);
|
builder.setRecommendJavaVersion(17);
|
||||||
}
|
}
|
||||||
|
if(version.compareTo(ClientProfileVersions.MINECRAFT_1_20_3) >= 0) {
|
||||||
|
builder.setMinJavaVersion(21);
|
||||||
|
builder.setRecommendJavaVersion(21);
|
||||||
|
}
|
||||||
jvmArgs.add("-Dfml.ignorePatchDiscrepancies=true");
|
jvmArgs.add("-Dfml.ignorePatchDiscrepancies=true");
|
||||||
jvmArgs.add("-Dfml.ignoreInvalidMinecraftCertificates=true");
|
jvmArgs.add("-Dfml.ignoreInvalidMinecraftCertificates=true");
|
||||||
builder.setJvmArgs(jvmArgs);
|
builder.setJvmArgs(jvmArgs);
|
||||||
|
|
|
@ -17,4 +17,5 @@ private ClientProfileVersions() {
|
||||||
public static final ClientProfile.Version MINECRAFT_1_19 = ClientProfile.Version.of("1.19");
|
public static final ClientProfile.Version MINECRAFT_1_19 = ClientProfile.Version.of("1.19");
|
||||||
public static final ClientProfile.Version MINECRAFT_1_20 = ClientProfile.Version.of("1.20");
|
public static final ClientProfile.Version MINECRAFT_1_20 = ClientProfile.Version.of("1.20");
|
||||||
public static final ClientProfile.Version MINECRAFT_1_20_2 = ClientProfile.Version.of("1.20.2");
|
public static final ClientProfile.Version MINECRAFT_1_20_2 = ClientProfile.Version.of("1.20.2");
|
||||||
|
public static final ClientProfile.Version MINECRAFT_1_20_3 = ClientProfile.Version.of("1.20.3");
|
||||||
}
|
}
|
||||||
|
|
|
@ -8,7 +8,7 @@ public final class Version implements Comparable<Version> {
|
||||||
public static final int MINOR = 5;
|
public static final int MINOR = 5;
|
||||||
public static final int PATCH = 3;
|
public static final int PATCH = 3;
|
||||||
public static final int BUILD = 1;
|
public static final int BUILD = 1;
|
||||||
public static final Version.Type RELEASE = Type.DEV;
|
public static final Version.Type RELEASE = Type.STABLE;
|
||||||
public final int major;
|
public final int major;
|
||||||
public final int minor;
|
public final int minor;
|
||||||
public final int patch;
|
public final int patch;
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
id 'org.openjfx.javafxplugin' version '0.0.10' apply false
|
id 'org.openjfx.javafxplugin' version '0.0.10' apply false
|
||||||
}
|
}
|
||||||
group = 'pro.gravit.launcher'
|
group = 'pro.gravit.launcher'
|
||||||
version = '5.5.3-SNAPSHOT'
|
version = '5.5.3'
|
||||||
|
|
||||||
apply from: 'props.gradle'
|
apply from: 'props.gradle'
|
||||||
|
|
||||||
|
|
2
modules
2
modules
|
@ -1 +1 @@
|
||||||
Subproject commit 4d376aa6fcb2167cef2fc5ed373d560ebea6e483
|
Subproject commit 7581b6c01470a5ec32ac67170635d10f6f589b0a
|
Loading…
Reference in a new issue