From f9066d178254191899735f0b24e9b7dc54ea7649 Mon Sep 17 00:00:00 2001 From: Gravit Date: Sun, 27 Sep 2020 01:22:00 +0700 Subject: [PATCH 1/3] [ANY] 5.1.8-dev to 5.1.8-beta --- LauncherCore/src/main/java/pro/gravit/utils/Version.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LauncherCore/src/main/java/pro/gravit/utils/Version.java b/LauncherCore/src/main/java/pro/gravit/utils/Version.java index dca8527d..42cf840e 100644 --- a/LauncherCore/src/main/java/pro/gravit/utils/Version.java +++ b/LauncherCore/src/main/java/pro/gravit/utils/Version.java @@ -8,7 +8,7 @@ public final class Version { public static final int MINOR = 1; 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.BETA; public final int major; public final int minor; public final int patch; From fe00a62971e46124801f658315736380c928309f Mon Sep 17 00:00:00 2001 From: Gravit Date: Tue, 29 Sep 2020 01:08:05 +0700 Subject: [PATCH 2/3] [FIX] SecurityCheckCommand fix --- .../launchserver/command/service/SecurityCheckCommand.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/command/service/SecurityCheckCommand.java b/LaunchServer/src/main/java/pro/gravit/launchserver/command/service/SecurityCheckCommand.java index e0af9f4f..fea875b8 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/command/service/SecurityCheckCommand.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/command/service/SecurityCheckCommand.java @@ -149,19 +149,19 @@ public void invoke(String... args) throws Exception { boolean bad = false; String profileModuleName = String.format("profiles.%s", profile.getTitle()); for (String exc : profile.getUpdateExclusions()) { - StringTokenizer tokenizer = new StringTokenizer(exc, "\\/"); + StringTokenizer tokenizer = new StringTokenizer(exc, "/"); if (exc.endsWith(".jar")) { printCheckResult(LogHelper.Level.INFO, profileModuleName, String.format("updateExclusions %s not safe. Cheats may be injected very easy!", exc), false); bad = true; continue; } if (tokenizer.hasMoreTokens() && tokenizer.nextToken().equals("mods")) { + String nextToken = tokenizer.nextToken(); if (!tokenizer.hasMoreTokens()) { printCheckResult(LogHelper.Level.INFO, profileModuleName, String.format("updateExclusions %s not safe. Cheats may be injected very easy!", exc), false); bad = true; } else { - String nextToken = tokenizer.nextToken(); - if (nextToken.equals("memory_repo") || nextToken.equals("1.12.2") || nextToken.equals("1.7.10")) { + if (nextToken.equals("memory_repo") || nextToken.equals(profile.getVersion().name)) { printCheckResult(LogHelper.Level.INFO, profileModuleName, String.format("updateExclusions %s not safe. Cheats may be injected very easy!", exc), false); bad = true; } From a555f1b1d9dc544c28520563a253916f29de0bd9 Mon Sep 17 00:00:00 2001 From: Gravit Date: Tue, 29 Sep 2020 01:32:19 +0700 Subject: [PATCH 3/3] [FIX] 5.1.8-stable --- LaunchServer/build.gradle | 12 ++++++++++++ Launcher/build.gradle | 12 ++++++++++++ LauncherAPI/build.gradle | 12 ++++++++++++ LauncherCore/build.gradle | 12 ++++++++++++ .../src/main/java/pro/gravit/utils/Version.java | 2 +- ServerWrapper/build.gradle | 12 ++++++++++++ build.gradle | 2 +- 7 files changed, 62 insertions(+), 2 deletions(-) diff --git a/LaunchServer/build.gradle b/LaunchServer/build.gradle index c5c478ec..e61c4063 100644 --- a/LaunchServer/build.gradle +++ b/LaunchServer/build.gradle @@ -186,6 +186,18 @@ task dumpClientLibs(type: Copy) { url = 'https://www.gnu.org/licenses/gpl-3.0.html' } } + developers { + developer { + id = 'gravita' + name = 'Gravita' + email = 'gravita@gravit.pro' + } + developer { + id = 'zaxar163' + name = 'Zaxar163' + email = 'zahar.vcherachny@yandex.ru' + } + } scm { connection = 'scm:git:https://github.com/GravitLauncher/Launcher.git' diff --git a/Launcher/build.gradle b/Launcher/build.gradle index 43be3243..ca8c804a 100644 --- a/Launcher/build.gradle +++ b/Launcher/build.gradle @@ -94,6 +94,18 @@ task dumpLibs(type: Copy) { url = 'https://www.gnu.org/licenses/gpl-3.0.html' } } + developers { + developer { + id = 'gravita' + name = 'Gravita' + email = 'gravita@gravit.pro' + } + developer { + id = 'zaxar163' + name = 'Zaxar163' + email = 'zahar.vcherachny@yandex.ru' + } + } scm { connection = 'scm:git:https://github.com/GravitLauncher/Launcher.git' developerConnection = 'scm:git:ssh://git@github.com:GravitLauncher/Launcher.git' diff --git a/LauncherAPI/build.gradle b/LauncherAPI/build.gradle index 88896a32..6aedb815 100644 --- a/LauncherAPI/build.gradle +++ b/LauncherAPI/build.gradle @@ -66,6 +66,18 @@ task javadocJar(type: Jar) { url = 'https://www.gnu.org/licenses/gpl-3.0.html' } } + developers { + developer { + id = 'gravita' + name = 'Gravita' + email = 'gravita@gravit.pro' + } + developer { + id = 'zaxar163' + name = 'Zaxar163' + email = 'zahar.vcherachny@yandex.ru' + } + } scm { connection = 'scm:git:https://github.com/GravitLauncher/Launcher.git' developerConnection = 'scm:git:ssh://git@github.com:GravitLauncher/Launcher.git' diff --git a/LauncherCore/build.gradle b/LauncherCore/build.gradle index 04b3b796..50eda309 100644 --- a/LauncherCore/build.gradle +++ b/LauncherCore/build.gradle @@ -71,6 +71,18 @@ task javadocJar(type: Jar) { url = 'https://www.gnu.org/licenses/gpl-3.0.html' } } + developers { + developer { + id = 'gravita' + name = 'Gravita' + email = 'gravita@gravit.pro' + } + developer { + id = 'zaxar163' + name = 'Zaxar163' + email = 'zahar.vcherachny@yandex.ru' + } + } scm { connection = 'scm:git:https://github.com/GravitLauncher/Launcher.git' developerConnection = 'scm:git:ssh://git@github.com:GravitLauncher/Launcher.git' diff --git a/LauncherCore/src/main/java/pro/gravit/utils/Version.java b/LauncherCore/src/main/java/pro/gravit/utils/Version.java index 42cf840e..6198a0fb 100644 --- a/LauncherCore/src/main/java/pro/gravit/utils/Version.java +++ b/LauncherCore/src/main/java/pro/gravit/utils/Version.java @@ -8,7 +8,7 @@ public final class Version { public static final int MINOR = 1; public static final int PATCH = 8; public static final int BUILD = 1; - public static final Version.Type RELEASE = Type.BETA; + public static final Version.Type RELEASE = Type.STABLE; public final int major; public final int minor; public final int patch; diff --git a/ServerWrapper/build.gradle b/ServerWrapper/build.gradle index b99abe6b..e4bbfdb0 100644 --- a/ServerWrapper/build.gradle +++ b/ServerWrapper/build.gradle @@ -68,6 +68,18 @@ pack project(':LauncherAuthlib') url = 'https://www.gnu.org/licenses/gpl-3.0.html' } } + developers { + developer { + id = 'gravita' + name = 'Gravita' + email = 'gravita@gravit.pro' + } + developer { + id = 'zaxar163' + name = 'Zaxar163' + email = 'zahar.vcherachny@yandex.ru' + } + } scm { connection = 'scm:git:https://github.com/GravitLauncher/Launcher.git' diff --git a/build.gradle b/build.gradle index 849539f4..01c64481 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ id 'org.openjfx.javafxplugin' version '0.0.8' apply false } group = 'pro.gravit.launcher' -version = '5.1.8-SNAPSHOT' +version = '5.1.8' apply from: 'props.gradle'