Merge remote-tracking branch 'upstream/master'

fixes #6

biome_defs.lua

@@ -180,6 +180,7 @@ moretrees.cedar_biome = {
 	avoid_nodes = moretrees.avoidnodes,
 	avoid_radius = 10,
 	seed_diff = 336,
+	min_elevation = 0,  --Added to solve an issue where cedar trees would sometimes spawn deep underground
 	near_nodes = {"default:water_source"},
 	near_nodes_size = 15,
 	near_nodes_count = 5,

default_settings.txt

@@ -55,6 +55,7 @@ moretrees.leafdecay_delay		= 2
 moretrees.leafdecay_chance		= 5
 moretrees.leafdecay_radius		= 5
 moretrees.palm_leafdecay_radius		= 10
+moretrees.date_palm_leafdecay_radius	= 14
 
 -- Change these settings if you want default trees to be gradually cut down
 -- above the elevation where firs normally generate.

locale/moretrees.de.tr

@@ -1,211 +1,211 @@
 # textdomain: moretrees
-# Translation by Xanthin
+# Translation by Xanthin and heavygale
 
 
 ### cocos_palm.lua ###
 
 Coconut=Kokosnuss
-Coconut Flower=
+Coconut Flower=Kokosnussblüte
 
 ### 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=
+Date=Dattel
+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=
-Roasted Fir Cone Nuts=Geroestete Tannenzapfen
-Roasted Spruce Cone Nuts=Geroestete Fichtenzapfen
+Roasted Cedar Cone Nuts=Geröstete Zedernzapfenkerne
+Roasted Fir Cone Nuts=Geroestete Tannenzapfenkerne
+Roasted Spruce Cone Nuts=Geroestete Fichtenzapfenkerne
 
 ### date_palm.lua ###
 
-Date Flowers=
-Date Stem=
-Dates=
+Date Flowers=Dattelblüten
+Date Stem=Dattelstamm
+Dates=Datteln
 
 ### node_defs.lua ###
 
-@1 (fast growth)=
+@1 (fast growth)=@1 (schnelles Wachstum)
 Acorn=Eichel
-Apple Tree=
-Apple Tree Fence=
-Apple Tree Fence Gate=
-Apple Tree Fence Rail=
+Apple Tree=Apfelbaum
+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=
-Apple Tree Planks Stair=
+Apple Tree Planks Slab=Apfelbaumplatte
+Apple Tree Planks Stair=Apfelbaumstufe
 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=
+Apple Tree Trunk Slab=Apfelbaumstammplatte
+Apple Tree Trunk Stair=Apfelbaumstammstufe
+Beech Tree=Buche
+Beech Tree Fence=Buchenholz-Zaun
+Beech Tree Fence Gate=Buchenholz-Tor
+Beech Tree Fence Rail=Buchenholz-Schiene
 Beech Tree Leaves=Buchenlaub
-Beech Tree Planks=Buchebretter
-Beech Tree Planks Slab=
-Beech Tree Planks Stair=
+Beech Tree Planks=Buchenholzbretter
+Beech Tree Planks Slab=Buchenholzplatte
+Beech Tree Planks Stair=Buchenholzstufe 
 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=
+Beech Tree Trunk Slab=Buchenstammplatte
+Beech Tree Trunk Stair=Buchenstammstufe
+Birch Tree=Birke
+Birch Tree Fence=Birkenholz-Zaun
+Birch Tree Fence Gate=Birkenholz-Tor
+Birch Tree Fence Rail=Birkenholz-Schiene
 Birch Tree Leaves=Birkenlaub
 Birch Tree Planks=Birkebretter
-Birch Tree Planks Slab=
-Birch Tree Planks Stair=
+Birch Tree Planks Slab=Birkenholzplatte
+Birch Tree Planks Stair=Birkeholzstufe
 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=
+Birch Tree Trunk Slab=Birkenstammplatte
+Birch Tree Trunk Stair=Birkenstammstufe
+Cedar Cone=Zedernzapfen
+Cedar Tree=Zeder
+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=Zedernholzbretter
+Cedar Tree Planks Slab=Zedernholzplatte
+Cedar Tree Planks Stair=Zedernholzstufe
+Cedar Tree Sapling=Zedersetzling
+Cedar Tree Trunk=Zederstamm
+Cedar Tree Trunk Slab=Zederstammplatte
+Cedar Tree Trunk Stair=Zederstamm Stufe
+Date Palm Tree=Dattelpalme
+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=Dattelpalmenstufe
+Date Palm Tree Sapling=Dattelpalmensetzling
+Date Palm Tree Trunk=Dattelpalmenstamm
+Date Palm Tree Trunk Slab=Dattelpalmenstammplatte
+Date Palm Tree Trunk Stair=Dattelpalmenstammstufe
+Douglas Fir=Douglasie
+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 (breit)
 Douglas Fir Planks=Douglasienbretter
-Douglas Fir Planks Slab=
-Douglas Fir Planks Stair=
+Douglas Fir Planks Slab=Douglasienplatte
+Douglas Fir Planks Stair=Douglasienstufe
 Douglas Fir Sapling=Douglasiensetzling
 Douglas Fir Trunk=Douglasienstamm
-Douglas Fir Trunk Slab=
-Douglas Fir Trunk Stair=
+Douglas Fir Trunk Slab=Douglasienstammplatte
+Douglas Fir Trunk Stair=Douglasienstammstufe
 Fir Cone=Tannenzapfen
-Giant Sequoia=
-Giant Sequoia Fence=
-Giant Sequoia Fence Gate=
-Giant Sequoia Fence Rail=
+Giant Sequoia=Riesenmammutbaum
+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=
-Giant Sequoia Planks Stair=
+Giant Sequoia Planks Slab=Riesenmammutbaumplatte
+Giant Sequoia Planks Stair=Riesenmammutbaumstufe
 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=
+Giant Sequoia Trunk Slab=Riesenmammutbaumstammplatte
+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=
-Jungle Tree Planks Stair=
+Jungle Tree Planks Slab=Tropenholzplatte
+Jungle Tree Planks Stair=Tropenholzstufe
 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=
+Jungle Tree Trunk Slab=Tropenbaumstammplatte
+Jungle Tree Trunk Stair=Tropenbaumstammstufe
+Oak Tree=Eiche
+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=
-Oak Tree Planks Stair=
+Oak Tree Planks Slab=Eichenholzplatte
+Oak Tree Planks Stair=Eichenholzstufe
 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=
+Oak Tree Trunk Slab=Eichenstammplatte
+Oak Tree Trunk Stair=Eichenstammstufe
+Palm Tree=Palme
+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=
-Palm Tree Planks Stair=
+Palm Tree Planks Slab=Plamenholzplatte
+Palm Tree Planks Stair=Plamenholzstufe
 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=
+Palm Tree Trunk Slab=Palmenstammplatte
+Palm Tree Trunk Stair=Palmenstammstufe
+Poplar Tree=Pappel
+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=Pappelholzbretter
+Poplar Tree Planks Slab=Pappelholzsplatte
+Poplar Tree Planks Stair=Pappelholzstufe
+Poplar Tree Sapling=Pappelsetzling
+Poplar Tree Trunk=Pappelstamm
+Poplar Tree Trunk Slab=Pappelstammplatte
+Poplar Tree Trunk Stair=Pappelstammstufe
 Red=rot
-Rubber Tree=
-Rubber Tree Fence=
-Rubber Tree Fence Gate=
-Rubber Tree Fence Rail=
+Rubber Tree=Gummibaum
+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=
-Rubber Tree Planks Stair=
+Rubber Tree Planks Slab=Gummibaumplatte
+Rubber Tree Planks Stair=Gummibaumstufe
 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=
+Rubber Tree Trunk Slab=Gummibaumstammplatte
+Rubber Tree Trunk Stair=Gummibaumstammstufe
+Small poplar Tree Sapling=Kleiner Pappelsetzling
 Spruce Cone=Fichtenzapfen
-Spruce Tree=
-Spruce Tree Fence=
-Spruce Tree Fence Gate=
-Spruce Tree Fence Rail=
+Spruce Tree=Fichte
+Spruce Tree Fence=Fichtenholz-Zaun
+Spruce Tree Fence Gate=Fichtenholz-Zaun
+Spruce Tree Fence Rail=Fichtenholz-Schiene
 Spruce Tree Leaves=Fichtennadeln
 Spruce Tree Planks=Fichtenbretter
-Spruce Tree Planks Slab=
-Spruce Tree Planks Stair=
+Spruce Tree Planks Slab=Fichtenholzplatte
+Spruce Tree Planks Stair=Fichtenholzstufe
 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=
+Spruce Tree Trunk Slab=Fichtenstammplatte
+Spruce Tree Trunk Stair=Fichtenstammstufe
+Willow Tree=Weide
+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=
-Willow Tree Planks Stair=
+Willow Tree Planks Slab=Weidenholzplatte
+Willow Tree Planks Stair=Weidenholzstufe
 Willow Tree Sapling=Weidensetzling
 Willow Tree Trunk=Weidenstamm
-Willow Tree Trunk Slab=
-Willow Tree Trunk Stair=
+Willow Tree Trunk Slab=Weidenstammplatte
+Willow Tree Trunk Stair=Weidenstammstufe
 Yellow=gelb

node_defs.lua

@@ -262,7 +262,7 @@ for i in ipairs(moretrees.treelist) do
 		droprarity = 20
 		decay = moretrees.palm_leafdecay_radius
 	elseif treename == "date_palm" then
-		decay = moretrees.palm_leafdecay_radius
+		decay = moretrees.date_palm_leafdecay_radius
 	end
 
 	if treename ~= "jungletree"  -- the default game provides jungle tree and pine trunk/planks nodes.

saplings.lua

@@ -70,7 +70,7 @@ for i in ipairs(moretrees.treelist) do
 		grow_function = "moretrees.grow_"..treename
 	end
 
-	biome_lib:dbg(dump(moretrees[tree_biome].surface))
+	biome_lib.dbg(dump(moretrees[tree_biome].surface), 4)
 
 	biome_lib:grow_plants({
 		grow_delay = moretrees.sapling_interval,

tree_models.lua

@@ -146,7 +146,7 @@ moretrees.palm_model={
 -- So, a generic fruit trunk is spawned. An ABM will convert it to a male
 -- or female fruit trunk, and generate the actual dates.
 moretrees.date_palm_model={
-	axiom="TTTTddddddddddccccccccccRT[TGGGGT]"..
+	axiom="TTTTddddddddddccccccccccRT[TTT]"..
 		"ccccc[&&a]ccccc[&&a]ccccc[&&a]ccccc[&&a]ccccc[&&a]ccccc[&&a]"..
 		"GGccccc[&a]ccccc[&a]ccccc[&a]ccccc[&a]ccccc[&a]ccccc[&a]"..
 		"GGccccc[a]ccccc[a]ccccc[a]ccccc[a]ccccc[a]ccccc[a]",