Fix conflict with master branch.

This commit is contained in:
SFENCE 2022-02-28 15:59:38 +01:00
commit fccf303b7d
1 changed files with 22 additions and 25 deletions

View File

@ -311,32 +311,29 @@ minetest.register_craft( {
}, },
}) })
--i3 does has issues in its craft override with replacements minetest.register_craft( {
if not minetest.get_modpath("i3") then type = "shapeless",
minetest.register_craft( { output = "basic_materials:terracotta_base 8",
type = "shapeless", recipe = {
output = "basic_materials:terracotta_base 8", materials.water_bucket,
recipe = { materials.clay_lump,
materials.bucket_water, materials.gravel,
materials.clay_lump, },
materials.gravel, replacements = {{materials.water_bucket, materials.empty_bucket}},
}, })
replacements = {{materials.bucket_water, materials.bucket_empty}},
})
minetest.register_craft({ minetest.register_craft({
type = "shapeless", type = "shapeless",
output = "basic_materials:wet_cement 3", output = "basic_materials:wet_cement 3",
recipe = { recipe = {
materials.dirt, materials.dirt,
materials.dark_grey, materials.dye_dark_grey,
materials.dark_grey, materials.dye_dark_grey,
materials.dark_grey, materials.dye_dark_grey,
materials.bucket_water materials.water_bucket
}, },
replacements = {{materials.bucket_water, materials.bucket_empty}}, replacements = {{materials.water_bucket, materials.empty_bucket}},
}) })
end
if not have_hades_materials then if not have_hades_materials then
minetest.register_craft( { minetest.register_craft( {