Merge branch 'master' into nalc-1.1

bushes/init.lua

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

bushes_classic/init.lua

@@ -55,4 +55,4 @@ biome_lib:spawn_on_surfaces({
 
 minetest.register_alias("bushes:basket_pies", "bushes:basket_strawberry")
 
-print(S("[Bushes] Loaded."))
+print(S("[Bushes_classic] Loaded."))

ferns/gianttreefern.lua

@@ -256,7 +256,6 @@ minetest.register_node("ferns:fern_trunk_big", {
         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,
 })

ferns/treefern.lua

@@ -142,7 +142,6 @@ minetest.register_node("ferns:fern_trunk", {
         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,
 })

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.")

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!"))

plantlife_i18n/init.lua

@@ -5,3 +5,5 @@ plantlife_i18n = { }
 
 local MP = minetest.get_modpath(minetest.get_current_modname())
 plantlife_i18n.gettext, plantlife_i18n.ngettext = dofile(MP.."/intllib.lua")
+
+minetest.log("action", "[plantlife_i18n] loaded.")

trunks/generating.lua

@@ -1,5 +1,14 @@
 -- Code by Mossmanikin, Neuromancer, and others
 
+local function 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
+
 -----------------------------------------------------------------------------------------------
 -- TWiGS
 -----------------------------------------------------------------------------------------------
@@ -221,7 +230,7 @@ for i in pairs(TRuNKS) do
 	if minetest.get_modpath(MoD) ~= nil
 	and NR < 6 -- moretrees trunks allready have facedir
 	and minetest.registered_nodes[trunkname] then -- the node being called exists.
-			temptrunk = table.copy(minetest.registered_nodes[trunkname])
+			temptrunk = clone_node(trunkname)
 			temptrunk.paramtype2 = "facedir"
 			minetest.register_node(":"..trunkname, temptrunk)
 	end

vines/init.lua

@@ -13,7 +13,7 @@ local S = plantlife_i18n.gettext
 minetest.register_craftitem("vines:vines", {
 	description = S("Vines"),
 	inventory_image = "vines_item.png",
-	groups = {vines = 1, flammable = 2}
+	group = {vines = 1, flammable = 2}
 })
 
 -- FUNCTIONS

youngtrees/init.lua

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