Merge branch 'main' into optimize

This commit is contained in:
ShirosakiMio 2024-08-19 13:14:51 +08:00
commit ea98cb3ae9
3 changed files with 3 additions and 3 deletions

View File

@ -296,7 +296,7 @@ public final class VersionSetting implements Cloneable {
beGestureProperty.set(beGesture); beGestureProperty.set(beGesture);
} }
private final BooleanProperty VKDriverSystemProperty = new SimpleBooleanProperty(this, "vulkanDriverSystem", true); private final BooleanProperty VKDriverSystemProperty = new SimpleBooleanProperty(this, "vulkanDriverSystem", false);
public BooleanProperty VKDriverSystemProperty() { public BooleanProperty VKDriverSystemProperty() {
return VKDriverSystemProperty; return VKDriverSystemProperty;

View File

@ -67,7 +67,7 @@
<string name="account_methods_microsoft_error_country_unavailable">Xbox Live 不支持您所在的国家/地区。</string> <string name="account_methods_microsoft_error_country_unavailable">Xbox Live 不支持您所在的国家/地区。</string>
<string name="account_methods_microsoft_error_missing_xbox_account">你的微软账户没有链接到 Xbox 账户,请先创建。</string> <string name="account_methods_microsoft_error_missing_xbox_account">你的微软账户没有链接到 Xbox 账户,请先创建。</string>
<string name="account_methods_microsoft_error_unknown">登录失败</string> <string name="account_methods_microsoft_error_unknown">登录失败</string>
<string name="account_methods_microsoft_error_wrong_verify_method">请在 Microsoft 账户登陆页面使用账户 + 密码登录。请不要使用验证码登录。</string> <string name="account_methods_microsoft_error_wrong_verify_method">请在 Microsoft 账户登陆页面使用账户(非Outlook邮箱一般是手机号) + 密码登录。请不要使用验证码登录。</string>
<string name="account_methods_microsoft_error_no_character">你的账户尚未获取 Minecraft : Java Edition</string> <string name="account_methods_microsoft_error_no_character">你的账户尚未获取 Minecraft : Java Edition</string>
<string name="account_methods_microsoft_error_add_family_probably">请检查并确保年龄设置大于 18 岁。</string> <string name="account_methods_microsoft_error_add_family_probably">请检查并确保年龄设置大于 18 岁。</string>
<string name="account_methods_microsoft_close_page">Microsoft 账户登录完成</string> <string name="account_methods_microsoft_close_page">Microsoft 账户登录完成</string>

View File

@ -81,7 +81,7 @@
<string name="account_methods_microsoft_error_country_unavailable">Xbox Live is not available in your current country/region.</string> <string name="account_methods_microsoft_error_country_unavailable">Xbox Live is not available in your current country/region.</string>
<string name="account_methods_microsoft_error_missing_xbox_account">Your Microsoft account does not have a linked Xbox account yet. Please create one before continuing.</string> <string name="account_methods_microsoft_error_missing_xbox_account">Your Microsoft account does not have a linked Xbox account yet. Please create one before continuing.</string>
<string name="account_methods_microsoft_error_unknown">Failed to log in</string> <string name="account_methods_microsoft_error_unknown">Failed to log in</string>
<string name="account_methods_microsoft_error_wrong_verify_method">Please log in using your account and password on the Microsoft account login page. Please do not use a verification code to log in.</string> <string name="account_methods_microsoft_error_wrong_verify_method">Please log in using your account(like phone number) and password on the Microsoft account login page. Please do not use a verification code to log in.</string>
<string name="account_methods_microsoft_error_no_character">Your account does not own the Minecraft Java Edition.\nThe game profile may not have been created.</string> <string name="account_methods_microsoft_error_no_character">Your account does not own the Minecraft Java Edition.\nThe game profile may not have been created.</string>
<string name="account_methods_microsoft_error_add_family_probably">Please check if the age indicated in your account settings is at least 18 years old. If not and you believe this is an error, you can go to official website to change it.</string> <string name="account_methods_microsoft_error_add_family_probably">Please check if the age indicated in your account settings is at least 18 years old. If not and you believe this is an error, you can go to official website to change it.</string>
<string name="account_methods_microsoft_close_page">Microsoft account authorization is now completed.</string> <string name="account_methods_microsoft_close_page">Microsoft account authorization is now completed.</string>