Merge remote-tracking branch 'upstream/master'

This commit is contained in:
bri cassa 2024-09-15 09:18:31 +02:00
commit 35601d5c66

View File

@ -55,6 +55,7 @@ for i = 1, 6 do
"jumping_trampoline_bottom.png", "jumping_trampoline_bottom.png",
"jumping_trampoline_sides.png^jumping_trampoline_sides_overlay"..i..".png" "jumping_trampoline_sides.png^jumping_trampoline_sides_overlay"..i..".png"
}, },
is_ground_content = false,
groups = { groups = {
dig_immediate = 2, dig_immediate = 2,
bouncy = 20 + i * 20, bouncy = 20 + i * 20,
@ -76,6 +77,7 @@ minetest.register_node("jumping:cushion", {
"jumping_cushion_tb.png", "jumping_cushion_tb.png",
"jumping_cushion_sides.png" "jumping_cushion_sides.png"
}, },
is_ground_content = false,
groups = {dig_immediate=2, disable_jump=1, fall_damage_add_percent=-100}, groups = {dig_immediate=2, disable_jump=1, fall_damage_add_percent=-100},
}) })