merge upstream

depends.txt

@@ -4,6 +4,7 @@ stairs
 flowers
 doors
 mobs_slimes
+caverealms?
 bakedclay?
 moreblocks?
 intllib?

mapgen.lua

@@ -316,10 +316,16 @@ add_node({"ethereal:dry_dirt"}, 0.006, {"plains"}, 1, 100, {"ethereal:scorched_t
 -- dry shrub
 add_node({"ethereal:dry_dirt"}, 0.015, {"plains"}, 1, 100, {"default:dry_shrub"}, nil, nil, nil, ethereal.plains)
 add_node({"default:sand"}, 0.015, {"grassy_ocean"}, 1, 100, {"default:dry_shrub"}, nil, nil, nil, ethereal.grassy)
-add_node({"default:desert_sand","default:desert_stone"}, 0.015, {"desert"}, 1, 100, {"default:dry_shrub"}, nil, nil, nil, ethereal.desert)
+add_node({"default:desert_sand","default:desert_stone"}, 0.015, {"caves"}, 1, 100, {"default:dry_shrub"}, nil, nil, nil, ethereal.desert)
 add_node({"default:sandstone"}, 0.015, {"sandstone"}, 1, 100, {"default:dry_shrub"}, nil, nil, nil, ethereal.sandstone)
 add_node({"bakedclay:red", "bakedclay:orange"}, 0.015, {"mesa"}, 1, 100, {"default:dry_shrub"}, nil, nil, nil, ethereal.mesa)
 
+-- Mystic Plant
+add_node({"default:desert_stone"}, 0.015, {"caves"}, 1, 100, {"ethereal:mystic_plant"}, nil, nil, nil, ethereal.desert)
+
+-- Dornbush
+add_node({"default:sand", "default:desert_sand"}, 0.005, {"desert_ocean", "desert", "mesa_ocean", "mesa", "prairie_ocean", "prairie", "sandstone_ocean", "sandstone", "savannah_ocean", "savannah", "fiery_ocean"}, 5, 120, {"ethereal:dornbush"}, nil, nil, nil, ethereal.desert)
+
 -- dry grass
 add_node({"default:dirt_with_dry_grass"}, 0.25, {"savannah"}, 1, 100, {"default:dry_grass_2",
 	"default:dry_grass_3", "default:dry_grass_4", "default:dry_grass_5"}, nil, nil, nil, ethereal.savannah)
@@ -350,6 +356,8 @@ add_node({"ethereal:fiery_dirt"}, 0.10, {"fiery"}, 1, 100, {"ethereal:dry_shrub"
 -- snowy grass
 add_node({"ethereal:gray_dirt"}, 0.05, {"grayness"}, 1, 100, {"ethereal:snowygrass"}, nil, nil, nil, ethereal.grayness)
 add_node({"ethereal:cold_dirt"}, 0.05, {"snowy"}, 1, 100, {"ethereal:snowygrass"}, nil, nil, nil, ethereal.snowy)
+add_node({"default:dirt_with_snow"}, 0.05, {"alpine"}, 1, 100, {"ethereal:snowygrass"}, nil, nil, nil, ethereal.alpine)
+add_node({"ethereal:crystalgrass"}, 0.05, {"frost"}, 1, 100, {"ethereal:snowygrass"}, nil, nil, nil, ethereal.frost)
 
 -- cactus
 add_node({"default:sandstone"}, 0.0025, {"sandstone"}, 1, 100, {"default:cactus"}, 3, nil, nil, ethereal.sandstone)

plantlife.lua

@@ -315,9 +315,9 @@ minetest.register_node("ethereal:mystic_plant", {
 })
 
 minetest.register_node("ethereal:dornbush", {
-	description = "Testplant",
+	description = "Dornbush",
 	drawtype = "plantlike",
-	tiles = {"ethereal_dornbush.png"},
+	tiles = {"dornbush.png"},
 	paramtype = "light",
 	is_ground_content = false,
 	buildable_to = true, 

plantpack.lua

@@ -190,21 +190,3 @@ minetest.register_decoration({
 	biomes = {"clearing"},
 	decoration = {"xanadu:poppy"},
 })
-
-minetest.register_decoration({
-	deco_type = "simple",
-	place_on = "default:desert_stone",
-	sidelen = 16,
-	fill_ratio = 0.004,
-	biomes = {"desert"},
-	decoration = "ethereal:mystic_plant",
-})
-
-minetest.register_decoration({
-	deco_type = "simple",
-	place_on = {"default:sand"},
-	sidelen = 16,
-	fill_ratio = 0.004,
-	biomes = {"desert_ocean", "desert"},
-	decoration = "ethereal:dornbush",
-})