vistaslayer/LegacyRenouveau
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: resolve merge conflicts and integrate XML locale updates (#1)

Browse Source 
Resolve merge conflicts across multiple components
Merge and synchronize XML locale changes
Ensure consistency between string resources and localization files
Minor fixes to restore successful builds after merge
This commit is contained in:
Fireblade
2026-04-11 02:47:59 +03:00
committed by GitHub
parent 0ad7e383fa
commit 0ed96f1592
26 changed files with 1200 additions and 2424 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Minecraft.Client/Windows64Media/loc/stringsGeneric.xml
+347 -69
View File
@@ -2470,7 +2470,7 @@ Can also be used for low-level lighting.</value>
</data>
<data name="IDS_ITEM_WHEAT_SEEDS">
<value>Wheat Seeds</value>
<value>Seeds</value>
</data>
<data name="IDS_ITEM_WHEAT">
@@ -3162,11 +3162,11 @@ Can also be used for low-level lighting.</value>
</data>
<data name="IDS_TILE_FLOWER">
<value>Flower</value>
<value>Dandelion</value>
</data>
<data name="IDS_TILE_ROSE">
<value>Rose</value>
<value>Poppy</value>
</data>
<data name="IDS_TILE_MUSHROOM">
@@ -6538,6 +6538,10 @@ Would you like to install the mash-up pack or texture pack now?</value>
<value>Game Mode: Adventure</value>
</data>
<data name="IDS_GAMEMODE_HARDCORE">
<value>Game Mode: Hardcore</value>
</data>
<data name="IDS_SURVIVAL">
<value>Survival</value>
</data>
@@ -6550,6 +6554,10 @@ Would you like to install the mash-up pack or texture pack now?</value>
<value>Adventure</value>
</data>
<data name="IDS_HARDCORE">
<value>Hardcore</value>
</data>
<data name="IDS_CREATED_IN_SURVIVAL">
<value>Created in Survival Mode</value>
</data>
@@ -6866,6 +6874,10 @@ Would you like to install the mash-up pack or texture pack now?</value>
<value>Death Messages</value>
</data>
<data name="IDS_HARDCORE_DEATH_MESSAGE">
<value>dead.</value>
</data>
<data name="IDS_CHECKBOX_ANIMATED_CHARACTER">
<value>Animated Character</value>
</data>
@@ -8842,7 +8854,7 @@ All Ender Chests in a world are linked. Items placed into an Ender Chest are acc
<data name="IDS_TILE_STONESLAB_DARK_OAK">
<value>Dark Oak Wood Slab</value>
</data>
</data>
<data name="IDS_TILE_STONESLAB_DARK_OAK">
<value>Dark Oak Wood Slab</value>
@@ -8934,122 +8946,145 @@ All Ender Chests in a world are linked. Items placed into an Ender Chest are acc
<data name="IDS_ITEM_ARMOR_STAND">
<value>Armor Stand</value>
</data>
<data name="IDS_DESC_ARMOR_STAND">
<value>Can be equipped to display armor and other decorative items such as mob heads.</value>
</data>
<data name="IDS_RABBIT">
<value>Rabbit</value>
</data>
<data name="IDS_DESC_RABBIT">
<value>A harmless creature. May drop a rabbit hide or a rabbit's foot when killed.</value>
</data>
<data name="IDS_ITEM_RABBIT_HIDE">
<value>Rabbit Hide</value>
</data>
<data name="IDS_DESC_RABBIT_HIDE">
<value>Used in crafting leather.</value>
</data>
<data name="IDS_ITEM_RABBIT_FOOT">
<value>Rabbit's Foot</value>
</data>
<data name="IDS_DESC_RABBIT_FOOT">
<value>Used as an ingredient for brewing potions.</value>
</data>
<data name="IDS_ITEM_RABBIT_RAW">
<value>Raw Rabbit</value>
</data>
<data name="IDS_DESC_RABBIT_RAW">
<value>Restores 0.5{*ICON_SHANK_01*}, or can be cooked in a furnace.</value>
</data>
<data name="IDS_ITEM_RABBIT_COOKED">
<value>Cooked Rabbit</value>
</data>
<data name="IDS_DESC_RABBIT_COOKED">
<value>Restores 2.5{*ICON_SHANK_01*}. Used to cook up some rabbit stew.</value>
</data>
<data name="IDS_ITEM_MUTTON_RAW">
<value>Raw Mutton</value>
</data>
<data name="IDS_DESC_MUTTON_RAW">
<value>Restores 1{*ICON_SHANK_01*}, or can be cooked in a furnace.</value>
</data>
<data name="IDS_ITEM_MUTTON_COOKED">
<value>Cooked Mutton</value>
</data>
<data name="IDS_DESC_MUTTON_COOKED">
<value>Restores 3{*ICON_SHANK_01*}. Created by cooking raw mutton in a furnace.</value>
</data>
<data name="IDS_TILE_SAPLING_ACACIA">
<value>Acacia Sapling</value>
</data>
</data>
<data name="IDS_TILE_SAPLING_DARK_OAK">
<value>Dark Oak Sapling</value>
</data>
</data>
<data name="IDS_TILE_LEAVES_ACACIA">
<value>Acacia Leaves</value>
</data>
</data>
<data name="IDS_TILE_LEAVES_DARK_OAK">
<value>Dark Oak Leaves</value>
</data>
</data>
<data name="IDS_TILE_RED_SANDSTONE">
<value>Red Sandstone</value>
</data>
</data>
<data name="IDS_TILE_STAIRS_RED_SANDSTONE">
<value>Red Sandstone Stairs</value>
</data>
</data>
<data name="IDS_ITEM_PRISMARINE_CRYSTAL">
<value>Prismarine Crystal</value>
</data>
</data>
<data name="IDS_TILE_SEA_LANTERN">
<value>Sea Lantern</value>
</data>
</data>
<data name="IDS_WINDOWS_EXIT">
<value>Exit Minecraft</value>
</data>
<data name="IDS_TILE_PACKED_ICE">
<value>Packed Ice</value>
</data>
<data name="IDS_DESC_PACKED_ICE">
<value>A solid unmeltable block of ice that can have objects placed on it.</value>
</data>
<data name="IDS_TILE_RED_SANDSTONE_CHISELED">
<value>Chiseled Red Sandstone</value>
</data>
<data name="IDS_TILE_RED_SANDSTONE_SMOOTH">
<value>Smooth Red Sandstone</value>
</data>
<data name="IDS_DESC_RED_SANDSTONE">
<value>Red colored Sandstone. It is not influenced by gravity like normal Sand.</value>
</data>
<data name="IDS_DESC_SEA_LANTERN">
<value>Underwater light sources that can be found in Ocean Monuments. Can be crafted from Prismarine shards and Prismarine crystals.</value>
</data>
<data name="IDS_TILE_PRISMARINE">
<value>Prismarine</value>
</data>
<data name="IDS_DESC_PRISMARINE">
<data name="IDS_TILE_PRISMARINE_DARK">
<value>Dark Prismarine</value>
</data>
<data name="IDS_TILE_PRISMARINE_BRICKS">
<value>Prismarine Bricks</value>
</data>
<data name="IDS_ITEM_PRISMARINE_SHARD">
<value>Prismarine Shard</value>
</data>
<data name="IDS_ITEM_PRISMARINE_DESC">
<value>Rare decorative stone that can be found in Ocean Monuments. Can be crafted from Prismarine shards.</value>
</data>
<data name="IDS_DESC_DOUBLE_TALL_GRASS">
<value>PLACEHOLDER</value>
<data name="IDS_ITEM_PRISMARINE_DARK_DESC">
<value>A rarer form of Prismarine that can be found in Ocean Monuments. Can be crafted with Prismarine shards and an Ink Sac.</value>
</data>
<data name="IDS_ITEM_PRISMARINE_BRICK_DESC">
<value>Decorative Prismarine brick that can be found in Ocean Monuments. Can be crafted from Prismarine shards.</value>
</data>
<data name="IDS_ITEM_PRISMARINE_CRYSTAL_DESC">
<value>Obtained from Sea Lanterns or by defeating Guardians and Elder Guardians. Can be used in crafting Sea Lanterns.</value>
</data>
<data name="IDS_ITEM_PRISMARINE_SHARD_DESC">
<value>Dropped by Guardians and Elder Guardians. Can be used in crafting Prismarine and Sea Lanterns.</value>
</data>
<data name="IDS_ITEM_RABBIT_STEW">
<value>{*ICON_SHANK_01*}</value>
</data>
<data name="IDS_TILE_DOUBLE_TALL_GRASS">
<value>Double Tall Grass</value>
</data>
<data name="IDS_TILE_SUNFLOWER">
<value>Sunflower</value>
<value>Tall Grass</value>
</data>
<data name="IDS_TILE_LARGE_FERN">
@@ -9068,40 +9103,283 @@ All Ender Chests in a world are linked. Items placed into an Ender Chest are acc
<value>Peony</value>
</data>
<data name="IDS_ITEM_PRISMARINE_SHARD">
<value>Prismarine Shard</value>
<data name="IDS_TILE_PACKED_ICE">
<value>Packed Ice</value>
</data>
<data name="IDS_ITEM_PRISMARINE_SHARD_DESC">
<value>Dropped by Guardians and Elder Guardians. Can be used in crafting Prismarine and Sea Lanterns.</value>
</data>
<data name="IDS_TILE_SUNFLOWER">
<value>Sunflower</value>
</data>
<data name="IDS_ITEM_PRISMARINE_CRYSTAL_DESC">
<value>Obtained from Sea Lanterns or by defeating Guardians and Elder Guardians. Can be used in crafting Sea Lanterns.</value>
</data>
<data name="IDS_DESC_PACKED_ICE">
<value>A solid unmeltable block of ice that can have objects placed on it.</value>
</data>
<data name="IDS_ITEM_PRISMARINE_DESC">
<data name="IDS_DESC_RED_SANDSTONE">
<value>Red colored Sandstone. It is not influenced by gravity like normal Sand.</value>
</data>
<data name="IDS_DESC_SEA_LANTERN">
<value>Underwater light sources that can be found in Ocean Monuments. Can be crafted from Prismarine shards and Prismarine crystals.</value>
</data>
<data name="IDS_DESC_PRISMARINE">
<value>Rare decorative stone that can be found in Ocean Monuments. Can be crafted from Prismarine shards.</value>
</data>
<data name="IDS_ITEM_PRISMARINE_BRICK_DESC">
<value>Decorative Prismarine brick that can be found in Ocean Monuments. Can be crafted from Prismarine shards.</value>
</data>
<data name="IDS_ITEM_PRISMARINE_DARK_DESC">
<value>A rarer form of Prismarine that can be found in Ocean Monuments. Can be crafted with Prismarine shards and an Ink Sac.</value>
</data>
<data name="IDS_TILE_PRISMARINE">
<value>Prismarine</value>
<data name="IDS_DESC_DOUBLE_TALL_GRASS">
<value>Double tall grass that can sometimes drop seeds.</value>
</data>
<data name="IDS_TILE_PRISMARINE_BRICKS">
<value>Prismarine Bricks</value>
<data name="IDS_TILE_RED_SANDSTONE_CHISELED">
<value>Chiseled Red Sandstone</value>
</data>
<data name="IDS_TILE_PRISMARINE_DARK">
<value>Dark Prismarine</value>
<data name="IDS_TILE_RED_SANDSTONE_SMOOTH">
<value>Smooth Red Sandstone</value>
</data>
</root>
<data name="IDS_TILE_PODZOL">
<value>Podzol</value>
</data>
<data name="IDS_TILE_COARSE_DIRT">
<value>Coarse Dirt</value>
</data>
<data name="IDS_DESC_PODZOL">
<value>Similar to Dirt Blocks, but very good for growing mushrooms on.</value>
</data>
<data name="IDS_DESC_COARSE_DIRT">
<value>A special type of dirt that does not grow grass.</value>
</data>
<data name="IDS_TILE_GRANITE">
<value>Granite</value>
</data>
<data name="IDS_TILE_POLISHED_GRANITE">
<value>Polished Granite</value>
</data>
<data name="IDS_TILE_ANDESITE">
<value>Andesite</value>
</data>
<data name="IDS_TILE_POLISHED_ANDESITE">
<value>Polished Andesite</value>
</data>
<data name="IDS_TILE_DIORITE">
<value>Diorite</value>
</data>
<data name="IDS_TILE_POLISHED_DIORITE">
<value>Polished Diorite</value>
</data>
<data name="IDS_DESC_GRANITE">
<value>Can be mined with a pickaxe to collect granite.</value>
</data>
<data name="IDS_DESC_POLISHED_GRANITE">
<value>Can be crafted from granite for a polished look.</value>
</data>
<data name="IDS_DESC_ANDESITE">
<value>Can be mined with a pickaxe to collect andesite.</value>
</data>
<data name="IDS_DESC_POLISHED_ANDESITE">
<value>Can be crafted from andesite for a polished look.</value>
</data>
<data name="IDS_DESC_DIORITE">
<value>Can be mined with a pickaxe to collect diorite.</value>
</data>
<data name="IDS_DESC_POLISHED_DIORITE">
<value>Can be crafted from diorite for a polished look.</value>
</data>
<data name="IDS_TILE_RED_SAND">
<value>Red Sand</value>
</data>
<data name="IDS_TILE_WET_SPONGE">
<value>Wet Sponge</value>
</data>
<data name="IDS_DESC_WET_SPONGE">
<value>Can be dried in a furnace, allowing the sponge to be reused.</value>
</data>
<data name="IDS_ITEM_SALMON_RAW">
<value>Raw Salmon</value>
</data>
<data name="IDS_ITEM_SALMON_COOKED">
<value>Cooked Salmon</value>
</data>
<data name="IDS_ITEM_CLOWNFISH">
<value>Clownfish</value>
</data>
<data name="IDS_ITEM_PUFFERFISH">
<value>Pufferfish</value>
</data>
<data name="IDS_DESC_SALMON_RAW">
<value>Restores 1{*ICON_SHANK_01*}, or can be cooked in a furnace. Can be fed to an ocelot to tame it.</value>
</data>
<data name="IDS_DESC_SALMON_COOKED">
<value>Restores 3{*ICON_SHANK_01*}. Created by cooking a raw salmon in a furnace.</value>
</data>
<data name="IDS_DESC_CLOWNFISH">
<value>Restores 0.5{*ICON_SHANK_01*}.</value>
</data>
<data name="IDS_DESC_PUFFERFISH">
<value>Restores 0.5{*ICON_SHANK_01*} however it is poisonous. Can also be used as an ingredient in brewing potions.</value>
</data>
<data name="IDS_TILE_BLUE_ORCHID">
<value>Blue Orchid</value>
</data>
<data name="IDS_TILE_ALLIUM">
<value>Allium</value>
</data>
<data name="IDS_TILE_HOUSTONIA">
<value>Azure Bluet</value>
</data>
<data name="IDS_TILE_TULIP_RED">
<value>Red Tulip</value>
</data>
<data name="IDS_TILE_TULIP_ORANGE">
<value>Orange Tulip</value>
</data>
<data name="IDS_TILE_TULIP_WHITE">
<value>White Tulip</value>
</data>
<data name="IDS_TILE_TULIP_PINK">
<value>Pink Tulip</value>
</data>
<data name="IDS_TILE_OXEYE_DAISY">
<value>Oxeye Daisy</value>
</data>
<data name="IDS_DESC_ROSE">
<value>A common red flower that can be used to craft red dye.</value>
</data>
<data name="IDS_DESC_BLUE_ORCHID">
<value>A rare blue flower that can be used to craft light blue dye.</value>
</data>
<data name="IDS_DESC_ALLIUM">
<value>A rare magenta flower that can be used to craft magenta dye.</value>
</data>
<data name="IDS_DESC_HOUSTONIA">
<value>A small white flower that can be used to craft light gray dye.</value>
</data>
<data name="IDS_DESC_TULIP_RED">
<value>A small red flower that can be used to craft red dye.</value>
</data>
<data name="IDS_DESC_TULIP_ORANGE">
<value>A small orange flower that can be used to craft orange dye.</value>
</data>
<data name="IDS_DESC_TULIP_WHITE">
<value>A small white flower that can be used to craft light gray dye.</value>
</data>
<data name="IDS_DESC_TULIP_PINK">
<value>A small pink flower that can be used to craft pink dye.</value>
</data>
<data name="IDS_DESC_OXEYE_DAISY">
<value>A common white and yellow flower that can be used to craft light gray dye.</value>
</data>
<data name="IDS_DESC_SUNFLOWER">
<value>A tall yellow flower that can be used to craft yellow dye.</value>
</data>
<data name="IDS_DESC_LILAC">
<value>A tall purple flower that can be used to craft magenta dye.</value>
</data>
<data name="IDS_DESC_LARGE_FERN">
<value>A tall fern that can sometimes drop seeds.</value>
</data>
<data name="IDS_DESC_ROSE_BUSH">
<value>A tall red flower that can be used to craft red dye.</value>
</data>
<data name="IDS_DESC_PEONY">
<value>A tall green and pink flower that can be used to craft pink dye.</value>
</data>
<data name="IDS_ENDERMITE">
<value>Endermite</value>
</data>
<data name="IDS_ITEM_WRITTENBOOK">
<value>Written Book</value>
</data>
<data name="IDS_DESC_WRITTENBOOK">
<value>A book signed by the author (cannot be written in).</value>
</data>
<data name="IDS_ITEM_WRITINGBOOK">
<value>Book and Quill</value>
</data>
<data name="IDS_DESC_WRITINGBOOK">
<value>A Book that can be written in.</value>
</data>
<data name="IDS_TOOLTIPS_NEXTPAGE">
<value>Next Page</value>
</data>
<data name="IDS_TOOLTIPS_BACKPAGE">
<value>Previous Page</value>
</data>
<data name="IDS_TOOLTIPS_ADDPAGE">
<value>Add Page</value>
</data>
<data name="IDS_TITLE_EXITBOOK">
<value>Exit Book</value>
</data>
<data name="IDS_DESC_EXITBOOK">
<value>Are you sure you want to exit this book and the changes you've made?</value>
</data>
<data name="IDS_ENCHANTMENT_LURE">
<value>Lure</value>
</data>
<data name="IDS_ENCHANTMENT_LUCK_OF_THE_SEA">
<value>Luck of the Sea</value>
</data>
</root>