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

Fixing merge conflict

Browse source
This commit is contained in:
Anon 2023-06-03 16:27:36 +02:00
parent 081cebcf76
commit a357d2c87a
2 changed files with 776 additions and 781 deletions
Download patch file Download diff file Expand all files Collapse all files

12
MinecraftClient/Resources/Translations/Translations.Designer.cs generated
View file

@ -3855,12 +3855,6 @@ namespace MinecraftClient {
} }
} }
internal static string cmd_nameitem_item_name_empty {
get {
return ResourceManager.GetString("cmd.nameitem.item.name.empty", resourceCulture);
}
}
internal static string bot_WebSocketBot_failed_to_start_ip { internal static string bot_WebSocketBot_failed_to_start_ip {
get { get {
return ResourceManager.GetString("bot.WebSocketBot.failed_to_start.ip", resourceCulture); return ResourceManager.GetString("bot.WebSocketBot.failed_to_start.ip", resourceCulture);
@ -3927,6 +3921,12 @@ namespace MinecraftClient {
} }
} }
internal static string cmd_nameitem_item_name_empty {
get {
return ResourceManager.GetString("cmd.nameitem.item.name.empty", resourceCulture);
}
}
internal static string cmd_nameitem_no_anvil_inventory_open { internal static string cmd_nameitem_no_anvil_inventory_open {
get { get {
return ResourceManager.GetString("cmd.nameitem.no.anvil.inventory.open", resourceCulture); return ResourceManager.GetString("cmd.nameitem.no.anvil.inventory.open", resourceCulture);

51
MinecraftClient/Resources/Translations/Translations.resx
View file

@ -59,47 +59,46 @@
: using a System.ComponentModel.TypeConverter : using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding. : and then encoded with base64 encoding.
--> -->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
<xsd:element name="root" msdata:IsDataSet="true"> <xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType> <xsd:complexType>
<xsd:choice maxOccurs="unbounded"> <xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata"> <xsd:element name="metadata">
<xsd:complexType> <xsd:complexType>
<xsd:sequence> <xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0"/> <xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence> </xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string"/> <xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string"/> <xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string"/> <xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space"/> <xsd:attribute ref="xml:space" />
</xsd:complexType> </xsd:complexType>
</xsd:element> </xsd:element>
<xsd:element name="assembly"> <xsd:element name="assembly">
<xsd:complexType> <xsd:complexType>
<xsd:attribute name="alias" type="xsd:string"/> <xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string"/> <xsd:attribute name="name" type="xsd:string" />
</xsd:complexType> </xsd:complexType>
</xsd:element> </xsd:element>
<xsd:element name="data"> <xsd:element name="data">
<xsd:complexType> <xsd:complexType>
<xsd:sequence> <xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/> <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2"/> <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence> </xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1"/> <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3"/> <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4"/> <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space"/> <xsd:attribute ref="xml:space" />
</xsd:complexType> </xsd:complexType>
</xsd:element> </xsd:element>
<xsd:element name="resheader"> <xsd:element name="resheader">
<xsd:complexType> <xsd:complexType>
<xsd:sequence> <xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/> <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence> </xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required"/> <xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType> </xsd:complexType>
</xsd:element> </xsd:element>
</xsd:choice> </xsd:choice>
@ -113,14 +112,10 @@
<value>2.0</value> <value>2.0</value>
</resheader> </resheader>
<resheader name="reader"> <resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
PublicKeyToken=b77a5c561934e089
</value>
</resheader> </resheader>
<resheader name="writer"> <resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
PublicKeyToken=b77a5c561934e089
</value>
</resheader> </resheader>
<data name="bot.alerts.end_rain" xml:space="preserve"> <data name="bot.alerts.end_rain" xml:space="preserve">
<value>Weather change: It is no longer raining.</value> <value>Weather change: It is no longer raining.</value>
@ -2062,9 +2057,6 @@ Logging in...</value>
</data> </data>
<data name="cmd.items.collector.stopped" xml:space="preserve"> <data name="cmd.items.collector.stopped" xml:space="preserve">
<value>Stopped collecting items.</value> <value>Stopped collecting items.</value>
</data>
<data name="cmd.nameitem.item.name.empty" xml:space="preserve">
<value>The item name cannot be empty!</value>
</data> </data>
<data name="bot.WebSocketBot.failed_to_start.ip" xml:space="preserve"> <data name="bot.WebSocketBot.failed_to_start.ip" xml:space="preserve">
<value>§cFailed to start a server! The provided IP address is not a valid one!</value> <value>§cFailed to start a server! The provided IP address is not a valid one!</value>
@ -2073,7 +2065,7 @@ Logging in...</value>
<value>§cFailed to start a server! The provided port number {0} is out of the range, it must be 65535 or bellow it!</value> <value>§cFailed to start a server! The provided port number {0} is out of the range, it must be 65535 or bellow it!</value>
</data> </data>
<data name="ChatBot.WebSocketBot.DebugMode" xml:space="preserve"> <data name="ChatBot.WebSocketBot.DebugMode" xml:space="preserve">
<value/> <value />
</data> </data>
<data name="bot.WebSocketBot.starting" xml:space="preserve"> <data name="bot.WebSocketBot.starting" xml:space="preserve">
<value>Starting the Websocket server...</value> <value>Starting the Websocket server...</value>
@ -2099,6 +2091,9 @@ Logging in...</value>
<data name="bot.WebSocketBot.session_authenticated" xml:space="preserve"> <data name="bot.WebSocketBot.session_authenticated" xml:space="preserve">
<value>§bSession with an id §a{0}§b has been successfully authenticated!</value> <value>§bSession with an id §a{0}§b has been successfully authenticated!</value>
</data> </data>
<data name="cmd.nameitem.item.name.empty" xml:space="preserve">
<value>The item name cannot be empty!</value>
</data>
<data name="cmd.nameitem.no.anvil.inventory.open" xml:space="preserve"> <data name="cmd.nameitem.no.anvil.inventory.open" xml:space="preserve">
<value>You need to have an Anvil inventory opened and active in order to use this command!</value> <value>You need to have an Anvil inventory opened and active in order to use this command!</value>
</data> </data>