[ANY] Слияние ветки dev с feature/autoZip

This commit is contained in:
Zaxar163 2019-07-04 13:06:20 +03:00
commit 20a6838fd3

View file

@ -503,6 +503,7 @@ public LaunchServer(Path dir, boolean testEnv, String[] args) throws IOException
ProtectHandler.registerHandlers(); ProtectHandler.registerHandlers();
WebSocketService.registerResponses(); WebSocketService.registerResponses();
HWIDProvider.registerHWIDs(); HWIDProvider.registerHWIDs();
DaoProvider.registerProviders();
//LaunchServer.server = this; //LaunchServer.server = this;
// Set command handler // Set command handler
@ -722,7 +723,7 @@ private void generateConfigIfNotExists(boolean testEnv) throws IOException {
// Create new config // Create new config
LogHelper.info("Creating LaunchServer config"); LogHelper.info("Creating LaunchServer config");
Config newConfig = new Config(); Config newConfig = new Config();
newConfig.mirrors = new String[]{"http://mirror.gravitlauncher.ml/", "https://mirror.gravit.pro/"}; newConfig.mirrors = new String[]{"https://mirror.gravit.pro/"};
newConfig.launch4j = new ExeConf(); newConfig.launch4j = new ExeConf();
newConfig.launch4j.enabled = true; newConfig.launch4j.enabled = true;
newConfig.launch4j.copyright = "© GravitLauncher Team"; newConfig.launch4j.copyright = "© GravitLauncher Team";