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 {
get {
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 {
get {
return ResourceManager.GetString("cmd.nameitem.no.anvil.inventory.open", resourceCulture);

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

File diff suppressed because it is too large Load diff