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

fix: merge conflicts

Browse Source
This commit is contained in:
Fireblade
2026-05-24 23:20:13 -04:00
parent 8676650294
commit cc424e1fad
6 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Minecraft.Client/Common/UI/IUIScene_CreativeMenu.cpp
+1 -1
View File
@@ -234,7 +234,7 @@ void IUIScene_CreativeMenu::staticCtor()
ITEM_AUX(Tile::red_flower_Id, Rose::WHITE_TULIP)
ITEM_AUX(Tile::red_flower_Id, Rose::PINK_TULIP)
ITEM_AUX(Tile::red_flower_Id, Rose::OXEYE_DAISY)
ITEM(Tile::tallgrass2_Id)
ITEM(Tile::double_plant_Id)
ITEM_AUX(Tile::double_plant_Id, TallGrass2::LILAC)
ITEM_AUX(Tile::double_plant_Id, TallGrass2::TALL_GRASS)
ITEM_AUX(Tile::double_plant_Id, TallGrass2::LARGE_FERN)