Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion Minecraft.Client/Common/UI/IUIScene_CreativeMenu.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,7 @@ void IUIScene_CreativeMenu::staticCtor()
DEF(eCreativeInventory_Food)
ITEM(Item::apple_Id)
ITEM(Item::apple_gold_Id)
ITEM_AUX(Item::apple_gold_Id,1) // Enchanted
ITEM_AUX(Item::apple_gold_Id, 1) // Enchanted
ITEM(Item::melon_Id)
ITEM(Item::mushroomStew_Id)
ITEM(Item::bread_Id)
Expand All @@ -407,6 +407,8 @@ void IUIScene_CreativeMenu::staticCtor()
ITEM(Item::porkChop_raw_Id)
ITEM(Item::beef_cooked_Id)
ITEM(Item::beef_raw_Id)
ITEM(Item::mutton_cooked_Id)
ITEM(Item::mutton_raw_Id)
ITEM(Item::chicken_raw_Id)
ITEM(Item::chicken_cooked_Id)
ITEM(Item::rotten_flesh_Id)
Expand Down
2 changes: 2 additions & 0 deletions Minecraft.Client/PreStitchedTextureMap.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -446,6 +446,8 @@ void PreStitchedTextureMap::loadUVs()
ADD_ICON(6, 8, L"saddle")
ADD_ICON(6, 9, L"beefRaw")
ADD_ICON(6, 10, L"beefCooked")
ADD_ICON(11, 5, L"muttonRaw")
ADD_ICON(12, 5, L"muttonCooked")
ADD_ICON(6, 11, L"enderPearl")
ADD_ICON(6, 12, L"blazeRod")
ADD_ICON(6, 13, L"melon")
Expand Down
22 changes: 19 additions & 3 deletions Minecraft.Client/Windows64Media/loc/de-DE/stringsGeneric.xml
Original file line number Diff line number Diff line change
Expand Up @@ -886,8 +886,16 @@ haben.</value>

<data name="IDS_DESC_BEEF_COOKED">
<value>Regeneriert 4{*ICON_SHANK_01*}.</value>
</data>
</data>

<data name="IDS_DESC_MUTTON_COOKED">
<value>Regeneriert 3{*ICON_SHANK_01*}.</value>
</data>

<data name="IDS_DESC_MUTTON_RAW">
<value>Regeneriert 1{*ICON_SHANK_01*}, kann dich aber krankmachen. Kann im Ofen gebraten werden.</value>
</data>

<data name="IDS_DESC_PORKCHOP_RAW">
<value>Erhält man durch Töten eines Schweins, regeneriert 1.5{*ICON_SHANK_01*}. Kann im Ofen gebraten werden.</value>
</data>
Expand Down Expand Up @@ -2455,8 +2463,16 @@ statt nur 3.)</value>

<data name="IDS_ITEM_BEEF_COOKED">
<value>Steak</value>
</data>

</data>

<data name="IDS_ITEM_MUTTON_RAW">
<value>Rohes Lammfleisch</value>
</data>

<data name="IDS_ITEM_MUTTON_COOKED">
<value>Gebratenes Lammfleisch</value>
</data>

<data name="IDS_ITEM_ROTTEN_FLESH">
<value>Verrottetes Fleisch</value>
</data>
Expand Down
23 changes: 21 additions & 2 deletions Minecraft.Client/Windows64Media/loc/es-ES/stringsGeneric.xml
Original file line number Diff line number Diff line change
Expand Up @@ -880,8 +880,16 @@ Los colores de la cama siempre son los mismos, independientemente del color de l

<data name="IDS_DESC_BEEF_COOKED">
<value>Restablece 4{*ICON_SHANK_01*}.</value>
</data>
</data>

<data name="IDS_DESC_MUTTON_COOKED">
<value>Restablece 3{*ICON_SHANK_01*}.</value>
</data>

<data name="IDS_DESC_MUTTON_RAW">
<value>Restablece 1{*ICON_SHANK_01*}, pero puede hacerte enfermar. Cocinar en un horno.</value>
</data>

