用户 JVM 参数优先于默认参数 (#903)

* close #885: use the GC selected by user by default

* fix: default JVM args conflict with user args

* Options take precedence over JVM args

* compile huge methods by default

* update settings.advanced.jvm_args text

* Using JVM args suppression options

* update settings.advanced.jvm_args text
This commit is contained in:
Glavo
2021-07-10 23:10:04 +08:00
committed by GitHub
parent 378fd04463
commit afe6bc7456
6 changed files with 105 additions and 38 deletions

View File

@@ -364,7 +364,7 @@ settings.advanced.dont_check_jvm_validity=Don't check whether JVM can launch the
settings.advanced.game_dir.default=Standard (.minecraft/)
settings.advanced.game_dir.independent=Independent (.minecraft/versions/<version name>/, except for assets and libraries)
settings.advanced.java_permanent_generation_space=PermGen Space/MB
settings.advanced.jvm_args=Java VM Arguments
settings.advanced.jvm_args=Java VM Arguments (overriding defaults)
settings.advanced.launcher_visibility.close=Close the launcher when the game launched.
settings.advanced.launcher_visibility.hide=Hide the launcher when the game launched.
settings.advanced.launcher_visibility.hide_and_reopen=Hide the launcher and re-open when game closes.

View File

@@ -335,7 +335,7 @@ settings.advanced.dont_check_jvm_validity=No verificar si JVM puede lanzar el ju
settings.advanced.game_dir.default=Por defecto (.minecraft/)
settings.advanced.game_dir.independent=Independiente (.minecraft/versions/<version name>/, excepto assets,libraries)
settings.advanced.java_permanent_generation_space=PermGen Space/MB
settings.advanced.jvm_args=Java VM Arguments
settings.advanced.jvm_args=Java VM Arguments (overriding defaults)
settings.advanced.launcher_visibility.close=Cerrar launcher cuando juego es iniciado.
settings.advanced.launcher_visibility.hide=Esconder launcher cuando juego is iniciado.
settings.advanced.launcher_visibility.hide_and_reopen=Esconder launcher y reabrir cuando juego cierre.

View File

@@ -358,7 +358,7 @@ settings.advanced.dont_check_jvm_validity=不檢查 JVM 與遊戲的相容性
settings.advanced.game_dir.default=預設(.minecraft/
settings.advanced.game_dir.independent=各版本獨立(.minecraft/versions/<版本名>/,除 assets、libraries
settings.advanced.java_permanent_generation_space=記憶體永久儲存區域(不必填寫,格式: MB
settings.advanced.jvm_args=Java 虛擬機參數(不必填寫)
settings.advanced.jvm_args=Java 虛擬機參數(不必填寫,覆蓋默認設置
settings.advanced.launcher_visibility.close=遊戲啟動後結束啟動器
settings.advanced.launcher_visibility.hide=遊戲啟動後隱藏啟動器
settings.advanced.launcher_visibility.hide_and_reopen=隱藏啟動器並在遊戲結束後重新開啟

View File

@@ -364,7 +364,7 @@ settings.advanced.dont_check_jvm_validity=不检查 JVM 与游戏的兼容性
settings.advanced.game_dir.default=默认(.minecraft/
settings.advanced.game_dir.independent=各版本独立(.minecraft/versions/<版本名>/,除 assets、libraries
settings.advanced.java_permanent_generation_space=内存永久保存区域(不必填写,单位 MB
settings.advanced.jvm_args=Java 虚拟机参数(不必填写)
settings.advanced.jvm_args=Java 虚拟机参数(不必填写,覆盖默认设置
settings.advanced.launcher_visibility.close=游戏启动后结束启动器
settings.advanced.launcher_visibility.hide=游戏启动后隐藏启动器
settings.advanced.launcher_visibility.hide_and_reopen=隐藏启动器并在游戏结束后重新打开