Merge remote-tracking branch 'upstream/master' into nalc-1.2-dev

* Permet de les dropper quand on récolte le bloc où ils sont attachés.

bushes/init.lua

@@ -258,3 +258,5 @@ biome_lib:register_generate_plant({
 )
 
 		--http://dev.minetest.net/Node_Drawtypes
+
+minetest.log("action", "[bushes] loaded.")

ferns/gianttreefern.lua

@@ -252,13 +252,16 @@ minetest.register_node("ferns:fern_trunk_big", {
 	},
 	groups = {tree=1,choppy=2,oddly_breakable_by_hand=2,flammable=3,wood=1},
 	sounds = default.node_sound_wood_defaults(),
-	after_destruct = function(pos,oldnode)
-        local node = minetest.get_node({x=pos.x,y=pos.y+1,z=pos.z})
-        if node.name == "ferns:fern_trunk_big" or node.name == "ferns:fern_trunk_big_top" then
-            minetest.dig_node({x=pos.x,y=pos.y+1,z=pos.z})
-            minetest.add_item(pos,"ferns:fern_trunk_big")
-        end
-    end,
+	after_dig_node = function(pos, node, metadata, digger)
+		if digger == nil then return end
+		local np = {x=pos.x,y=pos.y+1,z=pos.z}
+		local nn = minetest.get_node(np)
+		if nn.name == "ferns:fern_trunk_big" or
+			nn.name == "ferns:fern_trunk_big_top"
+		then
+			minetest.node_dig(np, nn, digger)
+		end
+	end,
 })
 
 -----------------------------------------------------------------------------------------------

ferns/treefern.lua

@@ -138,13 +138,9 @@ minetest.register_node("ferns:fern_trunk", {
 	},
 	groups = {tree=1,choppy=2,oddly_breakable_by_hand=2,flammable=3,wood=1},
 	sounds = default.node_sound_wood_defaults(),
-	after_destruct = function(pos,oldnode)
-        local node = minetest.get_node({x=pos.x,y=pos.y+1,z=pos.z})
-        if node.name == "ferns:fern_trunk" then
-            minetest.dig_node({x=pos.x,y=pos.y+1,z=pos.z})
-            minetest.add_item(pos,"ferns:fern_trunk")
-        end
-    end,
+	after_dig_node = function(pos, node, metadata, digger)
+		default.dig_up(pos, node, digger)
+	end,
 })
 
 -----------------------------------------------------------------------------------------------

junglegrass/init.lua

@@ -1,3 +1,5 @@
 minetest.register_alias("junglegrass:shortest", "air")
 minetest.register_alias("junglegrass:short", "air")
 minetest.register_alias("junglegrass:medium", "air")
+
+minetest.log("action", "[junglegrass] loaded.")

modpack.conf

@@ -0,0 +1 @@
+min_minetest_version = 5.2.0

nature_classic/init.lua

@@ -47,4 +47,4 @@ dofile(minetest.get_modpath(current_mod_name) .. "/config.lua")
 dofile(minetest.get_modpath(current_mod_name) .. "/global_function.lua")
 dofile(minetest.get_modpath(current_mod_name) .. "/blossom.lua")
 
-minetest.log("info", S("[Nature Classic] loaded!"))
+minetest.log("action", S("[Nature Classic] loaded!"))

trunks/nodes.lua

@@ -71,7 +71,7 @@ minetest.register_node("trunks:moss", {
 	walkable = false,
 	node_box = {type = "fixed", fixed = flat_moss},
 	selection_box = {type = "fixed", fixed = flat_stick},--{type = "wallmounted"},
-	groups = {snappy = 3, flammable = 3 },
+	groups = {snappy = 3, flammable = 3, attached_node = 1 },
 	sounds = default.node_sound_leaves_defaults(),
 })
 
@@ -90,7 +90,7 @@ minetest.register_node("trunks:moss_fungus", {
 	walkable = false,
 	node_box = {type = "fixed", fixed = flat_moss},
 	selection_box = {type = "fixed", fixed = flat_stick},--{type = "wallmounted"},
-	groups = {snappy = 3, flammable = 3 },
+	groups = {snappy = 3, flammable = 3, attached_node = 1 },
 	sounds = default.node_sound_leaves_defaults(),
 })
 

youngtrees/init.lua

@@ -147,3 +147,5 @@ biome_lib:register_generate_plant({
   },
   abstract_youngtrees.grow_youngtree
 )
+
+minetest.log("action", "[youngtrees] loaded.")