Merge remote-tracking branch 'upstream/master'

2020-08-26 19:09:01 +02:00 · 2020-08-26 19:09:01 +02:00 · 850e9627c7
commit 850e9627c7
parent b2a94399ec c559ea3aef
18 changed files with 1217 additions and 425 deletions
--- a/.luacheckrc
+++ b/.luacheckrc
@ -1,17 +1,30 @@
+std = "lua51+minetest"
 unused_args = false
 allow_defined_top = true
+max_line_length = 999
+max_comment_line_length = 999

-read_globals = {
-	"DIR_DELIM",
-	"minetest", "core",
-	"dump",
-	"vector", "nodeupdate",
-	"VoxelManip", "VoxelArea",
-	"PseudoRandom", "ItemStack",
-	"intllib",
-	"default",
-	table = { fields = { "copy", "getn" } },
-	"biome_lib",
-	"stairs", "stairsplus",
+stds.minetest = {
+	read_globals = {
+		"minetest",
+		"vector",
+		"VoxelManip",
+		"VoxelArea",
+		"PseudoRandom",
+		"ItemStack",
+		"default",
+		table = {
+			fields = {
+				"copy",
+			},
+		},
+		"dump",
+	}
 }

+read_globals = {
+	"biome_lib",
+	"stairsplus",
+	"stairs",
+	"doors",
+}
--- a/cocos_palm.lua
+++ b/cocos_palm.lua
@ -1,6 +1,6 @@
-local S = moretrees.intllib
-
 -- © 2016, Rogier <rogier777@gmail.com>
+-- Translation support
+local S = minetest.get_translator("moretrees")

 -- Some constants

@ -23,7 +23,11 @@ end
 ftrunk.drop = "moretrees:palm_trunk"
 gftrunk.drop = "moretrees:palm_trunk"
 ftrunk.after_destruct = function(pos, oldnode)
-	local coconuts = minetest.find_nodes_in_area({x=pos.x-1, y=pos.y, z=pos.z-1}, {x=pos.x+1, y=pos.y, z=pos.z+1}, {"group:moretrees_coconut"})
+	local coconuts = minetest.find_nodes_in_area(
+		{x=pos.x-1, y=pos.y, z=pos.z-1},
+		{x=pos.x+1, y=pos.y, z=pos.z+1},
+		{"group:moretrees_coconut"}
+	)
 	for _,coconutpos in pairs(coconuts) do
 		-- minetest.dig_node(coconutpos) does not cause nearby coconuts to be dropped :-( ...
 		--minetest.dig_node(coconutpos)
@ -46,7 +50,11 @@ local coconut_regrow_abm_spec = {
 	interval = moretrees.coconut_flower_interval,
 	chance = moretrees.coconut_flower_chance,
 	action = function(pos, node, active_object_count, active_object_count_wider)
-		local coconuts = minetest.find_nodes_in_area({x=pos.x-1, y=pos.y, z=pos.z-1}, {x=pos.x+1, y=pos.y, z=pos.z+1}, "group:moretrees_coconut")
+		local coconuts = minetest.find_nodes_in_area(
+			{x=pos.x-1, y=pos.y, z=pos.z-1},
+			{x=pos.x+1, y=pos.y, z=pos.z+1},
+			"group:moretrees_coconut"
+		)
 		-- Expected growth interval increases exponentially with number of coconuts already hanging.
 		-- Also: if more coconuts are hanging, the chance of picking an empty spot decreases as well...
 		if math.random(2^#coconuts) <= 2 then
@ -76,15 +84,18 @@ minetest.register_abm({
 	chance = 1,
 	action = function(pos, node, active_object_count, active_object_count_wider)
 		minetest.swap_node(pos, {name="moretrees:palm_fruit_trunk"})
-		local poslist = minetest.find_nodes_in_area({x=pos.x-1, y=pos.y, z=pos.z-1}, {x=pos.x+1, y=pos.y, z=pos.z+1}, "air")
+		local poslist = minetest.find_nodes_in_area(
+			{x=pos.x-1, y=pos.y, z=pos.z-1},
+			{x=pos.x+1, y=pos.y, z=pos.z+1},
+			"air"
+		)
 		local genlist = {}
 		for k,v in pairs(poslist) do
 			genlist[k] = {x = math.random(100), pos = v}
 		end
 		table.sort(genlist, function(a, b) return a.x < b.x; end)
-		local gen
 		local count = 0
-		for _,gen in pairs(genlist) do
+		for _, gen in pairs(genlist) do
 			minetest.swap_node(gen.pos, {name = "moretrees:coconut_3"})
 			count = count + 1
 			if count == 4 then
@ -109,7 +120,8 @@ local coconut_growfn = function(pos, elapsed)
 		-- Drop coconuts (i.e. remove them), so that new coconuts can grow.
 		-- Coconuts will drop as items with a small chance
 		if math.random(coconut_drop_ichance) == 1 then
-			if moretrees.coconut_item_drop_ichance > 0 and math.random(moretrees.coconut_item_drop_ichance) == 1 then
+			if moretrees.coconut_item_drop_ichance > 0
+				and math.random(moretrees.coconut_item_drop_ichance) == 1 then
 				local items = minetest.get_node_drops(minetest.get_node(pos).name)
 				for _, itemname in pairs(items) do
 					minetest.add_item(pos, itemname)
@ -190,55 +202,95 @@ if moretrees.coconuts_convert_existing_palms then
 			local leaves
 			local coconuts
 			-- One regular trunk must be adjacent to  the coconut
-			trunks = minetest.find_nodes_in_area({x=pos.x-1, y=pos.y, z=pos.z-1}, {x=pos.x+1, y=pos.y, z=pos.z+1}, "moretrees:palm_trunk")
+			trunks = minetest.find_nodes_in_area(
+				{x=pos.x-1, y=pos.y, z=pos.z-1},
+				{x=pos.x+1, y=pos.y, z=pos.z+1},
+				"moretrees:palm_trunk"
+			)
 			if #trunks ~= 1 then
 				return
 			end
 			local tpos = trunks[1]
 			-- 1 or 2 other trunks must be one level below to the trunk being converted.
-			trunks = minetest.find_nodes_in_area({x=tpos.x-1, y=tpos.y-1, z=tpos.z-1}, {x=tpos.x+1, y=tpos.y-1, z=tpos.z+1}, "moretrees:palm_trunk")
+			trunks = minetest.find_nodes_in_area(
+				{x=tpos.x-1, y=tpos.y-1, z=tpos.z-1},
+				{x=tpos.x+1, y=tpos.y-1, z=tpos.z+1},
+				"moretrees:palm_trunk"
+			)
 			if #trunks < 1 or #trunks > 2 then
 				return
 			end
 			-- 1 or 2 other trunks must be two levels below to the trunk being converted.
-			trunks = minetest.find_nodes_in_area({x=tpos.x-1, y=tpos.y-2, z=tpos.z-1}, {x=tpos.x+1, y=tpos.y-2, z=tpos.z+1}, "moretrees:palm_trunk")
+			trunks = minetest.find_nodes_in_area(
+				{x=tpos.x-1, y=tpos.y-2, z=tpos.z-1},
+				{x=tpos.x+1, y=tpos.y-2, z=tpos.z+1},
+				"moretrees:palm_trunk"
+			)
 			if #trunks < 1 or #trunks > 2 then
 				return
 			end
 			-- 1 or 2 trunks must at the level of the trunk being converted.
-			cvtrunks = minetest.find_nodes_in_area({x=tpos.x-1, y=tpos.y, z=tpos.z-1}, {x=tpos.x+1, y=tpos.y, z=tpos.z+1}, "moretrees:palm_trunk")
+			cvtrunks = minetest.find_nodes_in_area(
+				{x=tpos.x-1, y=tpos.y, z=tpos.z-1},
+				{x=tpos.x+1, y=tpos.y, z=tpos.z+1},
+				"moretrees:palm_trunk"
+			)
 			if #cvtrunks < 1 or #cvtrunks > 2 then
 				return
 			end
 			-- No trunks may be one level above the trunk being converted.
-			trunks = minetest.find_nodes_in_area({x=tpos.x-1, y=tpos.y+1, z=tpos.z-1}, {x=tpos.x+1, y=tpos.y+1, z=tpos.z+1}, "moretrees:palm_trunk")
+			trunks = minetest.find_nodes_in_area(
+				{x=tpos.x-1, y=tpos.y+1, z=tpos.z-1},
+				{x=tpos.x+1, y=tpos.y+1, z=tpos.z+1},
+				"moretrees:palm_trunk"
+			)
 			if #trunks ~= 0 then
 				return
 			end
 			-- Leaves must be one level above the trunk being converted.
-			leaves = minetest.find_nodes_in_area({x=tpos.x-1, y=tpos.y+1, z=tpos.z-1}, {x=tpos.x+1, y=tpos.y+1, z=tpos.z+1}, "moretrees:palm_leaves")
+			leaves = minetest.find_nodes_in_area(
+				{x=tpos.x-1, y=tpos.y+1, z=tpos.z-1},
+				{x=tpos.x+1, y=tpos.y+1, z=tpos.z+1},
+				"moretrees:palm_leaves"
+			)
 			if #leaves == 0 then
 				return
 			end
 			-- Leaves must be two levels above the trunk being converted.
-			leaves = minetest.find_nodes_in_area({x=tpos.x-1, y=tpos.y+2, z=tpos.z-1}, {x=tpos.x+1, y=tpos.y+2, z=tpos.z+1}, "moretrees:palm_leaves")
+			leaves = minetest.find_nodes_in_area(
+				{x=tpos.x-1, y=tpos.y+2, z=tpos.z-1},
+				{x=tpos.x+1, y=tpos.y+2, z=tpos.z+1},
+				"moretrees:palm_leaves"
+			)
 			if #leaves == 0 then
 				return
 			end
 			-- No cocos fruit trunk may already be adjacent to the coconut
-			trunks = minetest.find_nodes_in_area({x=pos.x-1, y=pos.y, z=pos.z-1}, {x=pos.x+1, y=pos.y, z=pos.z+1}, "moretrees:palm_fruit_trunk")
+			trunks = minetest.find_nodes_in_area(
+				{x=pos.x-1, y=pos.y, z=pos.z-1},
+				{x=pos.x+1, y=pos.y, z=pos.z+1},
+				"moretrees:palm_fruit_trunk"
+			)
 			if #trunks ~= 0 then
 				return
 			end
 			-- No cocos fruit trunk may be adjacent to or below the trunk being converted.
-			trunks = minetest.find_nodes_in_area({x=tpos.x-1, y=tpos.y-2, z=tpos.z-1}, {x=tpos.x+1, y=tpos.y, z=tpos.z+1}, "moretrees:palm_fruit_trunk")
+			trunks = minetest.find_nodes_in_area(
+				{x=tpos.x-1, y=tpos.y-2, z=tpos.z-1},
+				{x=tpos.x+1, y=tpos.y, z=tpos.z+1},
+				"moretrees:palm_fruit_trunk"
+			)
 			if #trunks ~= 0 then
 				return
 			end
 			-- Convert trunk and all coconuts nearby. Maybe convert 2 trunks, just in case...
-			for _, tpos in pairs(cvtrunks) do
-				minetest.swap_node(tpos, {name = "moretrees:palm_fruit_trunk"})
-				coconuts = minetest.find_nodes_in_area({x=tpos.x-1, y=tpos.y, z=tpos.z-1}, {x=tpos.x+1, y=tpos.y, z=tpos.z+1}, "moretrees:coconut")
+			for _, tpos_1 in pairs(cvtrunks) do
+				minetest.swap_node(tpos_1, {name = "moretrees:palm_fruit_trunk"})
+				coconuts = minetest.find_nodes_in_area(
+					{x=tpos_1.x-1, y=tpos_1.y, z=tpos_1.z-1},
+					{x=tpos_1.x+1, y=tpos_1.y, z=tpos_1.z+1},
+					"moretrees:coconut"
+				)
 				for _, coconutpos in pairs(coconuts) do
 					minetest.swap_node(coconutpos, {name = "moretrees:coconut_3"})
 				end
--- a/crafts.lua
+++ b/crafts.lua
@ -1,4 +1,4 @@
-local S = moretrees.intllib
+local S = minetest.get_translator("moretrees")

 for i in ipairs(moretrees.treelist) do
 	local treename = moretrees.treelist[i][1]
@ -38,7 +38,8 @@ minetest.register_craftitem("moretrees:coconut_milk", {
 	description = S("Coconut Milk"),
 	inventory_image = "moretrees_coconut_milk_inv.png",
 	wield_image = "moretrees_coconut_milk.png",
-	on_use = minetest.item_eat(2),
+	on_use = minetest.item_eat(2, "vessels:drinking_glass"),
+	groups = {vessel = 1},
 })

 minetest.register_craftitem("moretrees:raw_coconut", {
@ -120,6 +121,7 @@ for i in ipairs(moretrees.cutting_tools) do
 		}
 	})
 end
+
 -- give tool back with wear preserved
 minetest.register_on_craft(function(itemstack, player, old_craft_grid, craft_inv)
 	if (itemstack:get_name() == "moretrees:coconut_milk") then
@ -127,6 +129,10 @@ minetest.register_on_craft(function(itemstack, player, old_craft_grid, craft_inv
 			-- find tool used to do the craft
 			local ocg_name = j:get_name()
 			if ((ocg_name ~= "") and (ocg_name ~= "moretrees:coconut") and (ocg_name ~= "vessels:drinking_glass")) then
+				-- abort if using cutting board
+				if minetest.get_item_group(ocg_name, "food_cutting_board") == 1 then
+					return
+				end
 				-- create a new tool and set wear
 				local t = ItemStack(ocg_name)
 				local w = j:get_wear()
@ -148,9 +154,27 @@ minetest.register_on_craft(function(itemstack, player, old_craft_grid, craft_inv
 				craft_inv:add_item("craft", t)
 			end
 		end
-  	end
+	end
 end)

+-- coconut milk using food_cutting_board from farming redo
+if minetest.registered_items["farming:cutting_board"] then
+	minetest.register_craft({
+		type = "shapeless",
+		output = "moretrees:coconut_milk",
+		recipe = {
+			"moretrees:coconut",
+			"vessels:drinking_glass",
+			"group:food_cutting_board",
+		},
+		replacements = {
+			{ "moretrees:coconut", "moretrees:raw_coconut" },
+			{ "group:food_cutting_board", "farming:cutting_board" },
+		}
+	})
+end
+
+
 minetest.register_craft({
 	type = "shapeless",
 	output = "moretrees:date_nut_snack",
--- a/date_palm.lua
+++ b/date_palm.lua
@ -11,7 +11,7 @@

 -- © 2016, Rogier <rogier777@gmail.com>

-local S = moretrees.intllib
+local S = minetest.get_translator("moretrees")

 -- Some constants

@ -44,7 +44,11 @@ for k,v in pairs(trunk.tiles) do
 end
 ftrunk.drop = "moretrees:date_palm_trunk"
 ftrunk.after_destruct = function(pos, oldnode)
-	local dates = minetest.find_nodes_in_area({x=pos.x-2, y=pos.y, z=pos.z-2}, {x=pos.x+2, y=pos.y, z=pos.z+2}, {"group:moretrees_dates"})
+	local dates = minetest.find_nodes_in_area(
+		{x=pos.x-2, y=pos.y, z=pos.z-2},
+		{x=pos.x+2, y=pos.y, z=pos.z+2},
+		{"group:moretrees_dates"}
+	)
 	for _,datespos in pairs(dates) do
 		-- minetest.dig_node(datespos) does not cause nearby dates to be dropped :-( ...
 		local items = minetest.get_node_drops(minetest.get_node(datespos).name)
@ -120,8 +124,11 @@ minetest.register_abm({
 			type = "m"
 			minetest.swap_node(pos, {name="moretrees:date_palm_mfruit_trunk"})
 		end
-		local dates1 = minetest.find_nodes_in_area({x=pos.x-1, y=pos.y, z=pos.z-1}, {x=pos.x+1, y=pos.y, z=pos.z+1}, "air")
-		local genpos
+		local dates1 = minetest.find_nodes_in_area(
+			{x=pos.x-1, y=pos.y, z=pos.z-1},
+			{x=pos.x+1, y=pos.y, z=pos.z+1},
+			"air"
+		)
 		for _,genpos in pairs(dates1) do
 			if math.random(100) <= 20 then
 				if type == "m" then
@ -131,7 +138,11 @@ minetest.register_abm({
 				end
 			end
 		end
-		local dates2 = minetest.find_nodes_in_area({x=pos.x-2, y=pos.y, z=pos.z-2}, {x=pos.x+2, y=pos.y, z=pos.z+2}, "air")
+		local dates2 = minetest.find_nodes_in_area(
+			{x=pos.x-2, y=pos.y, z=pos.z-2},
+			{x=pos.x+2, y=pos.y, z=pos.z+2},
+			"air"
+		)
 		for _,genpos in pairs(dates2) do
 			if math.random(100) <= 5 then
 				if type == "m" then
@ -195,7 +206,7 @@ local function find_fruit_trunks_near(ftpos, sect)
 	local r = moretrees.dates_pollination_distance + 2 * math.sqrt(2)
 	local sect_hr = math.floor(r / 3 + 0.9999)
 	local sect_vr = math.floor(r / 2 + 0.9999)
-	local t0us = core.get_us_time()
+	local t0us = minetest.get_us_time()
 	local t0s = os.time()

 	-- Compute elapsed time since last search.
@ -266,7 +277,7 @@ local function find_fruit_trunks_near(ftpos, sect)
 	end

 	-- Update search statistics
-	local t1us = core.get_us_time()
+	local t1us = minetest.get_us_time()
 	if t1us < t0us then
 		-- Wraparound. Assume the search lasted less than 2^32 microseconds (~71 min)
 		-- (so no need to apply another correction)
@ -306,7 +317,7 @@ minetest.register_chatcommand("dates_stats", {
 	params = "|chat|log|reset",
 	privs = { server = true },
 	func = function(name, param)
-		param = string.lower(string.trim(param))
+		param = string.lower(param:gsub("%s+", ""))
 		if param == "" or param == "chat" then
 			return dates_print_search_stats(false)
 		elseif param == "log" then
@ -526,7 +537,6 @@ end
 local dates_growfn = function(pos, elapsed)
 	local node = minetest.get_node(pos)
 	local delay = moretrees.dates_grow_interval
-	local r = moretrees.dates_pollination_distance
 	local action
 	if not node then
 		return
@ -594,15 +604,16 @@ local dates_growfn = function(pos, elapsed)
 	return action
 end

+--[[
 -- Alternate growth function for dates.
 -- It calls the primary growth function, but also measures CPU time consumed.
 -- Use this function to analyze date growing performance.
 local stat = {}
 stat.count = 0
 local dates_growfn_profiling = function(pos, elapsed)
-	local t0 = core.get_us_time()
+	local t0 = minetest.get_us_time()
 	local action = dates_growfn(pos, elapsed)
-	local t1 = core.get_us_time()
+	local t1 = minetest.get_us_time()
 	if t1 < t0 then
 		t1 = t1 + 2^32
 	end
@ -656,6 +667,7 @@ local dates_growfn_profiling = function(pos, elapsed)
 			"TOTAL", count, sum/count))
 	end
 end
+--]]

 -- Register dates

--- a/depends.txt
+++ b/depends.txt
@ -1,9 +0,0 @@
-default
-biome_lib
-vessels
-doors?
-stairs?
-moreblocks?
-intllib?
-farming?
-
--- a/description.txt
+++ b/description.txt
@ -1 +0,0 @@
-This mod adds a whole bunch of new types of trees to the game
--- a/init.lua
+++ b/init.lua
@ -62,14 +62,6 @@ if io.open(worldpath.."/moretrees_settings.txt","r") then
 	dofile(worldpath.."/moretrees_settings.txt")
 end

-- Boilerplate to support localized strings if intllib mod is installed.
-local S
-if minetest.get_modpath("intllib") then
-	S = intllib.Getter()
-else
-	S = function(s) return s end
-end
-moretrees.intllib = S

 -- infinite stacks checking

@ -334,4 +326,4 @@ function moretrees.grow_fir_snow(pos)
 	minetest.spawn_tree(pos,moretrees.fir_model)
 end

-print(S("[Moretrees] Loaded (2013-02-11)"))
+print("[Moretrees] Loaded (2013-02-11)")
--- a/locale/de.txt
+++ b/locale/de.txt
@ -1,73 +0,0 @@
-# Translation by Xanthin
-
-### crafts.lua ###
-Coconut Milk = Kokosnussmilch
-Raw Coconut = Kokosnussfleisch
-Acorn Muffin batter = Eichelmuffinteig
-Acorn Muffin = Eichelmuffin
-Roasted Spruce Cone Nuts = Geroestete Fichtenzapfen
-Roasted Pine Cone Nuts = Geroestete Kiefernzapfen
-Roasted Fir Cone Nuts = Geroestete Tannenzapfen
-
-### node_defs.lua ###
-Beech Tree Trunk = Buchenstamm
-Apple Tree Trunk = Apfelbaumstamm
-Oak Tree Trunk = Eichenstamm
-Giant Sequoia Trunk = Riesenmammutbaumstamm
-Birch Tree Trunk = Birkenstamm
-Palm Tree Trunk = Palmenstamm
-Spruce Tree Trunk = Fichtenstamm
-Pine Tree Trunk = Kiefernstamm
-Willow Tree Trunk = Weidenstamm
-Rubber Tree Trunk = Gummibaumstamm
-Jungle Tree Trunk = Tropenbaumstamm
-Douglas Fir Trunk = Douglasienstamm
-Beech Tree Planks = Buchebretter
-Apple Tree Planks = Apfelbaumbretter
-Oak Tree Planks = Eichenbretter
-Giant Sequoia Planks = Riesenmammutbaumbretter
-Birch Tree Planks = Birkebretter
-Palm Tree Planks = Palmenbretter
-Spruce Tree Planks = Fichtenbretter
-Pine Tree Planks = Kiefernbretter
-Willow Tree Planks = Weidenbretter
-Rubber Tree Planks = Gummibaumbretter
-Jungle Tree Planks = Tropenholzbretter
-Douglas Fir Planks = Douglasienbretter
-Beech Tree Sapling = Buchesetzling
-Apple Tree Sapling = Apfelbaumsetzling
-Oak Tree Sapling = Eichensetzling
-Giant Sequoia Sapling = Riesenmammutbaumsetzling
-Birch Tree Sapling = Birkensetzling
-Palm Tree Sapling = Palmensetzling
-Spruce Tree Sapling = Fichtensetzling
-Pine Tree Sapling = Kiefernsetzling
-Willow Tree Sapling = Weidensetzling
-Rubber Tree Sapling = Gummibaumsetzling
-Jungle Tree Sapling = Tropenbaumsetzling
-Douglas Fir Sapling = Douglasiensetzling
-Beech Tree Leaves = Buchenlaub
-Apple Tree Leaves = Apfelbaumlaub
-Oak Tree Leaves = Eichenlaub
-Giant Sequoia Leaves = Riesenmammutbaumlaub
-Birch Tree Leaves = Birkenlaub
-Palm Tree Leaves = Palmenlaub
-Spruce Tree Leaves = Fichtennadeln
-Pine Tree Leaves = Kiefernnadeln
-Willow Tree Leaves = Weidenlaub
-Rubber Tree Leaves = Gummibaumlaub
-Jungle Tree Leaves = Tropenbaumlaub
-Douglas Fir Leaves = Douglasiennadeln
-
-Acorn = Eichel
-Coconut = Kokosnuss
-Spruce Cone = Fichtenzapfen
-Pine Cone = Kiefernzapfen
-Fir Cone = Tannenzapfen
-Jungle Sapling = Tropenbaumsetzling
-Jungle Tree Leaves (Yellow) = Tropenbaumlaub (gelb)
-Jungle Tree Leaves (Red) = Tropenbaumlaub (rot)
-Douglas Fir Leaves (Bright) = Douglasiennadeln (breit)
-Rubber Tree Trunk (Empty) = Gummibaumstamm (leer)
-
-[Moretrees] Loaded (2013-02-11) = [Moretrees] geladen (2013-02-11)
--- a/locale/es.txt
+++ b/locale/es.txt
@ -1,100 +0,0 @@
-# Traducido por Carlos Barraza
-
-### crafts.lua ###
-Coconut Milk = Leche de Coco
-Raw Coconut = Coco crudo
-Acorn Muffin batter =  Masa de Mollete de Bellota
-Acorn Muffin = Mollete de Bellota
-Roasted Spruce Cone Nuts = Cono de Picea Tostado
-Roasted Pine Cone Nuts = Cono de Pino Tostado
-Roasted Fir Cone Nuts = Cono de Abeto Tostado
-Roasted Cedar Cone Nuts = Coco de Alamo Tostado
-Date = Datilera
-Date & nut snack = Datilera y Nueces
-Date-nut cake batter = Pasta de torta de Datilera
-Date-nut cake = Pastel de Datilera
-Date-nut energy bar = Barra energetica de Datilera
-
-### date_palm.lua ###
-Dates = Datilera
-Date Stem = Tallo de Datilera
-Date Flowers = Flores de Datilera
-
-### node_defs.lua ###
-Beech Tree Trunk = Tronco de Arbol de Haya
-Apple Tree Trunk = Tronco de Arbol de Manzana
-Oak Tree Trunk = Tronco de Arbol de Roble
-Giant Sequoia Trunk = Tronco de Sequoia Gigante
-Birch Tree Trunk = Tronco de Arbol de Abedul
-Palm Tree Trunk = Tronco de Palmera
-Spruce Tree Trunk = Tronco de Arbol de Abeto
-Willow Tree Trunk = Tronco de Arbol de Sauce
-Rubber Tree Trunk = Tronco de Arbol de Arbol de Goma
-Jungle Tree = Tronco de Arbol de Arbol de la Selva
-Douglas Fir Trunk = Tronco de Arbol de Abeto de Douglas
-Cedar Tree Trunk = Tronco de Arbol de Cedro
-Date Palm Tree Trunk = Tronco de Palmera Datilera
-Acacia Tree Trunk = Tronco de Arbol de Acacia
-Poplar Tree Trunk = Tronco de Arbol de Alamo
-
-Beech Tree Planks = Madera de Arbol de Haya
-Apple Tree Planks = Madera de Arbol de Manzana
-Oak Tree Planks = Madera de Arbol de Roble
-Giant Sequoia Planks = Madera de Sequoia Gigante
-Birch Tree Planks = Madera de Arbol de Abedul
-Palm Tree Planks = Madera de Palmera
-Spruce Tree Planks = Madera de Arbol de Abeto
-Willow Tree Planks = Madera de Arbol de Sauce
-Rubber Tree Planks = Madera de Arbol de Arbol de Goma
-Jungle Planks = Madera de Arbol de Arbol de la Selva
-Douglas Fir Planks = Madera de Arbol de Abeto de Douglas
-Cedar Tree Planks = Madera de Arbol de Cedro
-Date Palm Tree Planks = Madera de Palmera Datilera
-Acacia Tree Planks = Madera de Arbol de Acacia
-Poplar Tree Planks = Madera de Arbol de Alamo
-
-Beech Tree Sapling = Retoño de Arbol de Haya
-Apple Tree Sapling = Retoño de Arbol de Manzana
-Oak Tree Sapling = Retoño de Arbol de Roble
-Giant Sequoia Sapling = Retoño de Arbol de Sequoia Gigante
-Birch Tree Sapling = Retoño de Arbol de Abedul
-Palm Tree Sapling = Retoño de Palmera
-Spruce Tree Sapling = Retoño de Arbol de Abeto
-Willow Tree Sapling = Retoño de Arbol de Sauce
-Rubber Tree Sapling = Retoño de Arbol de Arbol de Goma
-Jungle Sapling = Retoño de Arbol de Arbol de la Selva
-Douglas Fir Sapling = Retoño de Arbol de Abeto de Douglas
-Cedar Tree Sapling = Retoño de Arbol de Cedro
-Date Palm Tree Tree Sapling = Retoño de Palmera Datilera
-Acacia Tree Sapling = Retoño de Arbol de Acacia
-Poplar Tree Sapling = Retoño de Arbol de Alamo
-
-Beech Tree Leaves = Hojas de Arbol de Haya
-Apple Tree Leaves = Hojas de Arbol de Manzana
-Oak Tree Leaves = Hojas de Arbol de Roble
-Giant Sequoia Leaves = Hojas de Sequoia Gigante
-Birch Tree Leaves = Hojas de Arbol de Abedul
-Palm Tree Leaves = Hojas de Palmera
-Spruce Tree Leaves = Hojas de Arbol de Abeto
-Willow Tree Leaves = Hojas de Arbol de Sauce
-Rubber Tree Leaves = Hojas de Arbol de Arbol de Goma
-Jungle Leaves = Hojas de Arbol de Arbol de la Selva
-Douglas Fir Leaves = Hojas de Arbol de Abeto de Douglas
-Cedar Tree Leaves = Hojas de Arbol de Cedro
-Date Palm Tree Tree Leaves = Hojas de Palmera Datilera
-Acacia Tree Leaves = Hojas de Arbol de Acacia
-Poplar Tree Leaves = Hojas de Arbol de Alamo
-
-Acorn = Bellota
-Coconut = Coco
-Spruce Cone = Coco de Picea
-Pine Cone = Coco de Pino
-Fir Cone = Coco de Abeto
-Cedar Cone = Coco de Alamo
-Jungle Sapling = Retoño de Arbol de la Selva
-Jungle Tree Leaves (Yellow) = Hojas de Arbol de la Selva (Amarilla)
-Jungle Tree Leaves (Red) = Hojas de Arbol de la Selva (Roja)
-Douglas Fir Leaves (Bright) = Hojas de Arbol de Abeto de Douglas (Brillante)
-Rubber Tree Trunk (Empty) = Tronco de Arbol de Goma (Vacio)
-
-[Moretrees] Loaded (2013-02-11) = [Masarboles] Cargado
--- a/locale/fr.txt
+++ b/locale/fr.txt
@ -1,74 +0,0 @@
-# Traduction par Yoan31
-# 
-
-### crafts.lua ###
-Coconut Milk = Lait de Coco
-Raw Coconut = Noix de Coco Crue
-Acorn Muffin batter = Pate à Muffins au Gland
-Acorn Muffin = Muffins au Gland
-Roasted Spruce Cone Nuts = Noix de Cône de Sapin Roties
-Roasted Pine Cone Nuts = Noix de Pomme de pin Roties
-Roasted Fir Cone Nuts = Noix de Cône de Sapin Roties
-
-### node_defs.lua ###
-Beech Tree Trunk = Tronc d'Arbre de Hêtre
-Apple Tree Trunk = Tronc d'Arbre de Pommier
-Oak Tree Trunk = Tronc d'Arbre de chêne
-Giant Sequoia Trunk = Tronc d'Arbre de Séquoia Géant
-Birch Tree Trunk = Tronc d'Arbre de bouleau
-Palm Tree Trunk = Tronc d'Arbre de Palmier
-Spruce Tree Trunk = Tronc d'Arbre d'Epicéa
-Pine Tree Trunk = Tronc d'Arbre de Pin
-Willow Tree Trunk = Tronc d'Arbre de Saule
-Rubber Tree Trunk = Tronc d'Arbre a Caoutchouc
-Jungle Tree Trunk = Tronc d'Arbre de la Jungle
-Douglas Fir Trunk = Tronc de Sapin de Douglas
-Beech Tree Planks = Planches de Hêtre
-Apple Tree Planks = Planches de Pommier
-Oak Tree Planks = Planches de Chêne
-Giant Sequoia Planks = Planches de d'Arbre de Séquoia Géant
-Birch Tree Planks = Planches d'Arbre de bouleau
-Palm Tree Planks = Planches d'Arbre de Palmier
-Spruce Tree Planks = Planches d'Arbre d'Epicéa
-Pine Tree Planks = Planches d'Arbre de Pin
-Willow Tree Planks = Planches d'Arbre de Saule
-Rubber Tree Planks = Planches d'Arbre a Caoutchouc
-Jungle Tree Planks = Planches d'Arbre de la Jungle
-Douglas Fir Planks = Planches de Sapin de Douglas
-Beech Tree Sapling = Pousse d'Arbre de Hêtre
-Apple Tree Sapling = Pousse d'Arbre de Pommier
-Oak Tree Sapling = Pousse d'Arbre de chêne
-Giant Sequoia Sapling = Pousse d'Arbre de Séquoia Géant
-Birch Tree Sapling = Pousse d'Arbre de bouleau
-Palm Tree Sapling = Pousse d'Arbre de Palmier
-Spruce Tree Sapling = Pousse d'Arbre d'Epicéa
-Pine Tree Sapling = Pousse d'Arbre de Pin
-Willow Tree Sapling = Pousse d'Arbre de Saule
-Rubber Tree Sapling = Pousse d'Arbre a Caoutchouc
-Jungle Tree Sapling = Pousse d'Arbre de la Jungle
-Douglas Fir Sapling = Pousse de Sapin de Douglas
-Beech Tree Leaves = Feuilles d'Arbre de Hêtre
-Apple Tree Leaves = Feuilles d'Arbre de Pommier
-Oak Tree Leaves = Feuilles d'Arbre de chêne
-Giant Sequoia Leaves = Feuilles d'Arbre de Séquoia Géant
-Birch Tree Leaves = Feuilles d'Arbre de bouleau
-Palm Tree Leaves = Feuilles d'Arbre de Palmier
-Spruce Tree Leaves = Feuilles d'Arbre d'Epicéa
-Pine Tree Leaves = Feuilles d'Arbre de Pin
-Willow Tree Leaves = Feuilles d'Arbre de Saule
-Rubber Tree Leaves = Feuilles d'Arbre a Caoutchouc
-Jungle Tree Leaves = Feuilles d'Arbre de la Jungle
-Douglas Fir Leaves = Feuilles de Sapin de Douglas
-
-Acorn = Gland
-Coconut = Noix de Coco
-Spruce Cone = Cône de Sapin
-Pine Cone = Pomme de Pin
-Fir Cone = Pomme de Sapin
-Jungle Sapling = Pousse d'Arbre de la Jungle
-Jungle Tree Leaves (Yellow) = Feuille d'Arbre de la Jungle (Jaune)
-Jungle Tree Leaves (Red) =  Feuille d'Arbre de la Jungle (Rouge)
-Douglas Fir Leaves (Bright) = Feuille de Sapin de Douglas (Brillant)
-Rubber Tree Trunk (Empty) = Tronc d'Arbre en Caoutchouc (Vide)
-
-[Moretrees] Loaded (2013-02-11) = 
--- a/locale/moretrees.de.tr
+++ b/locale/moretrees.de.tr
@ -0,0 +1,211 @@
+# textdomain: moretrees
+# Translation by Xanthin
+
+
+### cocos_palm.lua ###
+
+Coconut=Kokosnuss
+Coconut Flower=
+
+### crafts.lua ###
+
+Acorn Muffin=Eichelmuffin
+Acorn Muffin batter=Eichelmuffinteig
+Coconut Milk=Kokosnussmilch
+Date=
+Date & nut snack=
+Date-nut cake=
+Date-nut cake batter=
+Date-nut energy bar=
+Raw Coconut=Kokosnussfleisch
+Roasted Cedar Cone Nuts=
+Roasted Fir Cone Nuts=Geroestete Tannenzapfen
+Roasted Spruce Cone Nuts=Geroestete Fichtenzapfen
+
+### date_palm.lua ###
+
+Date Flowers=
+Date Stem=
+Dates=
+
+### node_defs.lua ###
+
+@1 (fast growth)=
+Acorn=Eichel
+Apple Tree=
+Apple Tree Fence=
+Apple Tree Fence Gate=
+Apple Tree Fence Rail=
+Apple Tree Leaves=Apfelbaumlaub
+Apple Tree Planks=Apfelbaumbretter
+Apple Tree Planks Slab=
+Apple Tree Planks Stair=
+Apple Tree Sapling=Apfelbaumsetzling
+Apple Tree Trunk=Apfelbaumstamm
+Apple Tree Trunk Slab=
+Apple Tree Trunk Stair=
+Beech Tree=
+Beech Tree Fence=
+Beech Tree Fence Gate=
+Beech Tree Fence Rail=
+Beech Tree Leaves=Buchenlaub
+Beech Tree Planks=Buchebretter
+Beech Tree Planks Slab=
+Beech Tree Planks Stair=
+Beech Tree Sapling=Buchesetzling
+Beech Tree Trunk=Buchenstamm
+Beech Tree Trunk Slab=
+Beech Tree Trunk Stair=
+Birch Tree=
+Birch Tree Fence=
+Birch Tree Fence Gate=
+Birch Tree Fence Rail=
+Birch Tree Leaves=Birkenlaub
+Birch Tree Planks=Birkebretter
+Birch Tree Planks Slab=
+Birch Tree Planks Stair=
+Birch Tree Sapling=Birkensetzling
+Birch Tree Trunk=Birkenstamm
+Birch Tree Trunk Slab=
+Birch Tree Trunk Stair=
+Cedar Cone=
+Cedar Tree=
+Cedar Tree Fence=
+Cedar Tree Fence Gate=
+Cedar Tree Fence Rail=
+Cedar Tree Leaves=
+Cedar Tree Planks=
+Cedar Tree Planks Slab=
+Cedar Tree Planks Stair=
+Cedar Tree Sapling=
+Cedar Tree Trunk=
+Cedar Tree Trunk Slab=
+Cedar Tree Trunk Stair=
+Date Palm Tree=
+Date Palm Tree Fence=
+Date Palm Tree Fence Gate=
+Date Palm Tree Fence Rail=
+Date Palm Tree Leaves=
+Date Palm Tree Planks=
+Date Palm Tree Planks Slab=
+Date Palm Tree Planks Stair=
+Date Palm Tree Sapling=
+Date Palm Tree Trunk=
+Date Palm Tree Trunk Slab=
+Date Palm Tree Trunk Stair=
+Douglas Fir=
+Douglas Fir Fence=
+Douglas Fir Fence Gate=
+Douglas Fir Fence Rail=
+Douglas Fir Leaves=Douglasiennadeln
+Douglas Fir Leaves (Bright)=Douglasiennadeln (breit)
+Douglas Fir Planks=Douglasienbretter
+Douglas Fir Planks Slab=
+Douglas Fir Planks Stair=
+Douglas Fir Sapling=Douglasiensetzling
+Douglas Fir Trunk=Douglasienstamm
+Douglas Fir Trunk Slab=
+Douglas Fir Trunk Stair=
+Fir Cone=Tannenzapfen
+Giant Sequoia=
+Giant Sequoia Fence=
+Giant Sequoia Fence Gate=
+Giant Sequoia Fence Rail=
+Giant Sequoia Leaves=Riesenmammutbaumlaub
+Giant Sequoia Planks=Riesenmammutbaumbretter
+Giant Sequoia Planks Slab=
+Giant Sequoia Planks Stair=
+Giant Sequoia Sapling=Riesenmammutbaumsetzling
+Giant Sequoia Trunk=Riesenmammutbaumstamm
+Giant Sequoia Trunk Slab=
+Giant Sequoia Trunk Stair=
+Jungle Tree=
+Jungle Tree Fence=
+Jungle Tree Fence Gate=
+Jungle Tree Fence Rail=
+Jungle Tree Leaves=Tropenbaumlaub
+Jungle Tree Leaves (@1)=Tropenbaumlaub (@1)
+Jungle Tree Planks=Tropenholzbretter
+Jungle Tree Planks Slab=
+Jungle Tree Planks Stair=
+Jungle Tree Sapling=Tropenbaumsetzling
+Jungle Tree Trunk=Tropenbaumstamm
+Jungle Tree Trunk Slab=
+Jungle Tree Trunk Stair=
+Oak Tree=
+Oak Tree Fence=
+Oak Tree Fence Gate=
+Oak Tree Fence Rail=
+Oak Tree Leaves=Eichenlaub
+Oak Tree Planks=Eichenbretter
+Oak Tree Planks Slab=
+Oak Tree Planks Stair=
+Oak Tree Sapling=Eichensetzling
+Oak Tree Trunk=Eichenstamm
+Oak Tree Trunk Slab=
+Oak Tree Trunk Stair=
+Palm Tree=
+Palm Tree Fence=
+Palm Tree Fence Gate=
+Palm Tree Fence Rail=
+Palm Tree Leaves=Palmenlaub
+Palm Tree Planks=Palmenbretter
+Palm Tree Planks Slab=
+Palm Tree Planks Stair=
+Palm Tree Sapling=Palmensetzling
+Palm Tree Trunk=Palmenstamm
+Palm Tree Trunk Slab=
+Palm Tree Trunk Stair=
+Poplar Tree=
+Poplar Tree Fence=
+Poplar Tree Fence Gate=
+Poplar Tree Fence Rail=
+Poplar Tree Leaves=
+Poplar Tree Planks=
+Poplar Tree Planks Slab=
+Poplar Tree Planks Stair=
+Poplar Tree Sapling=
+Poplar Tree Trunk=
+Poplar Tree Trunk Slab=
+Poplar Tree Trunk Stair=
+Red=rot
+Rubber Tree=
+Rubber Tree Fence=
+Rubber Tree Fence Gate=
+Rubber Tree Fence Rail=
+Rubber Tree Leaves=Gummibaumlaub
+Rubber Tree Planks=Gummibaumbretter
+Rubber Tree Planks Slab=
+Rubber Tree Planks Stair=
+Rubber Tree Sapling=Gummibaumsetzling
+Rubber Tree Trunk=Gummibaumstamm
+Rubber Tree Trunk (Empty)=Gummibaumstamm (leer)
+Rubber Tree Trunk Slab=
+Rubber Tree Trunk Stair=
+Small poplar Tree Sapling=
+Spruce Cone=Fichtenzapfen
+Spruce Tree=
+Spruce Tree Fence=
+Spruce Tree Fence Gate=
+Spruce Tree Fence Rail=
+Spruce Tree Leaves=Fichtennadeln
+Spruce Tree Planks=Fichtenbretter
+Spruce Tree Planks Slab=
+Spruce Tree Planks Stair=
+Spruce Tree Sapling=Fichtensetzling
+Spruce Tree Trunk=Fichtenstamm
+Spruce Tree Trunk Slab=
+Spruce Tree Trunk Stair=
+Willow Tree=
+Willow Tree Fence=
+Willow Tree Fence Gate=
+Willow Tree Fence Rail=
+Willow Tree Leaves=Weidenlaub
+Willow Tree Planks=Weidenbretter
+Willow Tree Planks Slab=
+Willow Tree Planks Stair=
+Willow Tree Sapling=Weidensetzling
+Willow Tree Trunk=Weidenstamm
+Willow Tree Trunk Slab=
+Willow Tree Trunk Stair=
+Yellow=gelb
--- a/locale/moretrees.es.tr
+++ b/locale/moretrees.es.tr
@ -0,0 +1,211 @@
+# textdomain: moretrees
+# Translation by Carlos Barraza
+
+
+### cocos_palm.lua ###
+
+Coconut=Coco
+Coconut Flower=
+
+### crafts.lua ###
+
+Acorn Muffin=Mollete de Bellota
+Acorn Muffin batter= Masa de Mollete de Bellota
+Coconut Milk=Leche de Coco
+Date=Datilera
+Date & nut snack=Datilera y Nueces
+Date-nut cake=Pastel de Datilera
+Date-nut cake batter=Pasta de torta de Datilera
+Date-nut energy bar=Barra energetica de Datilera
+Raw Coconut=Coco crudo
+Roasted Cedar Cone Nuts=Coco de Alamo Tostado
+Roasted Fir Cone Nuts=Cono de Abeto Tostado
+Roasted Spruce Cone Nuts=Cono de Picea Tostado
+
+### date_palm.lua ###
+
+Date Flowers=Flores de Datilera
+Date Stem=Tallo de Datilera
+Dates=Datilera
+
+### node_defs.lua ###
+
+@1 (fast growth)=
+Acorn=Bellota
+Apple Tree=
+Apple Tree Fence=
+Apple Tree Fence Gate=
+Apple Tree Fence Rail=
+Apple Tree Leaves=Hojas de Arbol de Manzana
+Apple Tree Planks=Madera de Arbol de Manzana
+Apple Tree Planks Slab=
+Apple Tree Planks Stair=
+Apple Tree Sapling=Retoño de Arbol de Manzana
+Apple Tree Trunk=Tronco de Arbol de Manzana
+Apple Tree Trunk Slab=
+Apple Tree Trunk Stair=
+Beech Tree=
+Beech Tree Fence=
+Beech Tree Fence Gate=
+Beech Tree Fence Rail=
+Beech Tree Leaves=Hojas de Arbol de Haya
+Beech Tree Planks=Madera de Arbol de Haya
+Beech Tree Planks Slab=
+Beech Tree Planks Stair=
+Beech Tree Sapling=Retoño de Arbol de Haya
+Beech Tree Trunk=Tronco de Arbol de Haya
+Beech Tree Trunk Slab=
+Beech Tree Trunk Stair=
+Birch Tree=
+Birch Tree Fence=
+Birch Tree Fence Gate=
+Birch Tree Fence Rail=
+Birch Tree Leaves=Hojas de Arbol de Abedul
+Birch Tree Planks=Madera de Arbol de Abedul
+Birch Tree Planks Slab=
+Birch Tree Planks Stair=
+Birch Tree Sapling=Retoño de Arbol de Abedul
+Birch Tree Trunk=Tronco de Arbol de Abedul
+Birch Tree Trunk Slab=
+Birch Tree Trunk Stair=
+Cedar Cone=Coco de Alamo
+Cedar Tree=
+Cedar Tree Fence=
+Cedar Tree Fence Gate=
+Cedar Tree Fence Rail=
+Cedar Tree Leaves=Hojas de Arbol de Cedro
+Cedar Tree Planks=Madera de Arbol de Cedro
+Cedar Tree Planks Slab=
+Cedar Tree Planks Stair=
+Cedar Tree Sapling=Retoño de Arbol de Cedro
+Cedar Tree Trunk=Tronco de Arbol de Cedro
+Cedar Tree Trunk Slab=
+Cedar Tree Trunk Stair=
+Date Palm Tree=
+Date Palm Tree Fence=
+Date Palm Tree Fence Gate=
+Date Palm Tree Fence Rail=
+Date Palm Tree Leaves=
+Date Palm Tree Planks=Madera de Palmera Datilera
+Date Palm Tree Planks Slab=
+Date Palm Tree Planks Stair=
+Date Palm Tree Sapling=
+Date Palm Tree Trunk=Tronco de Palmera Datilera
+Date Palm Tree Trunk Slab=
+Date Palm Tree Trunk Stair=
+Douglas Fir=
+Douglas Fir Fence=
+Douglas Fir Fence Gate=
+Douglas Fir Fence Rail=
+Douglas Fir Leaves=Hojas de Arbol de Abeto de Douglas
+Douglas Fir Leaves (Bright)=Hojas de Arbol de Abeto de Douglas (Brillante)
+Douglas Fir Planks=Madera de Arbol de Abeto de Douglas
+Douglas Fir Planks Slab=
+Douglas Fir Planks Stair=
+Douglas Fir Sapling=Retoño de Arbol de Abeto de Douglas
+Douglas Fir Trunk=Tronco de Arbol de Abeto de Douglas
+Douglas Fir Trunk Slab=
+Douglas Fir Trunk Stair=
+Fir Cone=Coco de Abeto
+Giant Sequoia=
+Giant Sequoia Fence=
+Giant Sequoia Fence Gate=
+Giant Sequoia Fence Rail=
+Giant Sequoia Leaves=Hojas de Sequoia Gigante
+Giant Sequoia Planks=Madera de Sequoia Gigante
+Giant Sequoia Planks Slab=
+Giant Sequoia Planks Stair=
+Giant Sequoia Sapling=Retoño de Arbol de Sequoia Gigante
+Giant Sequoia Trunk=Tronco de Sequoia Gigante
+Giant Sequoia Trunk Slab=
+Giant Sequoia Trunk Stair=
+Jungle Tree=Tronco de Arbol de Arbol de la Selva
+Jungle Tree Fence=
+Jungle Tree Fence Gate=
+Jungle Tree Fence Rail=
+Jungle Tree Leaves=Hojas de Arbol de la Selva
+Jungle Tree Leaves (@1)=Hojas de Arbol de la Selva (@1)
+Jungle Tree Planks=
+Jungle Tree Planks Slab=
+Jungle Tree Planks Stair=
+Jungle Tree Sapling=
+Jungle Tree Trunk=
+Jungle Tree Trunk Slab=
+Jungle Tree Trunk Stair=
+Oak Tree=
+Oak Tree Fence=
+Oak Tree Fence Gate=
+Oak Tree Fence Rail=
+Oak Tree Leaves=Hojas de Arbol de Roble
+Oak Tree Planks=Madera de Arbol de Roble
+Oak Tree Planks Slab=
+Oak Tree Planks Stair=
+Oak Tree Sapling=Retoño de Arbol de Roble
+Oak Tree Trunk=Tronco de Arbol de Roble
+Oak Tree Trunk Slab=
+Oak Tree Trunk Stair=
+Palm Tree=
+Palm Tree Fence=
+Palm Tree Fence Gate=
+Palm Tree Fence Rail=
+Palm Tree Leaves=Hojas de Palmera
+Palm Tree Planks=Madera de Palmera
+Palm Tree Planks Slab=
+Palm Tree Planks Stair=
+Palm Tree Sapling=Retoño de Palmera
+Palm Tree Trunk=Tronco de Palmera
+Palm Tree Trunk Slab=
+Palm Tree Trunk Stair=
+Poplar Tree=
+Poplar Tree Fence=
+Poplar Tree Fence Gate=
+Poplar Tree Fence Rail=
+Poplar Tree Leaves=Hojas de Arbol de Alamo
+Poplar Tree Planks=Madera de Arbol de Alamo
+Poplar Tree Planks Slab=
+Poplar Tree Planks Stair=
+Poplar Tree Sapling=Retoño de Arbol de Alamo
+Poplar Tree Trunk=Tronco de Arbol de Alamo
+Poplar Tree Trunk Slab=
+Poplar Tree Trunk Stair=
+Red=Roja
+Rubber Tree=
+Rubber Tree Fence=
+Rubber Tree Fence Gate=
+Rubber Tree Fence Rail=
+Rubber Tree Leaves=Hojas de Arbol de Arbol de Goma
+Rubber Tree Planks=Madera de Arbol de Arbol de Goma
+Rubber Tree Planks Slab=
+Rubber Tree Planks Stair=
+Rubber Tree Sapling=Retoño de Arbol de Arbol de Goma
+Rubber Tree Trunk=Tronco de Arbol de Arbol de Goma
+Rubber Tree Trunk (Empty)=Tronco de Arbol de Goma (Vacio)
+Rubber Tree Trunk Slab=
+Rubber Tree Trunk Stair=
+Small poplar Tree Sapling=
+Spruce Cone=Coco de Picea
+Spruce Tree=
+Spruce Tree Fence=
+Spruce Tree Fence Gate=
+Spruce Tree Fence Rail=
+Spruce Tree Leaves=Hojas de Arbol de Abeto
+Spruce Tree Planks=Madera de Arbol de Abeto
+Spruce Tree Planks Slab=
+Spruce Tree Planks Stair=
+Spruce Tree Sapling=Retoño de Arbol de Abeto
+Spruce Tree Trunk=Tronco de Arbol de Abeto
+Spruce Tree Trunk Slab=
+Spruce Tree Trunk Stair=
+Willow Tree=
+Willow Tree Fence=
+Willow Tree Fence Gate=
+Willow Tree Fence Rail=
+Willow Tree Leaves=Hojas de Arbol de Sauce
+Willow Tree Planks=Madera de Arbol de Sauce
+Willow Tree Planks Slab=
+Willow Tree Planks Stair=
+Willow Tree Sapling=Retoño de Arbol de Sauce
+Willow Tree Trunk=Tronco de Arbol de Sauce
+Willow Tree Trunk Slab=
+Willow Tree Trunk Stair=
+Yellow=Amarilla
--- a/locale/moretrees.fr.tr
+++ b/locale/moretrees.fr.tr
@ -0,0 +1,211 @@
+# textdomain: moretrees
+# Translation by Yoan31 and Louis Royer
+
+
+### cocos_palm.lua ###
+
+Coconut=Noix de coco
+Coconut Flower=Fleur de coco
+
+### crafts.lua ###
+
+Acorn Muffin=Muffins au gland
+Acorn Muffin batter=Pate à muffins au Gland
+Coconut Milk=Lait de coco
+Date=Datte
+Date & nut snack=Collation aux dattes et aux noix
+Date-nut cake=Gâteau datte-noix
+Date-nut cake batter=Pâte à gâteau datte-noix
+Date-nut energy bar=Barre énergétique datte-noix
+Raw Coconut=Noix de coco crue
+Roasted Cedar Cone Nuts=Noix de pomme de pin roties
+Roasted Fir Cone Nuts=Noix de cône de sapin roties
+Roasted Spruce Cone Nuts=Noix de cône de sapin roties
+
+### date_palm.lua ###
+
+Date Flowers=Fleurs de datte
+Date Stem=Tige de datte
+Dates=Dattes
+
+### node_defs.lua ###
+
+@1 (fast growth)=@1 (croissance rapide)
+Acorn=Gland
+Apple Tree=Pommier
+Apple Tree Fence=Barrière en bois de pommier
+Apple Tree Fence Gate=Porte de clôture en bois de pommier
+Apple Tree Fence Rail=Clôture en bois de pommier
+Apple Tree Leaves=Feuilles de pommier
+Apple Tree Planks=Planches de pommier
+Apple Tree Planks Slab=Dalle en bois de pommier
+Apple Tree Planks Stair=Escaliers en bois de pommier
+Apple Tree Sapling=Pousse d'arbre de pommier
+Apple Tree Trunk=Tronc d'arbre de pommier
+Apple Tree Trunk Slab=Dalle en tronc de pommier
+Apple Tree Trunk Stair=Escalier en tronc de pommier
+Beech Tree=Hêtre
+Beech Tree Fence=Barrière en bois de hêtre
+Beech Tree Fence Gate=Porte de clôture en bois de hêtre
+Beech Tree Fence Rail=Clôture en bois de hêtre
+Beech Tree Leaves=Feuilles de hêtre
+Beech Tree Planks=Planches de hêtre
+Beech Tree Planks Slab=Dalle en bois de hêtre
+Beech Tree Planks Stair=Escalier en bois de hêtre
+Beech Tree Sapling=Pousse d'arbre de hêtre
+Beech Tree Trunk=Tronc d'arbre de hêtre
+Beech Tree Trunk Slab=Dalle en tronc de hêtre
+Beech Tree Trunk Stair=Escalier en tronc de hêtre
+Birch Tree=Bouleau
+Birch Tree Fence=Barrière en bois de bouleau
+Birch Tree Fence Gate=Porte de clôture en bois de bouleau
+Birch Tree Fence Rail=Clôture en bois de bouleau
+Birch Tree Leaves=Feuilles de bouleau
+Birch Tree Planks=Planches d'arbre de bouleau
+Birch Tree Planks Slab=Dalle en bois de bouleau
+Birch Tree Planks Stair=Escalier en bois de bouleau
+Birch Tree Sapling=Pousse d'arbre de bouleau
+Birch Tree Trunk=Tronc d'arbre de bouleau
+Birch Tree Trunk Slab=Dalle en tronc de bouleau
+Birch Tree Trunk Stair=Escalier en tronc de bouleau
+Cedar Cone=Pomme de pin
+Cedar Tree=Pin
+Cedar Tree Fence=Barrière en bois de pin
+Cedar Tree Fence Gate=Porte de clôture en bois de pin
+Cedar Tree Fence Rail=Clôture en bois de pin
+Cedar Tree Leaves=Feuilles de pin
+Cedar Tree Planks=Planches d'arbre de pin
+Cedar Tree Planks Slab=Dalle en bois de pin
+Cedar Tree Planks Stair=Escalier en bois de pin
+Cedar Tree Sapling=Pousse d'arbre de pin
+Cedar Tree Trunk=Tronc d'arbre de pin
+Cedar Tree Trunk Slab=Dalle en tronc de pin
+Cedar Tree Trunk Stair=Escalier en tronc de pin
+Date Palm Tree=Dattier
+Date Palm Tree Fence=Barrière en bois de dattier
+Date Palm Tree Fence Gate=Porte de clôture en bois de dattier
+Date Palm Tree Fence Rail=Clôture en bois de dattier
+Date Palm Tree Leaves=Feuille de dattier
+Date Palm Tree Planks=Planches de dattier
+Date Palm Tree Planks Slab=Dalle en bois de dattier
+Date Palm Tree Planks Stair=Escalier en bois de dattier
+Date Palm Tree Sapling=Pousse de dattier
+Date Palm Tree Trunk=Tronc de dattier
+Date Palm Tree Trunk Slab=Dalle en tronc de dattier
+Date Palm Tree Trunk Stair=Escalier en tronc de dattier
+Douglas Fir=Sapin de Douglas
+Douglas Fir Fence=Barrière en bois de sapin de Douglas
+Douglas Fir Fence Gate=Porte de clôture en bois de sapin de Douglas
+Douglas Fir Fence Rail=Clôture en bois de sapin de Douglas
+Douglas Fir Leaves=Feuilles de sapin de Douglas
+Douglas Fir Leaves (Bright)=Feuille de sapin de Douglas (brillant)
+Douglas Fir Planks=Planches de sapin de Douglas
+Douglas Fir Planks Slab=Dalle en bois de sapin de Douglas
+Douglas Fir Planks Stair=Escalier en bois de sapin de Douglas
+Douglas Fir Sapling=Pousse de sapin de Douglas
+Douglas Fir Trunk=Tronc de sapin de Douglas
+Douglas Fir Trunk Slab=Dalle en tronc de sapin de Douglas
+Douglas Fir Trunk Stair=Escalier en tronc de sapin de Douglas
+Fir Cone=Pomme de sapin
+Giant Sequoia=Séquoia géant
+Giant Sequoia Fence=Barrière en bois de séquoia géant
+Giant Sequoia Fence Gate=Porte de clôture en bois de séquoia géant
+Giant Sequoia Fence Rail=Clôture en bois de séquoia géant
+Giant Sequoia Leaves=Feuilles de séquoia géant
+Giant Sequoia Planks=Planches de séquoia géant
+Giant Sequoia Planks Slab=Dalle en bois de séquoia géant
+Giant Sequoia Planks Stair=Escalier en bois de séquoia géant
+Giant Sequoia Sapling=Pousse de séquoia géant
+Giant Sequoia Trunk=Tronc de séquoia géant
+Giant Sequoia Trunk Slab=Dalle en tronc de séquoia géant
+Giant Sequoia Trunk Stair=Escalier en tronc de séquoia géant
+Jungle Tree=Arbre de la jungle
+Jungle Tree Fence=Barrière en bois d'arbre de la jungle
+Jungle Tree Fence Gate=Porte de clôture en bois d'arbre de la jungle
+Jungle Tree Fence Rail=Clôture en bois d'arbre de la jungle
+Jungle Tree Leaves=Feuilles d'arbre de la jungle
+Jungle Tree Leaves (@1)=Feuilles d'arbre de la jungle (@1)
+Jungle Tree Planks=Planches d'arbre de la jungle
+Jungle Tree Planks Slab=Dalle en bois d'arbre de la jungle
+Jungle Tree Planks Stair=Escalier en bois d'arbre de la jungle
+Jungle Tree Sapling=Pousse d'arbre de la jungle
+Jungle Tree Trunk=Tronc d'arbre de la jungle
+Jungle Tree Trunk Slab=Dalle en tronc d'arbre de la jungle
+Jungle Tree Trunk Stair=Escalier en tronc d'arbre de la jungle
+Oak Tree=Chêne
+Oak Tree Fence=Barrière en bois de chêne
+Oak Tree Fence Gate=Porte de clôture en bois de chêne
+Oak Tree Fence Rail=Clôture en bois de chêne
+Oak Tree Leaves=Feuilles de chêne
+Oak Tree Planks=Planches de chêne
+Oak Tree Planks Slab=Dalle en bois de chêne
+Oak Tree Planks Stair=Escalier en bois de chêne
+Oak Tree Sapling=Pousse d'arbre de chêne
+Oak Tree Trunk=Tronc d'arbre de chêne
+Oak Tree Trunk Slab=Dalle en tronc de chêne
+Oak Tree Trunk Stair=Escalier en tronc de chêne
+Palm Tree=Palmier
+Palm Tree Fence=Barrière en bois de palmier
+Palm Tree Fence Gate=Porte de clôture en bois de palmier
+Palm Tree Fence Rail=Clôture en bois de palmier
+Palm Tree Leaves=Feuilles de palmier
+Palm Tree Planks=Planches de palmier
+Palm Tree Planks Slab=Dalle en bois de palmier
+Palm Tree Planks Stair=Escalier en bois de palmier
+Palm Tree Sapling=Pousse d'arbre de palmier
+Palm Tree Trunk=Tronc d'arbre de palmier
+Palm Tree Trunk Slab=Dalle en tronc de palmier
+Palm Tree Trunk Stair=Escalier en tronc de palmier
+Poplar Tree=Peuplier
+Poplar Tree Fence=Barrière en bois de peuplier
+Poplar Tree Fence Gate=Porte de clôture en bois de peuplier
+Poplar Tree Fence Rail=Clôture en bois de peuplier
+Poplar Tree Leaves=Feuilles de peuplier
+Poplar Tree Planks=Plances de peuplier
+Poplar Tree Planks Slab=Dalle en bois de peuplier
+Poplar Tree Planks Stair=Escalier en bois de peuplier
+Poplar Tree Sapling=Pousse de peuplier
+Poplar Tree Trunk=Tronc de peuplier
+Poplar Tree Trunk Slab=Dalle en tronc de peuplier
+Poplar Tree Trunk Stair=Escalier en tronc de peuplier
+Red=rouge
+Rubber Tree=Arbre à caoutchouc
+Rubber Tree Fence=Barrière en bois d'arbre à caoutchouc
+Rubber Tree Fence Gate=Porte de clôture en bois d'arbre à caoutchouc
+Rubber Tree Fence Rail=Clôture en bois d'arbre à caoutchouc
+Rubber Tree Leaves=Feuilles d'arbre à caoutchouc
+Rubber Tree Planks=Planches d'arbre à caoutchouc
+Rubber Tree Planks Slab=Dalle en bois d'arbre à caoutchouc
+Rubber Tree Planks Stair=Escalier en bois d'arbre à caoutchouc
+Rubber Tree Sapling=Pousse d'arbre à caoutchouc
+Rubber Tree Trunk=Tronc d'arbre a caoutchouc
+Rubber Tree Trunk (Empty)=Tronc d'arbre à caoutchouc (vide)
+Rubber Tree Trunk Slab=Dalle en tronc d'arbre à caoutchouc
+Rubber Tree Trunk Stair=Escalier en tronc d'arbre à caoutchouc
+Small poplar Tree Sapling=Pousse de petit peuplier
+Spruce Cone=Cône de sapin
+Spruce Tree=Épicéa
+Spruce Tree Fence=Barrière en bois d'épicéa
+Spruce Tree Fence Gate=Porte de clôture en bois d'épicéa
+Spruce Tree Fence Rail=Clôture en bois d'épicéa
+Spruce Tree Leaves=Feuilles d'épicéa
+Spruce Tree Planks=Planches d'arbre d'épicéa
+Spruce Tree Planks Slab=Dalle en bois d'épicéa
+Spruce Tree Planks Stair=Escalier en bois d'épicéa
+Spruce Tree Sapling=Pousse d'arbre d'épicéa
+Spruce Tree Trunk=Tronc d'arbre d'épicéa
+Spruce Tree Trunk Slab=Dalle en tronc d'épicéa
+Spruce Tree Trunk Stair=Escalier en tronc d'épicéa
+Willow Tree=Saule
+Willow Tree Fence=Barrière en bois de saule
+Willow Tree Fence Gate=Porte de clôture en bois de saule
+Willow Tree Fence Rail=Clôture en bois de saule
+Willow Tree Leaves=Feuilles de saule
+Willow Tree Planks=Planches de saule
+Willow Tree Planks Slab=Dalle en bois de saule
+Willow Tree Planks Stair=Escalier en bois de saule
+Willow Tree Sapling=Pousse de saule
+Willow Tree Trunk=Tronc d'arbre de saule
+Willow Tree Trunk Slab=Dalle en tronc de saule
+Willow Tree Trunk Stair=Escalier en tronc de saule
+Yellow=jaune
--- a/locale/template.txt
+++ b/locale/template.txt
@ -1,73 +1,210 @@
-# Template
+# textdomain: moretrees
+
+
+### cocos_palm.lua ###
+
+Coconut=
+Coconut Flower=

 ### crafts.lua ###
-Coconut Milk = 
-Raw Coconut = 
-Acorn Muffin batter = 
-Acorn Muffin = 
-Roasted Spruce Cone Nuts = 
-Roasted Pine Cone Nuts = 
-Roasted Fir Cone Nuts = 
+
+Acorn Muffin=
+Acorn Muffin batter=
+Coconut Milk=
+Date=
+Date & nut snack=
+Date-nut cake=
+Date-nut cake batter=
+Date-nut energy bar=
+Raw Coconut=
+Roasted Cedar Cone Nuts=
+Roasted Fir Cone Nuts=
+Roasted Spruce Cone Nuts=
+
+### date_palm.lua ###
+
+Date Flowers=
+Date Stem=
+Dates=

 ### node_defs.lua ###
-Beech Tree Trunk = 
-Apple Tree Trunk = 
-Oak Tree Trunk = 
-Giant Sequoia Trunk = 
-Birch Tree Trunk = 
-Palm Tree Trunk = 
-Spruce Tree Trunk = 
-Pine Tree Trunk = 
-Willow Tree Trunk = 
-Rubber Tree Trunk = 
-Jungle Tree Trunk = 
-Douglas Fir Trunk = 
-Beech Tree Planks = 
-Apple Tree Planks = 
-Oak Tree Planks = 
-Giant Sequoia Planks = 
-Birch Tree Planks = 
-Palm Tree Planks = 
-Spruce Tree Planks = 
-Pine Tree Planks = 
-Willow Tree Planks = 
-Rubber Tree Planks = 
-Jungle Tree Planks = 
-Douglas Fir Planks = 
-Beech Tree Sapling = 
-Apple Tree Sapling = 
-Oak Tree Sapling = 
-Giant Sequoia Sapling = 
-Birch Tree Sapling = 
-Palm Tree Sapling = 
-Spruce Tree Sapling = 
-Pine Tree Sapling = 
-Willow Tree Sapling = 
-Rubber Tree Sapling = 
-Jungle Tree Sapling = 
-Douglas Fir Sapling = 
-Beech Tree Leaves = 
-Apple Tree Leaves = 
-Oak Tree Leaves = 
-Giant Sequoia Leaves = 
-Birch Tree Leaves = 
-Palm Tree Leaves = 
-Spruce Tree Leaves = 
-Pine Tree Leaves = 
-Willow Tree Leaves = 
-Rubber Tree Leaves = 
-Jungle Tree Leaves = 
-Douglas Fir Leaves = 

-Acorn = 
-Coconut = 
-Spruce Cone = 
-Pine Cone = 
-Fir Cone = 
-Jungle Sapling = 
-Jungle Tree Leaves (Yellow) = 
-Jungle Tree Leaves (Red) = 
-Douglas Fir Leaves (Bright) = 
-Rubber Tree Trunk (Empty) = 
-
-[Moretrees] Loaded (2013-02-11) = 
+@1 (fast growth)=
+Acorn=
+Apple Tree=
+Apple Tree Fence=
+Apple Tree Fence Gate=
+Apple Tree Fence Rail=
+Apple Tree Leaves=
+Apple Tree Planks=
+Apple Tree Planks Slab=
+Apple Tree Planks Stair=
+Apple Tree Sapling=
+Apple Tree Trunk=
+Apple Tree Trunk Slab=
+Apple Tree Trunk Stair=
+Beech Tree=
+Beech Tree Fence=
+Beech Tree Fence Gate=
+Beech Tree Fence Rail=
+Beech Tree Leaves=
+Beech Tree Planks=
+Beech Tree Planks Slab=
+Beech Tree Planks Stair=
+Beech Tree Sapling=
+Beech Tree Trunk=
+Beech Tree Trunk Slab=
+Beech Tree Trunk Stair=
+Birch Tree=
+Birch Tree Fence=
+Birch Tree Fence Gate=
+Birch Tree Fence Rail=
+Birch Tree Leaves=
+Birch Tree Planks=
+Birch Tree Planks Slab=
+Birch Tree Planks Stair=
+Birch Tree Sapling=
+Birch Tree Trunk=
+Birch Tree Trunk Slab=
+Birch Tree Trunk Stair=
+Cedar Cone=
+Cedar Tree=
+Cedar Tree Fence=
+Cedar Tree Fence Gate=
+Cedar Tree Fence Rail=
+Cedar Tree Leaves=
+Cedar Tree Planks=
+Cedar Tree Planks Slab=
+Cedar Tree Planks Stair=
+Cedar Tree Sapling=
+Cedar Tree Trunk=
+Cedar Tree Trunk Slab=
+Cedar Tree Trunk Stair=
+Date Palm Tree=
+Date Palm Tree Fence=
+Date Palm Tree Fence Gate=
+Date Palm Tree Fence Rail=
+Date Palm Tree Leaves=
+Date Palm Tree Planks=
+Date Palm Tree Planks Slab=
+Date Palm Tree Planks Stair=
+Date Palm Tree Sapling=
+Date Palm Tree Trunk=
+Date Palm Tree Trunk Slab=
+Date Palm Tree Trunk Stair=
+Douglas Fir=
+Douglas Fir Fence=
+Douglas Fir Fence Gate=
+Douglas Fir Fence Rail=
+Douglas Fir Leaves=
+Douglas Fir Leaves (Bright)=
+Douglas Fir Planks=
+Douglas Fir Planks Slab=
+Douglas Fir Planks Stair=
+Douglas Fir Sapling=
+Douglas Fir Trunk=
+Douglas Fir Trunk Slab=
+Douglas Fir Trunk Stair=
+Fir Cone=
+Giant Sequoia=
+Giant Sequoia Fence=
+Giant Sequoia Fence Gate=
+Giant Sequoia Fence Rail=
+Giant Sequoia Leaves=
+Giant Sequoia Planks=
+Giant Sequoia Planks Slab=
+Giant Sequoia Planks Stair=
+Giant Sequoia Sapling=
+Giant Sequoia Trunk=
+Giant Sequoia Trunk Slab=
+Giant Sequoia Trunk Stair=
+Jungle Tree=
+Jungle Tree Fence=
+Jungle Tree Fence Gate=
+Jungle Tree Fence Rail=
+Jungle Tree Leaves=
+Jungle Tree Leaves (@1)=
+Jungle Tree Planks=
+Jungle Tree Planks Slab=
+Jungle Tree Planks Stair=
+Jungle Tree Sapling=
+Jungle Tree Trunk=
+Jungle Tree Trunk Slab=
+Jungle Tree Trunk Stair=
+Oak Tree=
+Oak Tree Fence=
+Oak Tree Fence Gate=
+Oak Tree Fence Rail=
+Oak Tree Leaves=
+Oak Tree Planks=
+Oak Tree Planks Slab=
+Oak Tree Planks Stair=
+Oak Tree Sapling=
+Oak Tree Trunk=
+Oak Tree Trunk Slab=
+Oak Tree Trunk Stair=
+Palm Tree=
+Palm Tree Fence=
+Palm Tree Fence Gate=
+Palm Tree Fence Rail=
+Palm Tree Leaves=
+Palm Tree Planks=
+Palm Tree Planks Slab=
+Palm Tree Planks Stair=
+Palm Tree Sapling=
+Palm Tree Trunk=
+Palm Tree Trunk Slab=
+Palm Tree Trunk Stair=
+Poplar Tree=
+Poplar Tree Fence=
+Poplar Tree Fence Gate=
+Poplar Tree Fence Rail=
+Poplar Tree Leaves=
+Poplar Tree Planks=
+Poplar Tree Planks Slab=
+Poplar Tree Planks Stair=
+Poplar Tree Sapling=
+Poplar Tree Trunk=
+Poplar Tree Trunk Slab=
+Poplar Tree Trunk Stair=
+Red=
+Rubber Tree=
+Rubber Tree Fence=
+Rubber Tree Fence Gate=
+Rubber Tree Fence Rail=
+Rubber Tree Leaves=
+Rubber Tree Planks=
+Rubber Tree Planks Slab=
+Rubber Tree Planks Stair=
+Rubber Tree Sapling=
+Rubber Tree Trunk=
+Rubber Tree Trunk (Empty)=
+Rubber Tree Trunk Slab=
+Rubber Tree Trunk Stair=
+Small poplar Tree Sapling=
+Spruce Cone=
+Spruce Tree=
+Spruce Tree Fence=
+Spruce Tree Fence Gate=
+Spruce Tree Fence Rail=
+Spruce Tree Leaves=
+Spruce Tree Planks=
+Spruce Tree Planks Slab=
+Spruce Tree Planks Stair=
+Spruce Tree Sapling=
+Spruce Tree Trunk=
+Spruce Tree Trunk Slab=
+Spruce Tree Trunk Stair=
+Willow Tree=
+Willow Tree Fence=
+Willow Tree Fence Gate=
+Willow Tree Fence Rail=
+Willow Tree Leaves=
+Willow Tree Planks=
+Willow Tree Planks Slab=
+Willow Tree Planks Stair=
+Willow Tree Sapling=
+Willow Tree Trunk=
+Willow Tree Trunk Slab=
+Willow Tree Trunk Stair=
+Yellow=
--- a/mod.conf
+++ b/mod.conf
@ -1,4 +1,4 @@
 name = moretrees
 depends = default, biome_lib, vessels
-optional_depends = doors, stairs, moreblocks, intllib, farming
+optional_depends = doors, stairs, moreblocks, farming
 min_minetest_version = 5.2.0
--- a/node_defs.lua
+++ b/node_defs.lua
@ -1,28 +1,217 @@
-local S = moretrees.intllib
+local S = minetest.get_translator("moretrees")

 moretrees.avoidnodes = {}

 moretrees.treelist = {
-	{"beech",			"Beech Tree"},
-	{"apple_tree",		"Apple Tree"},
-	{"oak",				"Oak Tree",			"acorn",					"Acorn",			{-0.2, -0.5, -0.2, 0.2, 0, 0.2},	0.8 },
-	{"sequoia",			"Giant Sequoia"},
-	{"birch",			"Birch Tree"},
-	{"palm",			"Palm Tree",		"palm_fruit_trunk_gen",		"Palm Tree",		{-0.2, -0.5, -0.2, 0.2, 0, 0.2},	1.0 },
-	{"date_palm",		"Date Palm Tree",	"date_palm_fruit_trunk",	"Date Palm Tree",	{0, 0, 0, 0, 0, 0},	0.0 },
-	{"spruce",			"Spruce Tree",		"spruce_cone",				"Spruce Cone",		{-0.2, -0.5, -0.2, 0.2, 0, 0.2},	0.8 },
-	{"cedar",			"Cedar Tree",		"cedar_cone",				"Cedar Cone",		{-0.2, -0.5, -0.2, 0.2, 0, 0.2},	0.8 },
-	{"poplar",			"Poplar Tree"},
-	{"poplar_small",	"Poplar Tree"},
-	{"willow",			"Willow Tree"},
-	{"rubber_tree",		"Rubber Tree"},
-	{"fir",				"Douglas Fir",		"fir_cone",					"Fir Cone",			{-0.2, -0.5, -0.2, 0.2, 0, 0.2},	0.8 },
-	{"jungletree",		"Jungle Tree",		nil,						nil,				nil,								nil, "default_junglesapling.png"  },
+	{"beech",        S("Beech Tree")},
+	{"apple_tree",   S("Apple Tree")},
+	{"oak",          S("Oak Tree"),       "acorn",                 S("Acorn"), {-0.2, -0.5, -0.2, 0.2, 0, 0.2}, 0.8 },
+	{"sequoia",      S("Giant Sequoia")},
+	{"birch",        S("Birch Tree")},
+	{"palm",         S("Palm Tree"),      "palm_fruit_trunk_gen",  S("Palm Tree"), {-0.2, -0.5, -0.2, 0.2, 0, 0.2}, 1.0 },
+	{"date_palm",    S("Date Palm Tree"), "date_palm_fruit_trunk", S("Date Palm Tree"), {0, 0, 0, 0, 0, 0}, 0.0 },
+	{"spruce",       S("Spruce Tree"),    "spruce_cone",           S("Spruce Cone"), {-0.2, -0.5, -0.2, 0.2, 0, 0.2}, 0.8 },
+	{"cedar",        S("Cedar Tree"),     "cedar_cone",            S("Cedar Cone"), {-0.2, -0.5, -0.2, 0.2, 0, 0.2}, 0.8 },
+	{"poplar",       S("Poplar Tree")},
+	{"poplar_small", S("Poplar Tree")},
+	{"willow",       S("Willow Tree")},
+	{"rubber_tree",  S("Rubber Tree")},
+	{"fir",          S("Douglas Fir"),    "fir_cone",              S("Fir Cone"), {-0.2, -0.5, -0.2, 0.2, 0, 0.2}, 0.8 },
+	{"jungletree",   S("Jungle Tree"),     nil,                    nil, nil, nil, "default_junglesapling.png"  },
 }

-local dirs1 = { 21, 20, 23, 22, 21 }
+moretrees.treedesc = {
+	beech = {
+		trunk = S("Beech Tree Trunk"),
+		planks = S("Beech Tree Planks"),
+		sapling = S("Beech Tree Sapling"),
+		leaves = S("Beech Tree Leaves"),
+		trunk_stair = S("Beech Tree Trunk Stair"),
+		trunk_slab = S("Beech Tree Trunk Slab"),
+		planks_stair = S("Beech Tree Planks Stair"),
+		planks_slab = S("Beech Tree Planks Slab"),
+		fence = S("Beech Tree Fence"),
+		fence_rail = S("Beech Tree Fence Rail"),
+		fence_gate = S("Beech Tree Fence Gate"),
+	},
+	apple_tree = {
+		trunk = S("Apple Tree Trunk"),
+		planks = S("Apple Tree Planks"),
+		sapling = S("Apple Tree Sapling"),
+		leaves = S("Apple Tree Leaves"),
+		trunk_stair = S("Apple Tree Trunk Stair"),
+		trunk_slab = S("Apple Tree Trunk Slab"),
+		planks_stair = S("Apple Tree Planks Stair"),
+		planks_slab = S("Apple Tree Planks Slab"),
+		fence = S("Apple Tree Fence"),
+		fence_rail = S("Apple Tree Fence Rail"),
+		fence_gate = S("Apple Tree Fence Gate"),
+	},
+	oak = {
+		trunk = S("Oak Tree Trunk"),
+		planks = S("Oak Tree Planks"),
+		sapling = S("Oak Tree Sapling"),
+		leaves = S("Oak Tree Leaves"),
+		trunk_stair = S("Oak Tree Trunk Stair"),
+		trunk_slab = S("Oak Tree Trunk Slab"),
+		planks_stair = S("Oak Tree Planks Stair"),
+		planks_slab = S("Oak Tree Planks Slab"),
+		fence = S("Oak Tree Fence"),
+		fence_rail = S("Oak Tree Fence Rail"),
+		fence_gate = S("Oak Tree Fence Gate"),
+	},
+	sequoia = {
+		trunk = S("Giant Sequoia Trunk"),
+		planks = S("Giant Sequoia Planks"),
+		sapling = S("Giant Sequoia Sapling"),
+		leaves = S("Giant Sequoia Leaves"),
+		trunk_stair = S("Giant Sequoia Trunk Stair"),
+		trunk_slab = S("Giant Sequoia Trunk Slab"),
+		planks_stair = S("Giant Sequoia Planks Stair"),
+		planks_slab = S("Giant Sequoia Planks Slab"),
+		fence = S("Giant Sequoia Fence"),
+		fence_rail = S("Giant Sequoia Fence Rail"),
+		fence_gate = S("Giant Sequoia Fence Gate"),
+	},
+	birch = {
+		trunk = S("Birch Tree Trunk"),
+		planks = S("Birch Tree Planks"),
+		sapling = S("Birch Tree Sapling"),
+		leaves = S("Birch Tree Leaves"),
+		trunk_stair = S("Birch Tree Trunk Stair"),
+		trunk_slab = S("Birch Tree Trunk Slab"),
+		planks_stair = S("Birch Tree Planks Stair"),
+		planks_slab = S("Birch Tree Planks Slab"),
+		fence = S("Birch Tree Fence"),
+		fence_rail = S("Birch Tree Fence Rail"),
+		fence_gate = S("Birch Tree Fence Gate"),
+	},
+	palm = {
+		trunk = S("Palm Tree Trunk"),
+		planks = S("Palm Tree Planks"),
+		sapling = S("Palm Tree Sapling"),
+		leaves = S("Palm Tree Leaves"),
+		trunk_stair = S("Palm Tree Trunk Stair"),
+		trunk_slab = S("Palm Tree Trunk Slab"),
+		planks_stair = S("Palm Tree Planks Stair"),
+		planks_slab = S("Palm Tree Planks Slab"),
+		fence = S("Palm Tree Fence"),
+		fence_rail = S("Palm Tree Fence Rail"),
+		fence_gate = S("Palm Tree Fence Gate"),
+	},
+	date_palm = {
+		trunk = S("Date Palm Tree Trunk"),
+		planks = S("Date Palm Tree Planks"),
+		sapling = S("Date Palm Tree Sapling"),
+		leaves = S("Date Palm Tree Leaves"),
+		trunk_stair = S("Date Palm Tree Trunk Stair"),
+		trunk_slab = S("Date Palm Tree Trunk Slab"),
+		planks_stair = S("Date Palm Tree Planks Stair"),
+		planks_slab = S("Date Palm Tree Planks Slab"),
+		fence = S("Date Palm Tree Fence"),
+		fence_rail = S("Date Palm Tree Fence Rail"),
+		fence_gate = S("Date Palm Tree Fence Gate"),
+	},
+	spruce = {
+		trunk = S("Spruce Tree Trunk"),
+		planks = S("Spruce Tree Planks"),
+		sapling = S("Spruce Tree Sapling"),
+		leaves = S("Spruce Tree Leaves"),
+		trunk_stair = S("Spruce Tree Trunk Stair"),
+		trunk_slab = S("Spruce Tree Trunk Slab"),
+		planks_stair = S("Spruce Tree Planks Stair"),
+		planks_slab = S("Spruce Tree Planks Slab"),
+		fence = S("Spruce Tree Fence"),
+		fence_rail = S("Spruce Tree Fence Rail"),
+		fence_gate = S("Spruce Tree Fence Gate"),
+	},
+	cedar =  {
+		trunk = S("Cedar Tree Trunk"),
+		planks = S("Cedar Tree Planks"),
+		sapling = S("Cedar Tree Sapling"),
+		leaves = S("Cedar Tree Leaves"),
+		trunk_stair = S("Cedar Tree Trunk Stair"),
+		trunk_slab = S("Cedar Tree Trunk Slab"),
+		planks_stair = S("Cedar Tree Planks Stair"),
+		planks_slab = S("Cedar Tree Planks Slab"),
+		fence = S("Cedar Tree Fence"),
+		fence_rail = S("Cedar Tree Fence Rail"),
+		fence_gate = S("Cedar Tree Fence Gate"),
+	},
+	poplar = {
+		trunk = S("Poplar Tree Trunk"),
+		planks = S("Poplar Tree Planks"),
+		sapling = S("Poplar Tree Sapling"),
+		leaves = S("Poplar Tree Leaves"),
+		trunk_stair = S("Poplar Tree Trunk Stair"),
+		trunk_slab = S("Poplar Tree Trunk Slab"),
+		planks_stair = S("Poplar Tree Planks Stair"),
+		planks_slab = S("Poplar Tree Planks Slab"),
+		fence = S("Poplar Tree Fence"),
+		fence_rail = S("Poplar Tree Fence Rail"),
+		fence_gate = S("Poplar Tree Fence Gate"),
+	},
+	poplar_small = {
+		sapling = S("Small poplar Tree Sapling"),
+	},
+	willow = {
+		trunk = S("Willow Tree Trunk"),
+		planks = S("Willow Tree Planks"),
+		sapling = S("Willow Tree Sapling"),
+		leaves = S("Willow Tree Leaves"),
+		trunk_stair = S("Willow Tree Trunk Stair"),
+		trunk_slab = S("Willow Tree Trunk Slab"),
+		planks_stair = S("Willow Tree Planks Stair"),
+		planks_slab = S("Willow Tree Planks Slab"),
+		fence = S("Willow Tree Fence"),
+		fence_rail = S("Willow Tree Fence Rail"),
+		fence_gate = S("Willow Tree Fence Gate"),
+	},
+	rubber_tree = {
+		trunk = S("Rubber Tree Trunk"),
+		planks = S("Rubber Tree Planks"),
+		sapling = S("Rubber Tree Sapling"),
+		leaves = S("Rubber Tree Leaves"),
+		trunk_stair = S("Rubber Tree Trunk Stair"),
+		trunk_slab = S("Rubber Tree Trunk Slab"),
+		planks_stair = S("Rubber Tree Planks Stair"),
+		planks_slab = S("Rubber Tree Planks Slab"),
+		fence = S("Rubber Tree Fence"),
+		fence_rail = S("Rubber Tree Fence Rail"),
+		fence_gate = S("Rubber Tree Fence Gate"),
+	},
+	fir = {
+		trunk = S("Douglas Fir Trunk"),
+		planks = S("Douglas Fir Planks"),
+		sapling = S("Douglas Fir Sapling"),
+		leaves = S("Douglas Fir Leaves"),
+		trunk_stair = S("Douglas Fir Trunk Stair"),
+		trunk_slab = S("Douglas Fir Trunk Slab"),
+		planks_stair = S("Douglas Fir Planks Stair"),
+		planks_slab = S("Douglas Fir Planks Slab"),
+		fence = S("Douglas Fir Fence"),
+		fence_rail = S("Douglas Fir Fence Rail"),
+		fence_gate = S("Douglas Fir Fence Gate"),
+	},
+	jungletree = {
+		trunk = S("Jungle Tree Trunk"),
+		planks = S("Jungle Tree Planks"),
+		sapling = S("Jungle Tree Sapling"),
+		leaves = S("Jungle Tree Leaves"),
+		trunk_stair = S("Jungle Tree Trunk Stair"),
+		trunk_slab = S("Jungle Tree Trunk Slab"),
+		planks_stair = S("Jungle Tree Planks Stair"),
+		planks_slab = S("Jungle Tree Planks Slab"),
+		fence = S("Jungle Tree Fence"),
+		fence_rail = S("Jungle Tree Fence Rail"),
+		fence_gate = S("Jungle Tree Fence Gate"),
+	},
+}
+
+
+-- local dirs1 = { 21, 20, 23, 22, 21 }
 local dirs2 = { 12, 9, 18, 7, 12 }
-local dirs3 = { 14, 11, 16, 5, 14 }
+-- local dirs3 = { 14, 11, 16, 5, 14 }

 local moretrees_new_leaves_drawtype = "allfaces_optional"
 local moretrees_plantlike_leaves_visual_scale = 1
@ -55,7 +244,6 @@ end

 for i in ipairs(moretrees.treelist) do
 	local treename = moretrees.treelist[i][1]
-	local treedesc = moretrees.treelist[i][2]
 	local fruit = moretrees.treelist[i][3]
 	local fruitdesc = moretrees.treelist[i][4]
 	local selbox = moretrees.treelist[i][5]
@ -84,7 +272,7 @@ for i in ipairs(moretrees.treelist) do
 		saptex = "moretrees_"..treename.."_sapling.png"

 		minetest.register_node("moretrees:"..treename.."_trunk", {
-			description = S(treedesc.." Trunk"),
+			description = moretrees.treedesc[treename].trunk,
 			tiles = {
 				"moretrees_"..treename.."_trunk_top.png",
 				"moretrees_"..treename.."_trunk_top.png",
@ -98,7 +286,7 @@ for i in ipairs(moretrees.treelist) do
 		})

 		minetest.register_node("moretrees:"..treename.."_planks", {
-			description = S(treedesc.." Planks"),
+			description = moretrees.treedesc[treename].planks,
 			tiles = {"moretrees_"..treename.."_wood.png"},
 			is_ground_content = false,
 			groups = {snappy=1,choppy=2,oddly_breakable_by_hand=2,flammable=3,wood=1},
@ -106,7 +294,7 @@ for i in ipairs(moretrees.treelist) do
 		})

 		minetest.register_node("moretrees:"..treename.."_sapling", {
-			description = S(treedesc.." Sapling"),
+			description = moretrees.treedesc[treename].sapling,
 			drawtype = "plantlike",
 			tiles = {saptex},
 			inventory_image = saptex,
@ -141,7 +329,7 @@ for i in ipairs(moretrees.treelist) do
 		end

 		minetest.register_node("moretrees:"..treename.."_leaves", {
-			description = S(treedesc.." Leaves"),
+			description = moretrees.treedesc[treename].leaves,
 			drawtype = moretrees_new_leaves_drawtype,
 			waving = moretrees_new_leaves_waving,
 			visual_scale = moretrees_plantlike_leaves_visual_scale,
@ -177,7 +365,7 @@ for i in ipairs(moretrees.treelist) do
 							"moretrees_"..treename.."_trunk_top.png",
 							"moretrees_"..treename.."_trunk.png"
 						},
-						description = S(treedesc.." Trunk"),
+						description = moretrees.treedesc[treename].trunk,
 						drop = treename.."_trunk",
 					}
 				)
@ -189,7 +377,7 @@ for i in ipairs(moretrees.treelist) do
 					{
 						groups = { snappy=1, choppy=2, oddly_breakable_by_hand=2, flammable=3, not_in_creative_inventory=1 },
 						tiles = { "moretrees_"..treename.."_wood.png" },
-						description = S(treedesc.." Planks"),
+						description = moretrees.treedesc[treename].planks,
 						drop = treename.."_planks",
 					}
 				)
@ -202,8 +390,8 @@ for i in ipairs(moretrees.treelist) do
 						"moretrees_"..treename.."_trunk_top.png",
 						"moretrees_"..treename.."_trunk.png"
 					},
-					S(treedesc.." Trunk Stair"),
-					S(treedesc.." Trunk Slab"),
+					moretrees.treedesc[treename].trunk_stair,
+					moretrees.treedesc[treename].trunk_slab,
 					default.node_sound_wood_defaults()
 				)

@ -212,8 +400,8 @@ for i in ipairs(moretrees.treelist) do
 					"moretrees:"..treename.."_planks",
 					{ snappy=1, choppy=2, oddly_breakable_by_hand=2, flammable=3 },
 					{ "moretrees_"..treename.."_wood.png" },
-					S(treedesc.." Planks Stair"),
-					S(treedesc.." Planks Slab"),
+					moretrees.treedesc[treename].planks_stair,
+					moretrees.treedesc[treename].planks_slab,
 					default.node_sound_wood_defaults()
 				)

@ -224,7 +412,7 @@ for i in ipairs(moretrees.treelist) do
 			local planks_name = "moretrees:" .. treename .. "_planks"
 			local planks_tile = "moretrees_" .. treename .. "_wood.png"
 			default.register_fence("moretrees:" .. treename .. "_fence", {
-				description = S(treedesc.." Fence"),
+				description = moretrees.treedesc[treename].fence,
 				texture = planks_tile,
 				inventory_image = "default_fence_overlay.png^" .. planks_tile ..
 										"^default_fence_overlay.png^[makealpha:255,126,126",
@ -235,7 +423,7 @@ for i in ipairs(moretrees.treelist) do
 				sounds = default.node_sound_wood_defaults()
 			})
 			default.register_fence_rail("moretrees:" .. treename .. "_fence_rail", {
-				description = S(treedesc.." Fence Rail"),
+				description = moretrees.treedesc[treename].fence_rail,
 				texture = planks_tile,
 				inventory_image = "default_fence_rail_overlay.png^" .. planks_tile ..
 										"^default_fence_rail_overlay.png^[makealpha:255,126,126",
@ -247,7 +435,7 @@ for i in ipairs(moretrees.treelist) do
 			})
 			if minetest.global_exists("doors") then
 				doors.register_fencegate("moretrees:" .. treename .. "_gate", {
-					description = S(treedesc .. " Fence Gate"),
+					description = moretrees.treedesc[treename].fence_gate,
 					texture = planks_tile,
 					material = planks_name,
 					groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2}
@ -257,7 +445,7 @@ for i in ipairs(moretrees.treelist) do
 	end

 	minetest.register_node("moretrees:"..treename.."_sapling_ongen", {
-		description = S(treedesc.." Sapling (fast growth)"),
+		description = S("@1 (fast growth)", moretrees.treedesc[treename].sapling),
 		drawtype = "plantlike",
 		tiles = {saptex},
 		inventory_image = saptex,
@ -290,7 +478,7 @@ for i in ipairs(moretrees.treelist) do
 	if fruit then
 		fruitname = "moretrees:"..fruit
 		minetest.register_node(fruitname, {
-			description = S(fruitdesc),
+			description = fruitdesc,
 			drawtype = "plantlike",
 			tiles = { "moretrees_"..fruit..".png" },
 			inventory_image = "moretrees_"..fruit..".png^[transformR180",
@ -325,7 +513,7 @@ for i in ipairs(moretrees.treelist) do
 		chance = 1,
 		action = function(pos, node, active_object_count, active_object_count_wider)
 			local fdir = node.param2 or 0
-				nfdir = dirs2[fdir+1]
+				local nfdir = dirs2[fdir+1]
 			minetest.add_node(pos, {name = "moretrees:"..treename.."_trunk", param2 = nfdir})
 		end,
 	})
@ -380,7 +568,7 @@ minetest.override_item("moretrees:poplar_leaves", {
 -- Extra nodes for jungle trees:

 local jungleleaves = {"yellow","red"}
-local jungleleavesnames = {"Yellow", "Red"}
+local jungleleavesnames = {S("Yellow"), S("Red")}
 for color = 1, #jungleleaves do
 	local leave_name = "moretrees:jungletree_leaves_"..jungleleaves[color]

@ -391,7 +579,7 @@ for color = 1, #jungleleaves do
 	end

 	minetest.register_node(leave_name, {
-		description = S("Jungle Tree Leaves ("..jungleleavesnames[color]..")"),
+		description = S("Jungle Tree Leaves (@1)", jungleleavesnames[color]),
 		drawtype = moretrees_new_leaves_drawtype,
 		waving = moretrees_new_leaves_waving,
 		visual_scale = moretrees_plantlike_leaves_visual_scale,
@ -487,7 +675,6 @@ minetest.register_node("moretrees:rubber_tree_trunk_empty", {
 		"moretrees_rubber_tree_trunk_top.png",
 		"moretrees_rubber_tree_trunk_empty.png"
 	},
-	is_ground_content = true,
 	groups = {tree=1,snappy=1,choppy=2,oddly_breakable_by_hand=1,flammable=2},
 	sounds = default.node_sound_wood_defaults(),
 	paramtype2 = "facedir",
@ -501,7 +688,7 @@ minetest.register_abm({
 	chance = 1,
 	action = function(pos, node, active_object_count, active_object_count_wider)
 		local fdir = node.param2 or 0
-			nfdir = dirs2[fdir+1]
+			local nfdir = dirs2[fdir+1]
 		minetest.add_node(pos, {name = "moretrees:rubber_tree_trunk_empty", param2 = nfdir})
 	end,
 })
--- a/screenshot.lua
+++ b/screenshot.lua
@ -31,7 +31,7 @@ index 8189ffd..afd4644 100644
@@ -225,9 +225,12 @@ moretrees.ct_rules_b1 = "[-FBf][+FBf]"
 moretrees.ct_rules_a2 = "FF[FF][&&-FBF][&&+FBF][&&---FBF][&&+++FBF]F/A"
 moretrees.ct_rules_b2 = "[-fB][+fB]"
- 
+
 +local jleaves = 1
 function moretrees.grow_jungletree(pos)
        local r1 = math.random(2)
@ -40,11 +40,11 @@ index 8189ffd..afd4644 100644
 +       jleaves = jleaves % 2 + 1
        if r1 == 1 then
                moretrees.jungletree_model.leaves2 = "moretrees:jungletree_leaves_red"
-        else 
+        else
@@ -235,6 +238,7 @@ function moretrees.grow_jungletree(pos)
        end
        moretrees.jungletree_model.leaves2_chance = math.random(25, 75)
- 
+
 +       r2=3
        if r2 == 1 then
                moretrees.jungletree_model.trunk_type = "single"
@ -62,7 +62,7 @@ minetest.register_chatcommand("make-scene", {
 		minetest.place_node({x=780, y=30, z=-276}, {name="default:obsidian"})

 		for z = -360, -300 do
-			dy=2
+			local dy=2
 			for x = 630 + (-z - 360)/3, 660 + (-z - 300)/3 do
 				for y = 5, 22 do
 					minetest.place_node({x=x, y=y, z=z}, {name="default:desert_stone"})
--- a/tree_models.lua
+++ b/tree_models.lua
@ -49,7 +49,6 @@ moretrees.poplar_model={
 	rules_b="[[T]&&G++f++ff++ff++ff++f--]G",
 	rules_c="[[T]&&G++f++ff++ff++ff++f--G++[d]G[d]G++G[d]G[d]G[d]G++G[d]G[d]G[d]G++G[d]G[d]G[d]G++G[d]G]G",
 	rules_d="f",
-	trunk="air",
 	trunk="moretrees:poplar_trunk",
 	leaves="moretrees:poplar_leaves",
 	angle=45,
				`@ -1 +0,0 @@`
				`This mod adds a whole bunch of new types of trees to the game`