Merge branch 'release/1.2.1'

GravitLauncher · May 8, 2020 · 4f42e18 · 4f42e18
2 parents 0476c88 + 80a70c2
commit 4f42e18
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 1 deletion.
diff --git a/compat/lang/runtime_en.properties b/compat/lang/runtime_en.properties
@@ -96,6 +96,7 @@ runtime.overlay.debug.debug.killTooltip=kill process
 runtime.overlay.debug.debug.version=
 runtime.overlay.debug.debug.hideTooltip=Hide
 runtime.overlay.debug.debug.closeTooltip=Close
+runtime.overlay.debug.debug.backTooltip=Back
 ###Console
 runtime.scenes.console.console.headingConsole=Console
 runtime.scenes.console.console.hideTooltip=Hide

diff --git a/compat/lang/runtime_ru.properties b/compat/lang/runtime_ru.properties
@@ -96,6 +96,7 @@ runtime.overlay.debug.debug.killTooltip=Убить процесс
 runtime.overlay.debug.debug.version=
 runtime.overlay.debug.debug.hideTooltip=Свернуть
 runtime.overlay.debug.debug.closeTooltip=Закрыть
+runtime.overlay.debug.debug.backTooltip=Назад
 ###Console
 runtime.scenes.console.console.headingConsole=КОНСОЛЬ
 runtime.scenes.console.console.hideTooltip=Свернуть

diff --git a/runtime/runtime_en.properties b/runtime/runtime_en.properties
@@ -96,6 +96,7 @@ runtime.overlay.debug.debug.killTooltip=kill process
 runtime.overlay.debug.debug.version=
 runtime.overlay.debug.debug.hideTooltip=Hide
 runtime.overlay.debug.debug.closeTooltip=Close
+runtime.overlay.debug.debug.backTooltip=Back
 ###Console
 runtime.scenes.console.console.headingConsole=Console
 runtime.scenes.console.console.hideTooltip=Hide

diff --git a/runtime/runtime_ru.properties b/runtime/runtime_ru.properties
@@ -96,6 +96,7 @@ runtime.overlay.debug.debug.killTooltip=\u0423\u0431\u0438\u0442\u044c \u043f\u0
 runtime.overlay.debug.debug.version=
 runtime.overlay.debug.debug.hideTooltip=\u0421\u0432\u0435\u0440\u043d\u0443\u0442\u044c
 runtime.overlay.debug.debug.closeTooltip=\u0417\u0430\u043a\u0440\u044b\u0442\u044c
+runtime.overlay.debug.debug.backTooltip=\u041d\u0430\u0437\u0430\u0434
 ###Console
 runtime.scenes.console.console.headingConsole=\u041a\u041e\u041d\u0421\u041e\u041b\u042c
 runtime.scenes.console.console.hideTooltip=\u0421\u0432\u0435\u0440\u043d\u0443\u0442\u044c

diff --git a/src/main/java/pro/gravit/launcher/client/JavaRuntimeModule.java b/src/main/java/pro/gravit/launcher/client/JavaRuntimeModule.java
@@ -21,7 +21,7 @@ public class JavaRuntimeModule extends LauncherModule {
     private RuntimeProvider provider;
 
     public JavaRuntimeModule() {
-        super(new LauncherModuleInfo("StdJavaRuntime", new Version(1, 2, 0, 1, Version.Type.STABLE),
+        super(new LauncherModuleInfo("StdJavaRuntime", new Version(1, 2, 1, 1, Version.Type.STABLE),
                 0, new String[]{}, new String[]{"runtime"}));
     }