From 2cc554c11b27fa4e4beac6a6b2f198025ad35d86 Mon Sep 17 00:00:00 2001 From: PUFF_MON <90284792+PUFFMON@users.noreply.github.com> Date: Thu, 21 May 2026 19:39:14 +0200 Subject: [PATCH] fix: Incorrect Rabbit Stew strings (#102) --- .../Windows64Media/Media/languages.loc | Bin 1345659 -> 1356985 bytes .../Windows64Media/loc/stringsGeneric.xml | 6 +++++- Minecraft.World/Item.cpp | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Minecraft.Client/Windows64Media/Media/languages.loc b/Minecraft.Client/Windows64Media/Media/languages.loc index 3fb5b1a0671cbbd08835e2fd5b458058d99a0d3f..4b11ca996ff91cf3715ee2b46745fce6437973ee 100644 GIT binary patch delta 8132 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 jwzmM|b4~ru`HtX{Ja?Ae!1B=km delta 1195 zcmZ`#drVtZ7(eHBiT6^XYr3u59QCpqW${a)ug zG4K5AfU^}Lgyo|_DqiHCEJLKd45_MlZbtzkjzt-5jy|xM-_)ZXF7ZCfz zNNeoU7%U|vt94IFQZ+BaY#ja#%P%kQ4%lFNJ#J>4Mu)rJ7M|NmeQvS75n0L_{7oKy z4QAdh_&we=kfpduto5y>ty}S-?RLz=Z99G+>zP8I^b+q!N~hGw!_gGHk=$uRuczU0 ztb)TE@CA&u@L~p5Owf)woB*S9__!XVMV$9A#NS8m$Kc*fUfWm9)$DSW$TaOm>iuNo;PuB+ATyAc?ksv^u7{&*9|Q#Q&MX zrA|_ !LO}6R8RT)U##E3~@620C<;^<%x$-p)A>mKq<>MAJ7*&yK)!k_l?fo!fZn7hVbT(Zx z3zHd|AF@F%v0x8-w6#+axB4IiXY?~$ zpweWpriUW~4;U(r!TFyJ2eQDu-q>;0$b{PZLxaZ<6Z-IEXrK%JzGa+d;qrp9rG%E} zn)>0_T$46Cl0Gk*_N0YvYN<&Wf{WYCw=!VDXC4MB*e&t!y4|vcg;SZ9>^yq=1r*DG?jjK`Wp54=Grt<8 diff --git a/Minecraft.Client/Windows64Media/loc/stringsGeneric.xml b/Minecraft.Client/Windows64Media/loc/stringsGeneric.xml index b8150a8a..776c0a4a 100644 --- a/Minecraft.Client/Windows64Media/loc/stringsGeneric.xml +++ b/Minecraft.Client/Windows64Media/loc/stringsGeneric.xml @@ -9100,7 +9100,7 @@ All Ender Chests in a world are linked. Items placed into an Ender Chest are acc - {*ICON_SHANK_01*} + Rabbit Stew @@ -9570,4 +9570,8 @@ All Ender Chests in a world are linked. Items placed into an Ender Chest are acc Hold {*CONTROLLER_VK_Y*} to view Classic Crafting + + + Restores 5{*ICON_SHANK_01*}. + diff --git a/Minecraft.World/Item.cpp b/Minecraft.World/Item.cpp index f46a57e3..db644c77 100644 --- a/Minecraft.World/Item.cpp +++ b/Minecraft.World/Item.cpp @@ -360,7 +360,7 @@ void Item::staticCtor() Item::diamond = ( new Item(8) ) ->setBaseItemTypeAndMaterial(eBaseItemType_treasure, eMaterial_diamond)->setIconName(L"diamond")->setDescriptionId(IDS_ITEM_DIAMOND)->setUseDescriptionId(IDS_DESC_DIAMONDS); Item::stick = ( new Item(24) ) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_stick, Item::eMaterial_wood)->setIconName(L"stick")->handEquipped()->setDescriptionId(IDS_ITEM_STICK)->setUseDescriptionId(IDS_DESC_STICK); Item::mushroomStew = ( new BowlFoodItem(26, 6) ) ->setIconName(L"mushroomStew")->setDescriptionId(IDS_ITEM_MUSHROOM_STEW)->setUseDescriptionId(IDS_DESC_MUSHROOMSTEW); - Item::rabbitStew = ( new BowlFoodItem(157, 10) ) ->setIconName(L"rabbitStew")->setDescriptionId(IDS_ITEM_MUSHROOM_STEW)->setUseDescriptionId(IDS_DESC_MUSHROOMSTEW); + Item::rabbitStew = ( new BowlFoodItem(157, 10) ) ->setIconName(L"rabbitStew")->setDescriptionId(IDS_ITEM_RABBIT_STEW)->setUseDescriptionId(IDS_DESC_RABBIT_STEW); Item::string = ( new TilePlanterItem(31, Tile::tripWire) ) ->setIconName(L"string")->setDescriptionId(IDS_ITEM_STRING)->setUseDescriptionId(IDS_DESC_STRING); Item::feather = ( new Item(32) ) ->setIconName(L"feather")->setDescriptionId(IDS_ITEM_FEATHER)->setUseDescriptionId(IDS_DESC_FEATHER);