<data name="IDS_DESC_PORKCHOP_RAW">
<value>Se consigue al matar un cerdo, restablece 1,5{*ICON_SHANK_01*} y se puede cocinar en un horno.</value>
</data>
Expand Down Expand Up @@ -2459,8 +2467,19 @@ de tinta en vez de 3).</value>

<data name="IDS_ITEM_BEEF_COOKED">
<value>Filete</value>
</data>
</data>

<data name="IDS_ITEM_MUTTON_RAW">
<value>
Cordero crudo
</value>
</data>
<data name="IDS_ITEM_MUTTON_COOKED">
<value>
Cordero cocido
</value>
</data>

<data name="IDS_ITEM_ROTTEN_FLESH">
<value>Carne podrida</value>
</data>
Expand Down
23 changes: 21 additions & 2 deletions Minecraft.Client/Windows64Media/loc/fr-FR/stringsGeneric.xml
Original file line number Diff line number Diff line change
Expand Up @@ -883,8 +883,16 @@ La couleur des lits est toujours la même.</value>

<data name="IDS_DESC_BEEF_COOKED">
<value>Restitue 4{*ICON_SHANK_01*}.</value>
</data>
</data>

<data name="IDS_DESC_MUTTON_COOKED">
<value>Restitue 3{*ICON_SHANK_01*} mais peut vous rendre malade. Se cuisine dans un four.</value>
</data>

<data name="IDS_DESC_MUTTON_RAW">
<value>Restitue 1{*ICON_SHANK_01*} mais peut vous rendre malade. Se cuisine dans un four.</value>
</data>

<data name="IDS_DESC_PORKCHOP_RAW">
<value>Prélevée sur les cadavres de cochons, restitue 1,5{*ICON_SHANK_01*} et se cuisine dans un four.</value>
</data>
Expand Down Expand Up @@ -2450,8 +2458,19 @@ Remarque : vous pouvez aussi combiner colorant gris et poudre d'os pour en produ

<data name="IDS_ITEM_BEEF_COOKED">
<value>Steak</value>
</data>
</data>

<data name="IDS_ITEM_MUTTON_RAW">
<value>
Mouton cru
</value>
</data>
<data name="IDS_ITEM_MUTTON_COOKED">
<value>
mouton cuit
</value>
</data>

<data name="IDS_ITEM_ROTTEN_FLESH">
<value>Chair putréfiée</value>
</data>
Expand Down
19 changes: 16 additions & 3 deletions Minecraft.Client/Windows64Media/loc/it-IT/stringsGeneric.xml
Original file line number Diff line number Diff line change
Expand Up @@ -880,8 +880,16 @@ I colori sono sempre gli stessi, qualunque sia la lana usata.</value>

<data name="IDS_DESC_BEEF_COOKED">
<value>Reintegra 4{*ICON_SHANK_01*}.</value>
</data>
</data>

<data name="IDS_DESC_MUTTON_COOKED">
<value>Reintegra 3{*ICON_SHANK_01*}</value>
</data>

<data name="IDS_DESC_MUTTON_RAW">
<value>Reintegra 1{*ICON_SHANK_01*}, ma può farti star male. Cucinare in una fornace.</value>
</data>

<data name="IDS_DESC_PORKCHOP_RAW">
<value>Si ottiene uccidendo un maiale e si può cucinare nella fornace. Reintegra 1,5{*ICON_SHANK_01*}.</value>
</data>
Expand Down Expand Up @@ -2446,8 +2454,13 @@ I colori sono sempre gli stessi, qualunque sia la lana usata.</value>

<data name="IDS_ITEM_BEEF_COOKED">
<value>Bistecca</value>
</data>

</data>
<data name="IDS_ITEM_MUTTON_RAW">
<value>Montone crudo</value>
</data>
<data name="IDS_ITEM_MUTTON_COOKED">
<value>Montone cotto</value>
</data>
<data name="IDS_ITEM_ROTTEN_FLESH">
<value>Carne guasta</value>
</data>
Expand Down
21 changes: 18 additions & 3 deletions Minecraft.Client/Windows64Media/loc/ja-JP/stringsGeneric.xml
Original file line number Diff line number Diff line change
Expand Up @@ -875,8 +875,16 @@ Minecraft に登場する動物は繁殖能力を持ち、自分たちの赤ち

