Merge remote-tracking branch 'upstream/master'

This commit is contained in:
bri cassa 2021-11-06 09:21:27 +01:00
commit fb4ba8ff96
2 changed files with 20 additions and 16 deletions

View File

@ -1 +0,0 @@
default

View File

@ -76,6 +76,8 @@ minetest.register_node("jumping:cushion", {
groups = {dig_immediate=2, disable_jump=1, fall_damage_add_percent=-100}, groups = {dig_immediate=2, disable_jump=1, fall_damage_add_percent=-100},
}) })
-- register recipes if the corresponding mods are present
if minetest.get_modpath("default") then
minetest.register_craft({ minetest.register_craft({
output = "jumping:trampoline1", output = "jumping:trampoline1",
recipe = { recipe = {
@ -83,7 +85,9 @@ minetest.register_craft({
{"default:steel_ingot", "", "default:steel_ingot"} {"default:steel_ingot", "", "default:steel_ingot"}
} }
}) })
end
if minetest.get_modpath("farming") and minetest.get_modpath("wool") then
minetest.register_craft({ minetest.register_craft({
output = "jumping:cushion", output = "jumping:cushion",
recipe = { recipe = {
@ -92,5 +96,6 @@ minetest.register_craft({
{"farming:cotton", "farming:cotton", "farming:cotton"} {"farming:cotton", "farming:cotton", "farming:cotton"}
} }
}) })
end
minetest.log("action", "[jumping] loaded.") minetest.log("action", "[jumping] loaded.")