helpy4/Minecraft-Console-Client
1
0
Fork 0
mirror of https://github.com/MCCTeam/Minecraft-Console-Client synced 2025-10-14 21:22:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ResolveConflict

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

23
MinecraftClient/Resources/ConfigComments/ConfigComments.Designer.cs generated
View file

@ -799,7 +799,8 @@ namespace MinecraftClient {
///NOTE: This is an experimental feature, the bot can be slow at times, you need to walk with a normal speed and to sometimes stop for it to be able to keep up with you
///It's similar to making animals follow you when you're holding food in your hand.
///This is due to a slow pathfinding algorithm, we're working on getting a better one
///You can tweak the update limit and find what works best for you. (NOTE: Do not but a very low one, because you might achieve the opposite, /// [rest of string was truncated]";.
///You can tweak the update limit and find what works best for you. (NOTE: Do not but a very low one, because you might achieve the opposite,
/// [rest of string was truncated]";.
/// </summary>
internal static string ChatBot_FollowPlayer {
get {
@ -1128,6 +1129,15 @@ namespace MinecraftClient {
}
}
/// <summary>
/// Looks up a localized string similar to Allow IP aliases, such as "localhost" or if using containers then the container name can be used...
/// </summary>
internal static string ChatBot_WebSocketBot_AllowIpAlias {
get {
return ResourceManager.GetString("ChatBot.WebSocketBot.AllowIpAlias", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to This setting is for developers who are developing a library that uses this chat bot to remotely execute procedures/commands/functions..
/// </summary>
@ -1722,15 +1732,6 @@ namespace MinecraftClient {
}
}
/// <summary>
/// Looks up a localized string similar to Yggdrasil authlib server domain name and port..
/// </summary>
internal static string Main_General_AuthlibServer {
get {
return ResourceManager.GetString("Main.General.AuthlibServer", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to The address of the game server, &quot;Host&quot; can be filled in with domain name or IP address. (The &quot;Port&quot; field can be deleted, it will be resolved automatically).
/// </summary>
@ -1750,7 +1751,7 @@ namespace MinecraftClient {
}
/// <summary>
/// Looks up a localized string similar to Account type: &quot;mojang&quot; OR &quot;microsoft&quot; OR &quot;yggdrasil&quot;. Also affects interactive login in console..
/// Looks up a localized string similar to Account type: &quot;mojang&quot; OR &quot;microsoft&quot;. Also affects interactive login in console..
/// </summary>
internal static string Main_General_server_info {
get {

8
MinecraftClient/Resources/ConfigComments/ConfigComments.resx
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>