<data name="IDS_DESC_BEEF_COOKED">
<value>4{*ICON_SHANK_01*} 回復する</value>
</data>
</data>

<data name="IDS_DESC_MUTTON_COOKED">
<value>3{*ICON_SHANK_01*} 回復する。生の羊肉をかまどで調理して作る</value>
</data>

<data name="IDS_DESC_MUTTON_RAW">
<value>1{*ICON_SHANK_01*} 回復するが、病気になる場合もある。かまどで調理できる</value>
</data>

<data name="IDS_DESC_PORKCHOP_RAW">
<value>豚を倒すと手に入る。かまどで調理できる。1.5{*ICON_SHANK_01*} 回復する</value>
</data>
Expand Down Expand Up @@ -2441,8 +2449,15 @@ Minecraft に登場する動物は繁殖能力を持ち、自分たちの赤ち

<data name="IDS_ITEM_BEEF_COOKED">
<value>ステーキ</value>
</data>

</data>

<data name="IDS_ITEM_MUTTON_RAW">
<value>生の羊肉</value>
</data>
<data name="IDS_ITEM_MUTTON_COOKED">
<value>焼いた羊肉</value>
</data>

<data name="IDS_ITEM_ROTTEN_FLESH">
<value>腐肉</value>
</data>
Expand Down
20 changes: 18 additions & 2 deletions Minecraft.Client/Windows64Media/loc/ko-KR/stringsGeneric.xml
Original file line number Diff line number Diff line change
Expand Up @@ -880,8 +880,16 @@ Ender에 들어서면 친구가 그들의 지도에서 요새 내부에 있는 E

<data name="IDS_DESC_BEEF_COOKED">
<value>{*ICON_SHANK_01*}를 4만큼 회복합니다.</value>
</data>
</data>

<data name="IDS_DESC_MUTTON_COOKED">
<value>{*ICON_SHANK_01*}를 3만큼 회복합니다. 생의 양고기를 화로에서 조리하여 만듭니다.</value>
</data>

<data name="IDS_DESC_MUTTON_RAW">
<value>{*ICON_SHANK_01*}를 1만큼 회복하지만 병에 걸릴 수 있습니다. 화로에서 조리가 가능합니다.</value>
</data>

<data name="IDS_DESC_PORKCHOP_RAW">
<value>돼지를 잡으면 얻을 수 있으며 {*ICON_SHANK_01*}를 1.5만큼 회복합니다. 화로에서 조리가 가능합니다.</value>
</data>
Expand Down Expand Up @@ -2446,8 +2454,16 @@ Ender에 들어서면 친구가 그들의 지도에서 요새 내부에 있는 E

<data name="IDS_ITEM_BEEF_COOKED">
<value>스테이크</value>
</data>
</data>

<data name="IDS_ITEM_BEEF_RAW">
<value>소 날고기</value>
</data>

<data name="IDS_ITEM_BEEF_COOKED">
<value>스테이크</value>
</data>

<data name="IDS_ITEM_ROTTEN_FLESH">
<value>썩은 살점</value>
</data>
Expand Down
19 changes: 17 additions & 2 deletions Minecraft.Client/Windows64Media/loc/pt-BR/stringsGeneric.xml
Original file line number Diff line number Diff line change
Expand Up @@ -874,8 +874,16 @@ As cores da cama são sempre as mesmas, independentemente da cor da lã usada.</

<data name="IDS_DESC_BEEF_COOKED">
<value>Restaura 4{*ICON_SHANK_01*}.</value>
</data>
</data>

<data name="IDS_DESC_MUTTON_COOKED">
<value>Restaura 3{*ICON_SHANK_01*}. Criada ao cozinhar carne de cordeiro crua na fornalha.</value>
</data>

