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
if not minetest.get_modpath("i3") then
minetest.register_craft( {
type = "shapeless",
output = "basic_materials:terracotta_base 8",
recipe = {
materials.bucket_water,
materials.clay_lump,
materials.gravel,
},
replacements = {{materials.bucket_water, materials.bucket_empty}},
})
minetest.register_craft( {
type = "shapeless",
output = "basic_materials:terracotta_base 8",
recipe = {
materials.water_bucket,
materials.clay_lump,
materials.gravel,
},
replacements = {{materials.water_bucket, materials.empty_bucket}},
})
minetest.register_craft({
type = "shapeless",
output = "basic_materials:wet_cement 3",
recipe = {
materials.dirt,
materials.dark_grey,
materials.dark_grey,
materials.dark_grey,
materials.bucket_water
},
replacements = {{materials.bucket_water, materials.bucket_empty}},
})
end
minetest.register_craft({
type = "shapeless",
output = "basic_materials:wet_cement 3",
recipe = {
materials.dirt,
materials.dye_dark_grey,
materials.dye_dark_grey,
materials.dye_dark_grey,
materials.water_bucket
},
replacements = {{materials.water_bucket, materials.empty_bucket}},
})
if not have_hades_materials then
minetest.register_craft( {