Lanmikeman/Launcher
1
1
Fork 0
mirror of https://github.com/GravitLauncher/Launcher synced 2025-01-09 00:59:44 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge tag 'v5.2.8' into dev

Browse source 
5.2.8-stable
This commit is contained in:
Gravita 2022-01-12 20:46:07 +07:00
commit 7bfa6f116b
4 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
LaunchServer/src/main/java/pro/gravit/launchserver/config/LaunchServerConfig.java
View file

@ -50,7 +50,7 @@ public final class LaunchServerConfig {
public static LaunchServerConfig getDefault(LaunchServer.LaunchServerEnv env) {
LaunchServerConfig newConfig = new LaunchServerConfig();
newConfig.mirrors = new String[]{"https://mirror.gravit.pro/new/", "https://gravit-launcher-mirror.storage.googleapis.com/"};
newConfig.mirrors = new String[]{"https://mirror.gravit.pro/5.2.x/", "https://gravit-launcher-mirror.storage.googleapis.com/"};
newConfig.launch4j = new LaunchServerConfig.ExeConf();
newConfig.launch4j.enabled = true;
newConfig.launch4j.copyright = "© GravitLauncher Team";
@ -169,6 +169,18 @@ public void verify() {
if (netty == null) {
throw new NullPointerException("Netty must not be null");
}
// Mirror check
{
boolean updateMirror = Boolean.getBoolean("launchserver.config.disableUpdateMirror");
if(!updateMirror) {
for(int i=0;i < mirrors.length;++i) {
if("https://mirror.gravit.pro/".equals(mirrors[i])) {
logger.warn("Replace mirror 'https://mirror.gravit.pro/' to 'https://mirror.gravit.pro/5.2.x/'. If you really need to use original url, use '-Dlaunchserver.config.disableUpdateMirror=true'");
mirrors[i] = "https://mirror.gravit.pro/5.2.x/";
}
}
}
}
}
public void init(LaunchServer.ReloadType type) {

2
LauncherCore/src/main/java/pro/gravit/utils/Version.java
View file

@ -8,7 +8,7 @@ public final class Version implements Comparable<Version> {
public static final int MINOR = 2;
public static final int PATCH = 8;
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 minor;
public final int patch;

2
build.gradle
View file

@ -5,7 +5,7 @@
id 'org.openjfx.javafxplugin' version '0.0.10' apply false
}
group = 'pro.gravit.launcher'
version = '5.2.8-SNAPSHOT'
version = '5.2.8'
apply from: 'props.gradle'

2
modules

@ -1 +1 @@
Subproject commit ee05cd47536e7a364010ea198e758e08648597b6
Subproject commit 4eb5b32678202efcff2d7cf8f87bdf32eab5384d