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

fix: merge conflicts (again)

Browse Source
This commit is contained in:
Fireblade
2026-05-24 23:59:48 -04:00
parent d4b98cf70b
commit f005b4e485
7 changed files with 35 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Minecraft.World/StructureRecipies.cpp
+2 -2
View File
@@ -82,14 +82,14 @@ void StructureRecipies::addRecipes(Recipes *r)
L"#Q", //
L"Q#", //
L'#', Tile::cobblestone, L'Q', Item::netherQuartz,
L'#', Tile::cobblestone, L'Q', Item::nether_quartz,
L'S');
r->addShapedRecipy(new ItemInstance(Tile::stone_Id, 1, StoneTile::GRANITE), //
L"sczcig",
L"#Q", //
L'#', new ItemInstance(Tile::stone_Id, 1, StoneTile::DIORITE), L'Q', Item::netherQuartz,
L'#', new ItemInstance(Tile::stone_Id, 1, StoneTile::DIORITE), L'Q', Item::nether_quartz,
L'S');
r->addShapedRecipy(new ItemInstance(Tile::stone_Id, 2, StoneTile::ANDESITE), //