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.World/OreRecipies.cpp
+1 -1
View File
@@ -33,7 +33,7 @@ void OreRecipies::_init()
ADD_OBJECT(map[7],new ItemInstance(Item::wheat, 9));
ADD_OBJECT(map[8],Tile::slimeBlock);
ADD_OBJECT(map[8],new ItemInstance(Item::slimeBall, 9));
ADD_OBJECT(map[8],new ItemInstance(Item::slime_ball, 9));
}
void OreRecipies::addRecipes(Recipes *r)
{