1
0
mirror of https://codeberg.org/tenplus1/farming.git synced 2025-07-01 15:50:46 +02:00

Merge remote-tracking branch 'upstream/master'

This commit is contained in:
2020-07-17 22:51:45 +02:00
51 changed files with 1043 additions and 848 deletions

View File

@ -26,7 +26,7 @@ local function register_plant(name, min, max, spawnon, spawnby, num, rarety)
y_max = max,
decoration = "farming:" .. name,
spawn_by = spawnby,
num_spawn_by = num,
num_spawn_by = num
})
end
@ -49,6 +49,7 @@ register_plant("pea_5", 25, 50, nil, "", -1, farming.peas)
register_plant("beetroot_5", 1, 15, nil, "", -1, farming.beetroot)
register_plant("mint_4", 1, 75, {"default:dirt_with_grass",
"default:dirt_with_coniferous_litter"}, "group:water", 1, farming.mint)
register_plant("cabbage_6", 2, 10, nil, "", -1, farming.cabbage)
if minetest.get_mapgen_setting("mg_name") == "v6" then
@ -83,7 +84,7 @@ minetest.register_decoration({
y_max = 45,
decoration = "farming:hemp_7",
spawn_by = "group:tree",
num_spawn_by = 1,
num_spawn_by = 1
})
end
@ -104,7 +105,7 @@ minetest.register_decoration({
y_max = 35,
decoration = {"farming:chili_8"},
spawn_by = "group:tree",
num_spawn_by = 1,
num_spawn_by = 1
})
end
@ -125,7 +126,7 @@ minetest.register_decoration({
y_max = 35,
decoration = {"farming:pepper_5"},
spawn_by = "group:tree",
num_spawn_by = 1,
num_spawn_by = 1
})
end
@ -144,7 +145,7 @@ minetest.register_decoration({
},
y_min = 18,
y_max = 30,
decoration = {"farming:pineapple_8"},
decoration = {"farming:pineapple_8"}
})
end
@ -164,5 +165,5 @@ minetest.register_decoration({
biomes = {"savanna"},
y_max = 31000,
y_min = 1,
decoration = "farming:cotton_wild",
decoration = "farming:cotton_wild"
})