merge upstream

This commit is contained in:
Milan 2022-08-25 17:51:59 +02:00
commit f3be63d874
697 changed files with 8307 additions and 2471 deletions

View file

@ -248,7 +248,7 @@ end
minetest.register_abm({
label = "Mushroom spread",
nodenames = {"flowers:mushroom_brown", "flowers:mushroom_red"},
nodenames = {"group:mushroom"},
interval = 11,
chance = 150,
action = function(...)
@ -279,6 +279,7 @@ local waterlily_def = {
tiles = {"flowers_waterlily.png", "flowers_waterlily_bottom.png"},
inventory_image = "flowers_waterlily.png",
wield_image = "flowers_waterlily.png",
use_texture_alpha = "clip",
liquids_pointable = true,
walkable = false,
buildable_to = true,
@ -312,8 +313,7 @@ local waterlily_def = {
minetest.set_node(pos, {name = "flowers:waterlily" ..
(def.waving == 3 and "_waving" or ""),
param2 = math.random(0, 3)})
if not (creative and creative.is_enabled_for
and creative.is_enabled_for(player_name)) then
if not minetest.is_creative_enabled(player_name) then
itemstack:take_item()
end
else