Merge branch 'master' into nalc-1.2

* Cela fait gagner un peu de la place dans l'inventaire.

biome_defs.lua

@@ -125,7 +125,10 @@ moretrees.willow_biome = {
 }
 
 moretrees.rubber_tree_biome = {
-	surface = "default:dirt_with_grass",
+	surface = {
+		"default:dirt_with_grass",
+		"default:sand",
+	},
 	avoid_nodes = moretrees.avoidnodes,
 	avoid_radius = 10,
 	seed_diff = 338,

node_defs.lua

@@ -360,6 +360,8 @@ end
 -- we need our own copy of that node, which moretrees will match against.
 
 local jungle_tree = table.copy(minetest.registered_nodes["default:jungletree"])
+jungle_tree.drop = jungle_tree.drop or { items = {} }
+table.insert(jungle_tree.drop.items, { items = {"default:jungletree"}})
 minetest.register_node("moretrees:jungletree_trunk", jungle_tree)
 
 default.register_leafdecay({

saplings.lua

@@ -10,16 +10,28 @@ local dirt_surfaces = {
 	["default:dirt_with_dry_grass"] = true,
 	["default:dirt_with_coniferous_litter"] = true,
 	["default:dirt_with_rainforest_litter"] = true,
-	["default:dirt_with_snow"] = true,
 	["woodsoils:dirt_with_leaves_1"] = true,
 	["woodsoils:dirt_with_leaves_2"] = true,
 	["woodsoils:grass_with_leaves_1"] = true,
 	["woodsoils:grass_with_leaves_2"] = true
 }
 
-local cold_surfaces = "default:dirt_with_snow"
+local conifer_surfaces =  {
+	set = true,
+	["default:dirt"] = true,
+	["default:dirt_with_grass"] = true,
+	["default:dirt_with_dry_grass"] = true,
+	["default:dirt_with_coniferous_litter"] = true,
+	["default:dirt_with_rainforest_litter"] = true,
+	["woodsoils:dirt_with_leaves_1"] = true,
+	["woodsoils:dirt_with_leaves_2"] = true,
+	["woodsoils:grass_with_leaves_1"] = true,
+	["woodsoils:grass_with_leaves_2"] = true,
+	["default:dirt_with_snow"] = true
+}
 
 local sand_surfaces = {
+	set = true,
 	["default:sand"] = true,
 	["default:desert_sand"] = true,
 	["cottages:loam"] = true,
@@ -38,7 +50,7 @@ for i in ipairs(moretrees.treelist) do
 	  or treename == "fir"
 	  or treename == "cedar"
 	  or treename == "pine" then
-		surfaces = cold_surfaces
+		surfaces = conifer_surfaces
 	elseif string.find(treename, "palm") then
 		surfaces = sand_surfaces
 	else
@@ -62,13 +74,11 @@ for i in ipairs(moretrees.treelist) do
 		grow_function = grow_function,
 	})
 
-	if moretrees.spawn_saplings then
-		biome_lib:grow_plants({
-			grow_delay = 2,
-			grow_chance = 1,
-			grow_plant = "moretrees:"..treename.."_sapling_ongen",
-			grow_nodes = moretrees[tree_biome].surface,
-			grow_function = grow_function,
-		})
-	end
+	biome_lib:grow_plants({
+		grow_delay = 2,
+		grow_chance = 1,
+		grow_plant = "moretrees:"..treename.."_sapling_ongen",
+		grow_nodes = surfaces,
+		grow_function = grow_function,
+	})
 end