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,

depends.txt

@@ -1,7 +1,6 @@
 default
 biome_lib
 vessels
-doors?
 stairs?
 moreblocks?
 intllib?

init.lua

@@ -15,41 +15,6 @@
 
 moretrees = {}
 
-minetest.override_item("default:sapling", {
-	description = "Sapling"
-})
-
-minetest.override_item("default:tree", {
-	description = "Tree"
-})
-
-minetest.override_item("default:wood", {
-	description = "Wooden Planks"
-})
-
-minetest.override_item("default:leaves", {
-	description = "Leaves"
-})
-
-minetest.override_item("default:fence_wood", {
-	description = "Wooden Fence"
-})
-
-minetest.override_item("default:fence_rail_wood", {
-	description = "Wooden Fence Rail"
-})
-
-if minetest.get_modpath("doors") then
-	minetest.override_item("doors:gate_wood_closed", {
-		description = "Wooden Fence Gate"
-	})
-
-	minetest.override_item("doors:gate_wood_open", {
-		description = "Wooden Fence Gate"
-	})
-end
-
-
 -- Read the default config file (and if necessary, copy it to the world folder).
 
 local worldpath=minetest.get_worldpath()
@@ -71,6 +36,17 @@ else
 end
 moretrees.intllib = S
 
+-- clone node
+
+function moretrees.clone_node(name)
+	local node2 = {}
+	local node = minetest.registered_nodes[name]
+	for k,v in pairs(node) do
+		node2[k]=v
+	end
+	return node2
+end
+
 -- infinite stacks checking
 
 if minetest.get_modpath("unified_inventory") or not

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({
@@ -404,7 +406,7 @@ default.register_leafdecay({
 
 
 if moretrees.enable_redefine_apple then
-	local appledef = table.copy(minetest.registered_nodes["default:apple"])
+	local appledef = moretrees.clone_node("default:apple")
 	appledef.groups.attached_node = 1
 	minetest.register_node(":default:apple", appledef)
 end