add missing leave node to fir

biome_defs.lua

@@ -1,45 +1,30 @@
 
--- TODO
--- Use biomes in the decoration definition depending on their heat_point humidity_point
--- instead of spawning it with a rather low fill_ratio everywhere
-local ratio_abundant =  0.001
-local ratio_common =    0.0005
-local ratio_normal =    0.0003
-local ratio_uncommon =  0.0002
-local ratio_rare =      0.0001
-local ratio_very_rare = 0.00003
-
-local coniferous_place_on = {
-	xcompat.materials.dirt_with_grass,
-	"default:dirt_with_coniferous_litter"
-}
-
 moretrees.beech_biome = {
 	place_on = xcompat.materials.dirt_with_grass,
-	fill_ratio = ratio_normal,
 }
 
 moretrees.palm_biome = {
 	place_on = xcompat.materials.sand,
 	min_elevation = -1,
 	max_elevation = 1,
-	fill_ratio = ratio_abundant,
+	spawn_by = {xcompat.materials.water_source},
+	num_spawn_by = 10,
 }
 
 moretrees.date_palm_biome = {
 	place_on = xcompat.materials.desert_sand,
 	min_elevation = -1,
-	max_elevation = 8,
-	fill_ratio = ratio_common,
+	max_elevation = 10,
+	spawn_by = {xcompat.materials.water_source},
+	num_spawn_by = 100,
 }
 
 moretrees.date_palm_biome_2 = {
 	place_on = xcompat.materials.desert_sand,
-	min_elevation = 9,
+	min_elevation = 11,
 	max_elevation = 30,
 	spawn_by = {xcompat.materials.water_source},
 	num_spawn_by = 1,
-	fill_ratio = ratio_abundant,
 }
 
 moretrees.apple_tree_biome = {
@@ -47,42 +32,44 @@ moretrees.apple_tree_biome = {
 	min_elevation = 1,
 	max_elevation = 10,
 	biomes = {"deciduous_forest"},
-	fill_ratio = ratio_rare,
+	fill_ratio = 0.0001,
 }
 
 moretrees.oak_biome = {
 	place_on = xcompat.materials.dirt_with_grass,
 	min_elevation = 0,
 	max_elevation = 10,
-	fill_ratio = ratio_normal,
+	fill_ratio = 0.0003
 }
 
 moretrees.sequoia_biome = {
 	place_on = xcompat.materials.dirt_with_grass,
 	min_elevation = 0,
 	max_elevation = 10,
-	fill_ratio = ratio_rare,
+	fill_ratio = 0.0001,
 }
 
 moretrees.birch_biome = {
 	place_on = xcompat.materials.dirt_with_grass,
 	min_elevation = 10,
 	max_elevation = 15,
-	fill_ratio = ratio_common,
+	fill_ratio = 0.001,
 }
 
 moretrees.willow_biome = {
 	place_on = xcompat.materials.dirt_with_grass,
 	min_elevation = -5,
 	max_elevation = 5,
-	fill_ratio = ratio_uncommon,
+	spawn_by = {xcompat.materials.water_source},
+	num_spawn_by = 5,
 }
 
 moretrees.rubber_tree_biome = {
 	place_on = xcompat.materials.dirt_with_grass,
 	min_elevation = -5,
-	max_elevation = 8,
-	fill_ratio = ratio_normal,
+	max_elevation = 5,
+	spawn_by = {xcompat.materials.water_source},
+	num_spawn_by = 10,
 }
 
 moretrees.jungletree_biome = {
@@ -101,15 +88,15 @@ moretrees.jungletree_biome = {
 }
 
 moretrees.spruce_biome = {
-	place_on = coniferous_place_on,
+	place_on = xcompat.materials.dirt_with_grass,
 	min_elevation = 20,
-	fill_ratio = ratio_uncommon,
 }
 
 moretrees.cedar_biome = {
-	place_on = coniferous_place_on,
+	place_on = xcompat.materials.dirt_with_grass,
 	min_elevation = 0,  --Added to solve an issue where cedar trees would sometimes spawn deep underground
-	fill_ratio = ratio_rare,
+	spawn_by = {xcompat.materials.water_source},
+	num_spawn_by = 5,
 }
 
 
@@ -119,8 +106,7 @@ moretrees.poplar_biome = {
 	min_elevation = 0,
 	max_elevation = 50,
 	spawn_by = {xcompat.materials.water_source},
-	num_spawn_by = 3,
-	fill_ratio = ratio_abundant,
+	num_spawn_by = 1,
 }
 
 -- Spawn an occasional poplar elsewhere.
@@ -128,17 +114,17 @@ moretrees.poplar_biome_2 = {
 	place_on = xcompat.materials.dirt_with_grass,
 	min_elevation = 0,
 	max_elevation = 50,
-	fill_ratio = ratio_very_rare,
+	spawn_by = {xcompat.materials.water_source},
+	num_spawn_by = 10,
 }
 
 -- Subterranean lakes provide enough water for poplars to grow
 moretrees.poplar_biome_3 = {
 	place_on = xcompat.materials.dirt_with_grass,
-	min_elevation = -50,
-	max_elevation = 0,
+	min_elevation = 0,
+	max_elevation = 50,
 	spawn_by = {xcompat.materials.water_source},
-	num_spawn_by = 3,
-	fill_ratio = ratio_abundant,
+	num_spawn_by = 1,
 }
 
 moretrees.poplar_small_biome = {
@@ -147,7 +133,6 @@ moretrees.poplar_small_biome = {
 	max_elevation = 50,
 	spawn_by = {xcompat.materials.water_source},
 	num_spawn_by = 1,
-	fill_ratio = ratio_normal,
 }
 
 moretrees.poplar_small_biome_2 = {
@@ -156,18 +141,15 @@ moretrees.poplar_small_biome_2 = {
 	max_elevation = 50,
 	spawn_by = {xcompat.materials.water_source},
 	num_spawn_by = 5,
-	fill_ratio = ratio_abundant,
 }
 
 
 moretrees.fir_biome = {
-	place_on = coniferous_place_on,
+	place_on = xcompat.materials.dirt_with_grass,
 	min_elevation = 25,
-	fill_ratio = ratio_normal,
 }
 
 moretrees.fir_biome_snow = {
 	place_on = {"snow:dirt_with_snow", "snow:snow"},
 	below_nodes = {xcompat.materials.dirt, xcompat.materials.dirt_with_grass, "snow:dirt_with_snow"},
-	fill_ratio = ratio_normal,
 }

init.lua

@@ -15,41 +15,39 @@
 
 moretrees = {}
 
-local S = minetest.get_translator("moretrees")
-
 if minetest.get_modpath("default") then
 	minetest.override_item("default:sapling", {
-		description = S("Sapling")
+		description = "Sapling"
 	})
 
 	minetest.override_item("default:tree", {
-		description = S("Tree")
+		description = "Tree"
 	})
 
 	minetest.override_item("default:wood", {
-		description = S("Wooden Planks")
+		description = "Wooden Planks"
 	})
 
 	minetest.override_item("default:leaves", {
-		description = S("Leaves")
+		description = "Leaves"
 	})
 
 	minetest.override_item("default:fence_wood", {
-		description = S("Wooden Fence")
+		description = "Wooden Fence"
 	})
 
 	minetest.override_item("default:fence_rail_wood", {
-		description = S("Wooden Fence Rail")
+		description = "Wooden Fence Rail"
 	})
 end
 
 if minetest.get_modpath("doors") then
 	minetest.override_item("doors:gate_wood_closed", {
-		description = S("Wooden Fence Gate")
+		description = "Wooden Fence Gate"
 	})
 
 	minetest.override_item("doors:gate_wood_open", {
-		description = S("Wooden Fence Gate")
+		description = "Wooden Fence Gate"
 	})
 end
 
@@ -136,7 +134,6 @@ function translate_biome_defs(def, treename, index)
 	if not index then index = 1 end
 	local deco_def = {
 		name = treename .. "_" .. index,
-		deco_type = "simple",
 		place_on = def.place_on,
 		sidelen = 16,
 		fill_ratio = def.fill_ratio or 0.001,
@@ -145,9 +142,16 @@ function translate_biome_defs(def, treename, index)
 		y_max = def.max_elevation,
 		spawn_by = def.spawn_by,
 		num_spawn_by = def.num_spawn_by,
-		decoration = "moretrees:"..treename.."_sapling_ongen"
 	}
 
+	if minetest.features.lsystem_decoration_type then
+		deco_def.deco_type = "lsystem"
+		deco_def.treedef = moretrees[treename .. "_model"]
+	else
+		deco_def.deco_type = "simple"
+		deco_def.decoration = "moretrees:"..treename.."_sapling_ongen"
+	end
+
 	deco_ids[#deco_ids+1] = treename .. ("_" .. index or "_1")
 
 	return deco_def
@@ -178,33 +182,35 @@ minetest.register_decoration(translate_biome_defs(moretrees.poplar_biome_3, "pop
 minetest.register_decoration(translate_biome_defs(moretrees.poplar_small_biome, "poplar_small", 4))
 minetest.register_decoration(translate_biome_defs(moretrees.poplar_small_biome_2, "poplar_small", 5))
 
---[[
-	this is purposefully wrapped in a on mods loaded callback to that it gets the proper ids
-	if other mods clear the registered decorations
-]]
-minetest.register_on_mods_loaded(function()
-	for k, v in pairs(deco_ids) do
-		deco_ids[k] = minetest.get_decoration_id(v)
-	end
-	minetest.set_gen_notify("decoration", deco_ids)
-end)
-
-minetest.register_on_generated(function(minp, maxp, blockseed)
-    local g = minetest.get_mapgen_object("gennotify")
-    local locations = {}
-	for _, id in pairs(deco_ids) do
-		local deco_locations = g["decoration#" .. id] or {}
-		for _, pos in pairs(deco_locations) do
-			locations[#locations+1] = pos
+if not minetest.features.lsystem_decoration_type then
+	--[[
+		this is purposefully wrapped in a on mods loaded callback to that it gets the proper ids
+		if other mods clear the registered decorations
+	]]
+	minetest.register_on_mods_loaded(function()
+		for k, v in pairs(deco_ids) do
+			deco_ids[k] = minetest.get_decoration_id(v)
 		end
-	end
+		minetest.set_gen_notify("decoration", deco_ids)
+	end)
 
-    if #locations == 0 then return end
-    for _, pos in ipairs(locations) do
-        local timer = minetest.get_node_timer({x=pos.x, y=pos.y+1, z=pos.z})
-        timer:start(math.random(2,10))
-    end
-end)
+	minetest.register_on_generated(function(minp, maxp, blockseed)
+		local g = minetest.get_mapgen_object("gennotify")
+		local locations = {}
+		for _, id in pairs(deco_ids) do
+			local deco_locations = g["decoration#" .. id] or {}
+			for _, pos in pairs(deco_locations) do
+				locations[#locations+1] = pos
+			end
+		end
+
+		if #locations == 0 then return end
+		for _, pos in ipairs(locations) do
+			local timer = minetest.get_node_timer({x=pos.x, y=pos.y+1, z=pos.z})
+			timer:start(math.random(2,10))
+		end
+	end)
+end
 
 -- Code to spawn a birch tree
 

locale/moretrees.de.tr

@@ -1,5 +1,5 @@
 # textdomain: moretrees
-# Translation by Xanthin, heavygale and Wuzzy
+# Translation by Xanthin and heavygale
 
 
 ### cocos_palm.lua ###
@@ -13,19 +13,19 @@ Acorn Muffin=Eichelmuffin
 Acorn Muffin batter=Eichelmuffinteig
 Coconut Milk=Kokosnussmilch
 Date=Dattel
-Date & nut snack=Dattel-und-Nuss-Snack
-Date-nut cake=Dattel-Nuss-Kuchen
-Date-nut cake batter=Dattel-Nuss-Kuchenteig
-Date-nut energy bar=Dattel-Nuss-Energieriegel
+Date & nut snack=Dattel & Nuss-Snack
+Date-nut cake=Dattelnusskuchen
+Date-nut cake batter=Dattelnuss-Kuchenteig
+Date-nut energy bar=Dattelnuss-Energieriegel
 Raw Coconut=Kokosnussfleisch
 Roasted Cedar Cone Nuts=Geröstete Zedernzapfenkerne
-Roasted Fir Cone Nuts=Geröstete Tannenzapfenkerne
-Roasted Spruce Cone Nuts=Geröstete Fichtenzapfenkerne
+Roasted Fir Cone Nuts=Geroestete Tannenzapfenkerne
+Roasted Spruce Cone Nuts=Geroestete Fichtenzapfenkerne
 
 ### date_palm.lua ###
 
 Date Flowers=Dattelblüten
-Date Stem=Dattelstängel
+Date Stem=Dattelstamm
 Dates=Datteln
 
 ### node_defs.lua ###
@@ -33,188 +33,179 @@ Dates=Datteln
 @1 (fast growth)=@1 (schnelles Wachstum)
 Acorn=Eichel
 Apple Tree=Apfelbaum
-Apple Tree Fence=Apfelbaumzaun
-Apple Tree Fence Gate=Apfelbaumzauntor
-Apple Tree Fence Rail=Apfelbaumzaungeländer
-Apple Tree Leaves=Apfelbaumblätter
-Apple Tree Planks=Apfelbaumplanken
-Apple Tree Planks Slab=Apfelbaumplankenplatte
-Apple Tree Planks Stair=Apfelbaumplankentreppe
+Apple Tree Fence=Apfelbaum-Zaun
+Apple Tree Fence Gate=Apfelbaum-Tor
+Apple Tree Fence Rail=Apfelbaum-Schiene
+Apple Tree Leaves=Apfelbaumlaub
+Apple Tree Planks=Apfelbaumbretter
+Apple Tree Planks Slab=Apfelbaumplatte
+Apple Tree Planks Stair=Apfelbaumstufe
 Apple Tree Sapling=Apfelbaumsetzling
 Apple Tree Trunk=Apfelbaumstamm
 Apple Tree Trunk Slab=Apfelbaumstammplatte
-Apple Tree Trunk Stair=Apfelbaumstammtreppe
+Apple Tree Trunk Stair=Apfelbaumstammstufe
 Beech Tree=Buche
-Beech Tree Fence=Buchenholzzaun
-Beech Tree Fence Gate=Buchenholzzaunzor
-Beech Tree Fence Rail=Buchenholzzaungeländer
-Beech Tree Leaves=Buchenblätter
-Beech Tree Planks=Buchenholzplanken
+Beech Tree Fence=Buchenholz-Zaun
+Beech Tree Fence Gate=Buchenholz-Tor
+Beech Tree Fence Rail=Buchenholz-Schiene
+Beech Tree Leaves=Buchenlaub
+Beech Tree Planks=Buchenholzbretter
 Beech Tree Planks Slab=Buchenholzplatte
-Beech Tree Planks Stair=Buchenholztreppe
-Beech Tree Sapling=Buchensetzling
+Beech Tree Planks Stair=Buchenholzstufe 
+Beech Tree Sapling=Buchesetzling
 Beech Tree Trunk=Buchenstamm
 Beech Tree Trunk Slab=Buchenstammplatte
-Beech Tree Trunk Stair=Buchenstammtreppe
+Beech Tree Trunk Stair=Buchenstammstufe
 Birch Tree=Birke
-Birch Tree Fence=Birkenholzzaun
-Birch Tree Fence Gate=Birkenholzzauntor
-Birch Tree Fence Rail=Birkenholzzaungeländer
-Birch Tree Leaves=Birkenblätter
-Birch Tree Planks=Birkenplanken
+Birch Tree Fence=Birkenholz-Zaun
+Birch Tree Fence Gate=Birkenholz-Tor
+Birch Tree Fence Rail=Birkenholz-Schiene
+Birch Tree Leaves=Birkenlaub
+Birch Tree Planks=Birkenbretter
 Birch Tree Planks Slab=Birkenholzplatte
-Birch Tree Planks Stair=Birkeholztreppe
+Birch Tree Planks Stair=Birkeholzstufe
 Birch Tree Sapling=Birkensetzling
 Birch Tree Trunk=Birkenstamm
 Birch Tree Trunk Slab=Birkenstammplatte
-Birch Tree Trunk Stair=Birkenstammtreppe
+Birch Tree Trunk Stair=Birkenstammstufe
 Cedar Cone=Zedernzapfen
 Cedar Tree=Zeder
-Cedar Tree Fence=Zedernholzzaun
-Cedar Tree Fence Gate=Zedernholzzauntor
-Cedar Tree Fence Rail=Zedernholzzaungeländer
+Cedar Tree Fence=Zedernholz-Zaun
+Cedar Tree Fence Gate=Zedernholz-Tor
+Cedar Tree Fence Rail=Zedernholz-Schiene
 Cedar Tree Leaves=Zederblätter
-Cedar Tree Planks=Zedernholzplanken
+Cedar Tree Planks=Zedernholzbretter
 Cedar Tree Planks Slab=Zedernholzplatte
-Cedar Tree Planks Stair=Zedernholztreppe
+Cedar Tree Planks Stair=Zedernholzstufe
 Cedar Tree Sapling=Zedersetzling
 Cedar Tree Trunk=Zederstamm
 Cedar Tree Trunk Slab=Zederstammplatte
-Cedar Tree Trunk Stair=Zederstammtreppe
+Cedar Tree Trunk Stair=Zederstamm Stufe
 Date Palm Tree=Dattelpalme
-Date Palm Tree Fence=Dattelpalmenzaun
-Date Palm Tree Fence Gate=Dattelpalmenzauntor
-Date Palm Tree Fence Rail=Dattelpalmenzaungeländer
-Date Palm Tree Leaves=Dattelpalmblätter
-Date Palm Tree Planks=Dattelpalmenplanken
+Date Palm Tree Fence=Dattelpalmen-Zaun
+Date Palm Tree Fence Gate=Dattelpalmen-Tor
+Date Palm Tree Fence Rail=Dattelpalmen-Schiene
+Date Palm Tree Leaves=Dattelpalmenblätter
+Date Palm Tree Planks=Dattelpalmenbretter
 Date Palm Tree Planks Slab=Dattelpalmenplatte
-Date Palm Tree Planks Stair=Dattelpalmentreppe
+Date Palm Tree Planks Stair=Dattelpalmenstufe
 Date Palm Tree Sapling=Dattelpalmensetzling
 Date Palm Tree Trunk=Dattelpalmenstamm
 Date Palm Tree Trunk Slab=Dattelpalmenstammplatte
-Date Palm Tree Trunk Stair=Dattelpalmenstammtreppe
+Date Palm Tree Trunk Stair=Dattelpalmenstammstufe
 Douglas Fir=Douglasie
-Douglas Fir Fence=Douglasienzaun
-Douglas Fir Fence Gate=Douglasienzauntor
-Douglas Fir Fence Rail=Douglasienzaungeländer
+Douglas Fir Fence=Douglasien-Zaun
+Douglas Fir Fence Gate=Douglasien-Tor
+Douglas Fir Fence Rail=Douglasien-Schiene
 Douglas Fir Leaves=Douglasiennadeln
-Douglas Fir Leaves (Bright)=Douglasiennadeln (hell)
-Douglas Fir Planks=Douglasienplanken
+Douglas Fir Leaves (Bright)=Douglasiennadeln (breit)
+Douglas Fir Planks=Douglasienbretter
 Douglas Fir Planks Slab=Douglasienplatte
-Douglas Fir Planks Stair=Douglasientreppe
+Douglas Fir Planks Stair=Douglasienstufe
 Douglas Fir Sapling=Douglasiensetzling
 Douglas Fir Trunk=Douglasienstamm
 Douglas Fir Trunk Slab=Douglasienstammplatte
-Douglas Fir Trunk Stair=Douglasienstammtreppe
+Douglas Fir Trunk Stair=Douglasienstammstufe
 Fir Cone=Tannenzapfen
 Giant Sequoia=Riesenmammutbaum
-Giant Sequoia Fence=Riesenmammutbaumzaun
-Giant Sequoia Fence Gate=Riesenmammutbaumzauntor
-Giant Sequoia Fence Rail=Riesenmammutbaumzaungeländer
-Giant Sequoia Leaves=Riesenmammutbaumblätter
-Giant Sequoia Planks=Riesenmammutbaumplanken
+Giant Sequoia Fence=Riesenmammutbaum-Zaun
+Giant Sequoia Fence Gate=Riesenmammutbaum-Tor
+Giant Sequoia Fence Rail=Riesenmammutbaum-Schiene
+Giant Sequoia Leaves=Riesenmammutbaumlaub
+Giant Sequoia Planks=Riesenmammutbaumbretter
 Giant Sequoia Planks Slab=Riesenmammutbaumplatte
-Giant Sequoia Planks Stair=Riesenmammutbaumtreppe
+Giant Sequoia Planks Stair=Riesenmammutbaumstufe
 Giant Sequoia Sapling=Riesenmammutbaumsetzling
 Giant Sequoia Trunk=Riesenmammutbaumstamm
 Giant Sequoia Trunk Slab=Riesenmammutbaumstammplatte
-Giant Sequoia Trunk Stair=Riesenmammutbaumstammtreppe
-Jungle Tree=Dschungelbaum
-Jungle Tree Fence=Dschungelbaumzaun
-Jungle Tree Fence Gate=Dschungelbaumzauntor
-Jungle Tree Fence Rail=Dschungelbaumzaungeländer
-Jungle Tree Leaves=Dschungelbaumblätter
-Jungle Tree Leaves (@1)=Dschungelbaumblätter (@1)
-Jungle Tree Planks=Dschungelholzplanken
-Jungle Tree Planks Slab=Dschungelholzplatte
-Jungle Tree Planks Stair=Dschungelholztreppe
-Jungle Tree Sapling=Dschungelbaumsetzling
-Jungle Tree Trunk=Dschungelbaumstamm
-Jungle Tree Trunk Slab=Dschungelbaumstammplatte
-Jungle Tree Trunk Stair=Dschungelbaumstammtreppe
+Giant Sequoia Trunk Stair=Riesenmammutbaumstammstufe
+Jungle Tree=Tropenbaum
+Jungle Tree Fence=Tropenbaum-Zaun
+Jungle Tree Fence Gate=Tropenbaum-Tor
+Jungle Tree Fence Rail=Tropenbaum-Schiene
+Jungle Tree Leaves=Tropenbaumlaub
+Jungle Tree Leaves (@1)=Tropenbaumlaub (@1)
+Jungle Tree Planks=Tropenholzbretter
+Jungle Tree Planks Slab=Tropenholzplatte
+Jungle Tree Planks Stair=Tropenholzstufe
+Jungle Tree Sapling=Tropenbaumsetzling
+Jungle Tree Trunk=Tropenbaumstamm
+Jungle Tree Trunk Slab=Tropenbaumstammplatte
+Jungle Tree Trunk Stair=Tropenbaumstammstufe
 Oak Tree=Eiche
-Oak Tree Fence=Eichenholzzaun
-Oak Tree Fence Gate=Eichenholzzauntor
-Oak Tree Fence Rail=Eichenholzzaungeländer
-Oak Tree Leaves=Eichenblätter
-Oak Tree Planks=Eichenplanken
+Oak Tree Fence=Eichenholz-Zaun
+Oak Tree Fence Gate=Eichenholz-Tor
+Oak Tree Fence Rail=Eichenholz-Schiene
+Oak Tree Leaves=Eichenlaub
+Oak Tree Planks=Eichenbretter
 Oak Tree Planks Slab=Eichenholzplatte
-Oak Tree Planks Stair=Eichenholztreppe
+Oak Tree Planks Stair=Eichenholzstufe
 Oak Tree Sapling=Eichensetzling
 Oak Tree Trunk=Eichenstamm
 Oak Tree Trunk Slab=Eichenstammplatte
-Oak Tree Trunk Stair=Eichenstammtreppe
+Oak Tree Trunk Stair=Eichenstammstufe
 Palm Tree=Palme
-Palm Tree Fence=Palmholzzaun
-Palm Tree Fence Gate=Palmholzzauntor
-Palm Tree Fence Rail=Palmholzzaungeländer
-Palm Tree Leaves=Palmblätter
-Palm Tree Planks=Palmenplanken
-Palm Tree Planks Slab=Palmholzplatte
-Palm Tree Planks Stair=Palmholztreppe
+Palm Tree Fence=Plamenholz-Zaun
+Palm Tree Fence Gate=Plamenholz-Tor
+Palm Tree Fence Rail=Plamenholz-Schiene
+Palm Tree Leaves=Palmenlaub
+Palm Tree Planks=Palmenbretter
+Palm Tree Planks Slab=Plamenholzplatte
+Palm Tree Planks Stair=Plamenholzstufe
 Palm Tree Sapling=Palmensetzling
 Palm Tree Trunk=Palmenstamm
 Palm Tree Trunk Slab=Palmenstammplatte
-Palm Tree Trunk Stair=Palmenstammtreppe
+Palm Tree Trunk Stair=Palmenstammstufe
 Poplar Tree=Pappel
-Poplar Tree Fence=Pappelholzzaun
-Poplar Tree Fence Gate=Pappelholzzauntor
-Poplar Tree Fence Rail=Pappelholzzaungeländer
+Poplar Tree Fence=Pappelholz-Zaun
+Poplar Tree Fence Gate=Pappelholz-Tor
+Poplar Tree Fence Rail=Pappelholz-Schiene
 Poplar Tree Leaves=Pappelblätter
-Poplar Tree Planks=Pappelholzplanken
+Poplar Tree Planks=Pappelholzbretter
 Poplar Tree Planks Slab=Pappelholzsplatte
-Poplar Tree Planks Stair=Pappelholztreppe
+Poplar Tree Planks Stair=Pappelholzstufe
 Poplar Tree Sapling=Pappelsetzling
 Poplar Tree Trunk=Pappelstamm
 Poplar Tree Trunk Slab=Pappelstammplatte
-Poplar Tree Trunk Stair=Pappelstammtreppe
+Poplar Tree Trunk Stair=Pappelstammstufe
 Red=rot
 Rubber Tree=Gummibaum
-Rubber Tree Fence=Gummibaumzaun
-Rubber Tree Fence Gate=Gummibaumzauntor
-Rubber Tree Fence Rail=Gummibaumzaungeländer
-Rubber Tree Leaves=Gummibaumblätter
-Rubber Tree Planks=Gummibaumplanken
+Rubber Tree Fence=Gummibaum-Zaun
+Rubber Tree Fence Gate=Gummibaum-Tor
+Rubber Tree Fence Rail=Gummibaum-Schiene
+Rubber Tree Leaves=Gummibaumlaub
+Rubber Tree Planks=Gummibaumbretter
 Rubber Tree Planks Slab=Gummibaumplatte
-Rubber Tree Planks Stair=Gummibaumtreppe
+Rubber Tree Planks Stair=Gummibaumstufe
 Rubber Tree Sapling=Gummibaumsetzling
 Rubber Tree Trunk=Gummibaumstamm
 Rubber Tree Trunk (Empty)=Gummibaumstamm (leer)
 Rubber Tree Trunk Slab=Gummibaumstammplatte
-Rubber Tree Trunk Stair=Gummibaumstammtreppe
+Rubber Tree Trunk Stair=Gummibaumstammstufe
 Small poplar Tree Sapling=Kleiner Pappelsetzling
 Spruce Cone=Fichtenzapfen
 Spruce Tree=Fichte
-Spruce Tree Fence=Fichtenholzzaun
-Spruce Tree Fence Gate=Fichtenholzzaun
-Spruce Tree Fence Rail=Fichtenholzzaungeländer
+Spruce Tree Fence=Fichtenholz-Zaun
+Spruce Tree Fence Gate=Fichtenholz-Zaun
+Spruce Tree Fence Rail=Fichtenholz-Schiene
 Spruce Tree Leaves=Fichtennadeln
-Spruce Tree Planks=Fichtenplanken
+Spruce Tree Planks=Fichtenbretter
 Spruce Tree Planks Slab=Fichtenholzplatte
-Spruce Tree Planks Stair=Fichtenholztreppe
+Spruce Tree Planks Stair=Fichtenholzstufe
 Spruce Tree Sapling=Fichtensetzling
 Spruce Tree Trunk=Fichtenstamm
 Spruce Tree Trunk Slab=Fichtenstammplatte
-Spruce Tree Trunk Stair=Fichtenstammtreppe
+Spruce Tree Trunk Stair=Fichtenstammstufe
 Willow Tree=Weide
-Willow Tree Fence=Weidenholzzaun
-Willow Tree Fence Gate=Weidenholzzauntor
-Willow Tree Fence Rail=Weidenholzzaungeländer
-Willow Tree Leaves=Weidenblätter
-Willow Tree Planks=Weidenplanken
+Willow Tree Fence=Weidenholz-Zaun
+Willow Tree Fence Gate=Weidenholz-Tor
+Willow Tree Fence Rail=Weidenholz-Schiene
+Willow Tree Leaves=Weidenlaub
+Willow Tree Planks=Weidenbretter
 Willow Tree Planks Slab=Weidenholzplatte
-Willow Tree Planks Stair=Weidenholztreppe
+Willow Tree Planks Stair=Weidenholzstufe
 Willow Tree Sapling=Weidensetzling
 Willow Tree Trunk=Weidenstamm
 Willow Tree Trunk Slab=Weidenstammplatte
-Willow Tree Trunk Stair=Weidenstammtreppe
+Willow Tree Trunk Stair=Weidenstammstufe
 Yellow=gelb
-
-# init.lua
-Sapling=Setzling
-Tree=Baum
-Wooden Planks=Holzplanken
-Leaves=Blätter
-Wooden Fence=Holzzaun
-Wooden Fence Rail=Holzzaungeländer
-Wooden Fence Gate=Holzzauntor

locale/moretrees.es.tr

@@ -209,12 +209,3 @@ Willow Tree Trunk=Tronco de Árbol de Sauce
 Willow Tree Trunk Slab=Losa de Tronco de Árbol de Sauce
 Willow Tree Trunk Stair=Escalera de Tronco de Árbol de Sauce
 Yellow=Amarillo
-
-# init.lua
-Sapling=Retoño
-Tree=Árbol
-Wooden Planks=Tablones
-Leaves=Hojas
-Wooden Fence=Valla
-Wooden Fence Rail=Riel de Valla
-Wooden Fence Gate=Puerta de Valla

locale/moretrees.fr.tr

@@ -209,12 +209,3 @@ 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
-
-# init.lua
-Sapling=Jeune Arbre
-Tree=Arbre
-Wooden Planks=Planches
-Leaves=Feuilles
-Wooden Fence=Barrière en bois
-Wooden Fence Rail=Rail de clôture en bois
-Wooden Fence Gate=Porte de clôture en bois

locale/moretrees.ru.tr

@@ -1,219 +0,0 @@
-# textdomain: moretrees
-
-
-### cocos_palm.lua ###
-
-Coconut=Кокос
-Coconut Flower=Цветок кокоса
-
-### crafts.lua ###
-
-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 ###
-
-@1 (fast growth)=@1 (бестрый рост)
-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)=Листья тропического дерева (@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=желтые
-
-# init.lua
-Sapling=Саженец
-Tree=Дерево
-Wooden Planks=Деревянные доски
-Leaves=Листья
-Wooden Fence=Деревянный забор
-Wooden Fence Rail=Деревянные перила
-Wooden Fence Gate=Деревянные ворота

locale/template.txt

@@ -208,12 +208,3 @@ Willow Tree Trunk=
 Willow Tree Trunk Slab=
 Willow Tree Trunk Stair=
 Yellow=
-
-# init.lua
-Sapling=
-Tree=
-Wooden Planks=
-Leaves=
-Wooden Fence=
-Wooden Fence Rail=
-Wooden Fence Gate=

node_defs.lua

@@ -435,6 +435,7 @@ for i in ipairs(moretrees.treelist) do
 			tiles = {split_tn[2] and split_tn[2]=="small" and "moretrees_" .. treename .. "_sapling.png" or saptex},
 			inventory_image = split_tn[2] and split_tn[2]=="small" and "moretrees_" .. treename .. "_sapling.png" or saptex,
 			paramtype = "light",
+			paramtype2 = "waving",
 			walkable = false,
 			is_ground_content = true,
 			selection_box = {
@@ -493,6 +494,7 @@ for i in ipairs(moretrees.treelist) do
 		tiles = {split_tn[2] and split_tn[2]=="small" and "moretrees_" .. treename .. "_sapling.png" or saptex,},
 		inventory_image = split_tn[2] and split_tn[2]=="small" and "moretrees_" .. treename .. "_sapling.png" or saptex,
 		paramtype = "light",
+		paramtype2 = "waving",
 		walkable = false,
 		is_ground_content = true,
 		selection_box = {

tree_models.lua

@@ -261,7 +261,6 @@ moretrees.jungletree_model={
 	trunk_type=nil,
 	thin_branches=true,
 	fruit_chance=15,
-	fruit="vines:vine"
 }
 
 moretrees.fir_model={
@@ -269,7 +268,7 @@ moretrees.fir_model={
 	rules_a=nil,
 	rules_b=nil,
 	trunk="moretrees:fir_trunk",
-	leaves=nil,
+	leaves="moretrees:fir_leaves",
 	angle=45,
 	iterations=7,
 	random_level=5,