Luanti/minetest_game
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

resolve mergeconflicts

Browse source
This commit is contained in:
Milan Ihl 2020-08-17 22:07:15 +02:00
commit 029ab5aa0c
488 changed files with 9848 additions and 2154 deletions
Download patch file Download diff file Expand all files Collapse all files

9
mods/flowers/mapgen.lua
View file

@ -60,7 +60,7 @@ local function register_mgv6_waterlily()
},
y_max = 0,
y_min = 0,
decoration = "flowers:waterlily",
decoration = "flowers:waterlily_waving",
param2 = 0,
param2_max = 3,
place_offset_y = 1,
@ -100,7 +100,7 @@ local function register_flower(seed, flower_name)
octaves = 3,
persist = 0.6
},
biomes = {"grassland", "deciduous_forest", "floatland_grassland"},
biomes = {"grassland", "deciduous_forest"},
y_max = 31000,
y_min = 1,
decoration = "flowers:"..flower_name,
@ -121,8 +121,7 @@ local function register_mushroom(mushroom_name)
octaves = 3,
persist = 0.66
},
biomes = {"deciduous_forest", "coniferous_forest",
"floatland_coniferous_forest"},
biomes = {"deciduous_forest", "coniferous_forest"},
y_max = 31000,
y_min = 1,
decoration = "flowers:"..mushroom_name,
@ -146,7 +145,7 @@ local function register_waterlily()
biomes = {"rainforest_swamp", "savanna_shore", "deciduous_forest_shore"},
y_max = 0,
y_min = 0,
decoration = "flowers:waterlily",
decoration = "flowers:waterlily_waving",
param2 = 0,
param2_max = 3,
place_offset_y = 1,