<data name="IDS_DESC_MUTTON_RAW">
<value>Restaura 1{*ICON_SHANK_01*}, ou pode ser cozida na fornalha.</value>
</data>

<data name="IDS_DESC_PORKCHOP_RAW">
<value>Coletada ao matar um porco, restaura 1.5{*ICON_SHANK_01*}, e pode ser cozida na fornalha.</value>
</data>
Expand Down Expand Up @@ -2440,7 +2448,14 @@ Também pode ser usado para pouca iluminação.</value>

<data name="IDS_ITEM_BEEF_COOKED">
<value>Bife</value>
</data>
</data>

<data name="IDS_ITEM_MUTTON_RAW">
<value>Carne de Cordeiro Crua</value>
</data>
<data name="IDS_ITEM_MUTTON_COOKED">
<value>Carne de Cordeiro Cozida</value>
</data>

<data name="IDS_ITEM_ROTTEN_FLESH">
<value>Carne Podre</value>
Expand Down
22 changes: 18 additions & 4 deletions Minecraft.Client/Windows64Media/loc/stringsGeneric.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1081,8 +1081,16 @@ The colors of the bed are always the same, regardless of the colors of wool used

<data name="IDS_DESC_BEEF_COOKED">
<value>Restores 4{*ICON_SHANK_01*}. Created by cooking raw beef in a furnace.</value>
</data>
</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_DESC_MUTTON_RAW">
<value>Restores 1{*ICON_SHANK_01*}, or can be cooked in a furnace.</value>
</data>

<data name="IDS_DESC_PORKCHOP_RAW">
<value>Restores 1.5{*ICON_SHANK_01*}, or can be cooked in a furnace.</value>
</data>
Expand Down Expand Up @@ -2764,11 +2772,17 @@ Can also be used for low-level lighting.</value>
<data name="IDS_ITEM_BEEF_RAW">
<value>Raw Beef</value>
</data>

<data name="IDS_ITEM_BEEF_COOKED">
<value>Steak</value>
</data>

</data>

<data name="IDS_ITEM_MUTTON_RAW">
<value>Raw Mutton</value>
</data>
<data name="IDS_ITEM_MUTTON_COOKED">
<value>Cooked Mutton</value>
</data>
<data name="IDS_ITEM_ROTTEN_FLESH">
<value>Rotten Flesh</value>
</data>
Expand Down
19 changes: 17 additions & 2 deletions Minecraft.Client/Windows64Media/loc/zh-CHT/stringsGeneric.xml
Original file line number Diff line number Diff line change
Expand Up @@ -879,8 +879,16 @@ Minecraft 是一款可讓您放置方塊來建造夢想世界的遊戲。但千

<data name="IDS_DESC_BEEF_COOKED">
<value>可回復 4 個 {*ICON_SHANK_01*}。</value>
</data>
</data>

<data name="IDS_DESC_MUTTON_COOKED">
<value>可回復 3 個 {*ICON_SHANK_01*}。可在熔爐中烹煮生羊肉來製作。</value>
</data>

<data name="IDS_DESC_MUTTON_RAW">
<value>可回復 1 個 {*ICON_SHANK_01*},或可在熔爐中烹煮。</value>
</data>

<data name="IDS_DESC_PORKCHOP_RAW">
<value>殺死豬即可獲得,能回復 1.5 個 {*ICON_SHANK_01*}。可在熔爐中烹煮。</value>
</data>
Expand Down Expand Up @@ -2445,7 +2453,14 @@ Minecraft 是一款可讓您放置方塊來建造夢想世界的遊戲。但千

<data name="IDS_ITEM_BEEF_COOKED">
<value>牛排</value>
</data>
</data>

<data name="IDS_ITEM_MUTTON_RAW">
<value>生羊肉</value>
</data>
<data name="IDS_ITEM_MUTTON_COOKED">
<value>熟羊肉</value>
</data>

<data name="IDS_ITEM_ROTTEN_FLESH">
<value>腐肉</value>
Expand Down
Loading