ResolveConflict

This commit is contained in:
Polaris_Light 2023-11-24 21:58:55 +08:00
parent 4fc1aacca5
commit 8dfcf9c5d5
2 changed files with 2003 additions and 2002 deletions

View file

@ -724,7 +724,7 @@ Usage examples: "/tell &lt;mybot&gt; connect Server1", "/connect Server2"</value
<value>Microsoft Account sign-in method: "mcc" OR "browser". If the login always fails, please try to use the "browser" once.</value>
</data>
<data name="Main.General.server_info" xml:space="preserve">
<value>Account type: "mojang" OR "microsoft" OR "yggdrasil". Also affects interactive login in console.</value>
<value>Account type: "mojang" OR "microsoft". Also affects interactive login in console.</value>
</data>
<data name="MCSettings" xml:space="preserve">
<value>Settings below are sent to the server and only affect server-side things like your skin.</value>
@ -843,10 +843,10 @@ If the connection to the Minecraft game server is blocked by the firewall, set E
<data name="ChatBot.WebSocketBot.DebugMode" xml:space="preserve">
<value>This setting is for developers who are developing a library that uses this chat bot to remotely execute procedures/commands/functions.</value>
</data>
<data name="ChatBot.WebSocketBot.AllowIpAlias" xml:space="preserve">
<value>Allow IP aliases, such as "localhost" or if using containers then the container name can be used...</value>
</data>
<data name="Main.Advanced.ignore_invalid_playername" xml:space="preserve">
<value>Ignore invalid player name</value>
</data>
<data name="Main.General.AuthlibServer" xml:space="preserve">
<value>Yggdrasil authlib server domain name and port.</value>
</data>
</root>