Merge remote-tracking branch 'upstream/master'

Revient au valeurs par défaut. Les paramètres seront lus depuis le
dossier du world.

biome_defs.lua

@@ -125,7 +125,10 @@ moretrees.willow_biome = {
 }
 
 moretrees.rubber_tree_biome = {
-	surface = "default:dirt_with_grass",
+	surface = {
+		"default:dirt_with_grass",
+		"default:sand",
+	},
 	avoid_nodes = moretrees.avoidnodes,
 	avoid_radius = 10,
 	seed_diff = 338,
@@ -177,7 +180,6 @@ 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,

locale/moretrees.de.tr

@@ -1,211 +1,211 @@
 # textdomain: moretrees
-# Translation by Xanthin and heavygale
+# Translation by Xanthin
 
 
 ### cocos_palm.lua ###
 
 Coconut=Kokosnuss
-Coconut Flower=Kokosnussblüte
+Coconut Flower=
 
 ### crafts.lua ###
 
 Acorn Muffin=Eichelmuffin
 Acorn Muffin batter=Eichelmuffinteig
 Coconut Milk=Kokosnussmilch
-Date=Dattel
+Date=
-Date & nut snack=Dattel & Nuss-Snack
+Date & nut snack=
-Date-nut cake=Dattelnusskuchen
+Date-nut cake=
-Date-nut cake batter=Dattelnuss-Kuchenteig
+Date-nut cake batter=
-Date-nut energy bar=Dattelnuss-Energieriegel
+Date-nut energy bar=
 Raw Coconut=Kokosnussfleisch
-Roasted Cedar Cone Nuts=Geröstete Zedernzapfenkerne
+Roasted Cedar Cone Nuts=
-Roasted Fir Cone Nuts=Geroestete Tannenzapfenkerne
+Roasted Fir Cone Nuts=Geroestete Tannenzapfen
-Roasted Spruce Cone Nuts=Geroestete Fichtenzapfenkerne
+Roasted Spruce Cone Nuts=Geroestete Fichtenzapfen
 
 ### date_palm.lua ###
 
-Date Flowers=Dattelblüten
+Date Flowers=
-Date Stem=Dattelstamm
+Date Stem=
-Dates=Datteln
+Dates=
 
 ### node_defs.lua ###
 
-@1 (fast growth)=@1 (schnelles Wachstum)
+@1 (fast growth)=
 Acorn=Eichel
-Apple Tree=Apfelbaum
+Apple Tree=
-Apple Tree Fence=Apfelbaum-Zaun
+Apple Tree Fence=
-Apple Tree Fence Gate=Apfelbaum-Tor
+Apple Tree Fence Gate=
-Apple Tree Fence Rail=Apfelbaum-Schiene
+Apple Tree Fence Rail=
 Apple Tree Leaves=Apfelbaumlaub
 Apple Tree Planks=Apfelbaumbretter
-Apple Tree Planks Slab=Apfelbaumplatte
+Apple Tree Planks Slab=
-Apple Tree Planks Stair=Apfelbaumstufe
+Apple Tree Planks Stair=
 Apple Tree Sapling=Apfelbaumsetzling
 Apple Tree Trunk=Apfelbaumstamm
-Apple Tree Trunk Slab=Apfelbaumstammplatte
+Apple Tree Trunk Slab=
-Apple Tree Trunk Stair=Apfelbaumstammstufe
+Apple Tree Trunk Stair=
-Beech Tree=Buche
+Beech Tree=
-Beech Tree Fence=Buchenholz-Zaun
+Beech Tree Fence=
-Beech Tree Fence Gate=Buchenholz-Tor
+Beech Tree Fence Gate=
-Beech Tree Fence Rail=Buchenholz-Schiene
+Beech Tree Fence Rail=
 Beech Tree Leaves=Buchenlaub
-Beech Tree Planks=Buchenholzbretter
+Beech Tree Planks=Buchebretter
-Beech Tree Planks Slab=Buchenholzplatte
+Beech Tree Planks Slab=
-Beech Tree Planks Stair=Buchenholzstufe 
+Beech Tree Planks Stair=
 Beech Tree Sapling=Buchesetzling
 Beech Tree Trunk=Buchenstamm
-Beech Tree Trunk Slab=Buchenstammplatte
+Beech Tree Trunk Slab=
-Beech Tree Trunk Stair=Buchenstammstufe
+Beech Tree Trunk Stair=
-Birch Tree=Birke
+Birch Tree=
-Birch Tree Fence=Birkenholz-Zaun
+Birch Tree Fence=
-Birch Tree Fence Gate=Birkenholz-Tor
+Birch Tree Fence Gate=
-Birch Tree Fence Rail=Birkenholz-Schiene
+Birch Tree Fence Rail=
 Birch Tree Leaves=Birkenlaub
 Birch Tree Planks=Birkebretter
-Birch Tree Planks Slab=Birkenholzplatte
+Birch Tree Planks Slab=
-Birch Tree Planks Stair=Birkeholzstufe
+Birch Tree Planks Stair=
 Birch Tree Sapling=Birkensetzling
 Birch Tree Trunk=Birkenstamm
-Birch Tree Trunk Slab=Birkenstammplatte
+Birch Tree Trunk Slab=
-Birch Tree Trunk Stair=Birkenstammstufe
+Birch Tree Trunk Stair=
-Cedar Cone=Zedernzapfen
+Cedar Cone=
-Cedar Tree=Zeder
+Cedar Tree=
-Cedar Tree Fence=Zedernholz-Zaun
+Cedar Tree Fence=
-Cedar Tree Fence Gate=Zedernholz-Tor
+Cedar Tree Fence Gate=
-Cedar Tree Fence Rail=Zedernholz-Schiene
+Cedar Tree Fence Rail=
-Cedar Tree Leaves=Zederblätter
+Cedar Tree Leaves=
-Cedar Tree Planks=Zedernholzbretter
+Cedar Tree Planks=
-Cedar Tree Planks Slab=Zedernholzplatte
+Cedar Tree Planks Slab=
-Cedar Tree Planks Stair=Zedernholzstufe
+Cedar Tree Planks Stair=
-Cedar Tree Sapling=Zedersetzling
+Cedar Tree Sapling=
-Cedar Tree Trunk=Zederstamm
+Cedar Tree Trunk=
-Cedar Tree Trunk Slab=Zederstammplatte
+Cedar Tree Trunk Slab=
-Cedar Tree Trunk Stair=Zederstamm Stufe
+Cedar Tree Trunk Stair=
-Date Palm Tree=Dattelpalme
+Date Palm Tree=
-Date Palm Tree Fence=Dattelpalmen-Zaun
+Date Palm Tree Fence=
-Date Palm Tree Fence Gate=Dattelpalmen-Tor
+Date Palm Tree Fence Gate=
-Date Palm Tree Fence Rail=Dattelpalmen-Schiene
+Date Palm Tree Fence Rail=
-Date Palm Tree Leaves=Dattelpalmenblätter
+Date Palm Tree Leaves=
-Date Palm Tree Planks=Dattelpalmenbretter
+Date Palm Tree Planks=
-Date Palm Tree Planks Slab=Dattelpalmenplatte
+Date Palm Tree Planks Slab=
-Date Palm Tree Planks Stair=Dattelpalmenstufe
+Date Palm Tree Planks Stair=
-Date Palm Tree Sapling=Dattelpalmensetzling
+Date Palm Tree Sapling=
-Date Palm Tree Trunk=Dattelpalmenstamm
+Date Palm Tree Trunk=
-Date Palm Tree Trunk Slab=Dattelpalmenstammplatte
+Date Palm Tree Trunk Slab=
-Date Palm Tree Trunk Stair=Dattelpalmenstammstufe
+Date Palm Tree Trunk Stair=
-Douglas Fir=Douglasie
+Douglas Fir=
-Douglas Fir Fence=Douglasien-Zaun
+Douglas Fir Fence=
-Douglas Fir Fence Gate=Douglasien-Tor
+Douglas Fir Fence Gate=
-Douglas Fir Fence Rail=Douglasien-Schiene
+Douglas Fir Fence Rail=
 Douglas Fir Leaves=Douglasiennadeln
 Douglas Fir Leaves (Bright)=Douglasiennadeln (breit)
 Douglas Fir Planks=Douglasienbretter
-Douglas Fir Planks Slab=Douglasienplatte
+Douglas Fir Planks Slab=
-Douglas Fir Planks Stair=Douglasienstufe
+Douglas Fir Planks Stair=
 Douglas Fir Sapling=Douglasiensetzling
 Douglas Fir Trunk=Douglasienstamm
-Douglas Fir Trunk Slab=Douglasienstammplatte
+Douglas Fir Trunk Slab=
-Douglas Fir Trunk Stair=Douglasienstammstufe
+Douglas Fir Trunk Stair=
 Fir Cone=Tannenzapfen
-Giant Sequoia=Riesenmammutbaum
+Giant Sequoia=
-Giant Sequoia Fence=Riesenmammutbaum-Zaun
+Giant Sequoia Fence=
-Giant Sequoia Fence Gate=Riesenmammutbaum-Tor
+Giant Sequoia Fence Gate=
-Giant Sequoia Fence Rail=Riesenmammutbaum-Schiene
+Giant Sequoia Fence Rail=
 Giant Sequoia Leaves=Riesenmammutbaumlaub
 Giant Sequoia Planks=Riesenmammutbaumbretter
-Giant Sequoia Planks Slab=Riesenmammutbaumplatte
+Giant Sequoia Planks Slab=
-Giant Sequoia Planks Stair=Riesenmammutbaumstufe
+Giant Sequoia Planks Stair=
 Giant Sequoia Sapling=Riesenmammutbaumsetzling
 Giant Sequoia Trunk=Riesenmammutbaumstamm
-Giant Sequoia Trunk Slab=Riesenmammutbaumstammplatte
+Giant Sequoia Trunk Slab=
-Giant Sequoia Trunk Stair=Riesenmammutbaumstammstufe
+Giant Sequoia Trunk Stair=
-Jungle Tree=Tropenbaum
+Jungle Tree=
-Jungle Tree Fence=Tropenbaum-Zaun
+Jungle Tree Fence=
-Jungle Tree Fence Gate=Tropenbaum-Tor
+Jungle Tree Fence Gate=
-Jungle Tree Fence Rail=Tropenbaum-Schiene
+Jungle Tree Fence Rail=
 Jungle Tree Leaves=Tropenbaumlaub
 Jungle Tree Leaves (@1)=Tropenbaumlaub (@1)
 Jungle Tree Planks=Tropenholzbretter
-Jungle Tree Planks Slab=Tropenholzplatte
+Jungle Tree Planks Slab=
-Jungle Tree Planks Stair=Tropenholzstufe
+Jungle Tree Planks Stair=
 Jungle Tree Sapling=Tropenbaumsetzling
 Jungle Tree Trunk=Tropenbaumstamm
-Jungle Tree Trunk Slab=Tropenbaumstammplatte
+Jungle Tree Trunk Slab=
-Jungle Tree Trunk Stair=Tropenbaumstammstufe
+Jungle Tree Trunk Stair=
-Oak Tree=Eiche
+Oak Tree=
-Oak Tree Fence=Eichenholz-Zaun
+Oak Tree Fence=
-Oak Tree Fence Gate=Eichenholz-Tor
+Oak Tree Fence Gate=
-Oak Tree Fence Rail=Eichenholz-Schiene
+Oak Tree Fence Rail=
 Oak Tree Leaves=Eichenlaub
 Oak Tree Planks=Eichenbretter
-Oak Tree Planks Slab=Eichenholzplatte
+Oak Tree Planks Slab=
-Oak Tree Planks Stair=Eichenholzstufe
+Oak Tree Planks Stair=
 Oak Tree Sapling=Eichensetzling
 Oak Tree Trunk=Eichenstamm
-Oak Tree Trunk Slab=Eichenstammplatte
+Oak Tree Trunk Slab=
-Oak Tree Trunk Stair=Eichenstammstufe
+Oak Tree Trunk Stair=
-Palm Tree=Palme
+Palm Tree=
-Palm Tree Fence=Plamenholz-Zaun
+Palm Tree Fence=
-Palm Tree Fence Gate=Plamenholz-Tor
+Palm Tree Fence Gate=
-Palm Tree Fence Rail=Plamenholz-Schiene
+Palm Tree Fence Rail=
 Palm Tree Leaves=Palmenlaub
 Palm Tree Planks=Palmenbretter
-Palm Tree Planks Slab=Plamenholzplatte
+Palm Tree Planks Slab=
-Palm Tree Planks Stair=Plamenholzstufe
+Palm Tree Planks Stair=
 Palm Tree Sapling=Palmensetzling
 Palm Tree Trunk=Palmenstamm
-Palm Tree Trunk Slab=Palmenstammplatte
+Palm Tree Trunk Slab=
-Palm Tree Trunk Stair=Palmenstammstufe
+Palm Tree Trunk Stair=
-Poplar Tree=Pappel
+Poplar Tree=
-Poplar Tree Fence=Pappelholz-Zaun
+Poplar Tree Fence=
-Poplar Tree Fence Gate=Pappelholz-Tor
+Poplar Tree Fence Gate=
-Poplar Tree Fence Rail=Pappelholz-Schiene
+Poplar Tree Fence Rail=
-Poplar Tree Leaves=Pappelblätter
+Poplar Tree Leaves=
-Poplar Tree Planks=Pappelholzbretter
+Poplar Tree Planks=
-Poplar Tree Planks Slab=Pappelholzsplatte
+Poplar Tree Planks Slab=
-Poplar Tree Planks Stair=Pappelholzstufe
+Poplar Tree Planks Stair=
-Poplar Tree Sapling=Pappelsetzling
+Poplar Tree Sapling=
-Poplar Tree Trunk=Pappelstamm
+Poplar Tree Trunk=
-Poplar Tree Trunk Slab=Pappelstammplatte
+Poplar Tree Trunk Slab=
-Poplar Tree Trunk Stair=Pappelstammstufe
+Poplar Tree Trunk Stair=
 Red=rot
-Rubber Tree=Gummibaum
+Rubber Tree=
-Rubber Tree Fence=Gummibaum-Zaun
+Rubber Tree Fence=
-Rubber Tree Fence Gate=Gummibaum-Tor
+Rubber Tree Fence Gate=
-Rubber Tree Fence Rail=Gummibaum-Schiene
+Rubber Tree Fence Rail=
 Rubber Tree Leaves=Gummibaumlaub
 Rubber Tree Planks=Gummibaumbretter
-Rubber Tree Planks Slab=Gummibaumplatte
+Rubber Tree Planks Slab=
-Rubber Tree Planks Stair=Gummibaumstufe
+Rubber Tree Planks Stair=
 Rubber Tree Sapling=Gummibaumsetzling
 Rubber Tree Trunk=Gummibaumstamm
 Rubber Tree Trunk (Empty)=Gummibaumstamm (leer)
-Rubber Tree Trunk Slab=Gummibaumstammplatte
+Rubber Tree Trunk Slab=
-Rubber Tree Trunk Stair=Gummibaumstammstufe
+Rubber Tree Trunk Stair=
-Small poplar Tree Sapling=Kleiner Pappelsetzling
+Small poplar Tree Sapling=
 Spruce Cone=Fichtenzapfen
-Spruce Tree=Fichte
+Spruce Tree=
-Spruce Tree Fence=Fichtenholz-Zaun
+Spruce Tree Fence=
-Spruce Tree Fence Gate=Fichtenholz-Zaun
+Spruce Tree Fence Gate=
-Spruce Tree Fence Rail=Fichtenholz-Schiene
+Spruce Tree Fence Rail=
 Spruce Tree Leaves=Fichtennadeln
 Spruce Tree Planks=Fichtenbretter
-Spruce Tree Planks Slab=Fichtenholzplatte
+Spruce Tree Planks Slab=
-Spruce Tree Planks Stair=Fichtenholzstufe
+Spruce Tree Planks Stair=
 Spruce Tree Sapling=Fichtensetzling
 Spruce Tree Trunk=Fichtenstamm
-Spruce Tree Trunk Slab=Fichtenstammplatte
+Spruce Tree Trunk Slab=
-Spruce Tree Trunk Stair=Fichtenstammstufe
+Spruce Tree Trunk Stair=
-Willow Tree=Weide
+Willow Tree=
-Willow Tree Fence=Weidenholz-Zaun
+Willow Tree Fence=
-Willow Tree Fence Gate=Weidenholz-Tor
+Willow Tree Fence Gate=
-Willow Tree Fence Rail=Weidenholz-Schiene
+Willow Tree Fence Rail=
 Willow Tree Leaves=Weidenlaub
 Willow Tree Planks=Weidenbretter
-Willow Tree Planks Slab=Weidenholzplatte
+Willow Tree Planks Slab=
-Willow Tree Planks Stair=Weidenholzstufe
+Willow Tree Planks Stair=
 Willow Tree Sapling=Weidensetzling
 Willow Tree Trunk=Weidenstamm
-Willow Tree Trunk Slab=Weidenstammplatte
+Willow Tree Trunk Slab=
-Willow Tree Trunk Stair=Weidenstammstufe
+Willow Tree Trunk Stair=
 Yellow=gelb

node_defs.lua

@@ -215,6 +215,7 @@ local dirs2 = { 12, 9, 18, 7, 12 }
 
 local moretrees_new_leaves_drawtype = "allfaces_optional"
 local moretrees_plantlike_leaves_visual_scale = 1
+local moretrees_new_leaves_waving = 1
 
 if moretrees.plantlike_leaves then
 	moretrees_new_leaves_drawtype = "plantlike"
@@ -322,12 +323,9 @@ for i in ipairs(moretrees.treelist) do
 		})
 
 		local moretrees_leaves_inventory_image = nil
-		local moretrees_new_leaves_waving = nil
 
 		if moretrees.plantlike_leaves then
 			moretrees_leaves_inventory_image = minetest.inventorycube("moretrees_"..treename.."_leaves.png")
-		else
-			moretrees_new_leaves_waving = 1
 		end
 
 		minetest.register_node("moretrees:"..treename.."_leaves", {
@@ -578,8 +576,6 @@ for color = 1, #jungleleaves do
 
 	if moretrees.plantlike_leaves then
 		moretrees_leaves_inventory_image = minetest.inventorycube("moretrees_jungletree_leaves_"..jungleleaves[color]..".png")
-	else
-		moretrees_new_leaves_waving = 1
 	end
 
 	minetest.register_node(leave_name, {
@@ -607,7 +603,8 @@ end
 -- we need our own copy of that node, which moretrees will match against.
 
 local jungle_tree = table.copy(minetest.registered_nodes["default:jungletree"])
-jungle_tree.drop = "default:jungletree"
+jungle_tree.drop = jungle_tree.drop or { items = {} }
+table.insert(jungle_tree.drop.items, { items = {"default:jungletree"}})
 minetest.register_node("moretrees:jungletree_trunk", jungle_tree)
 
 default.register_leafdecay({

saplings.lua

@@ -6,6 +6,9 @@
 local dirt_surfaces = {
 	set = true,
 	["default:dirt"] = true,
+	["default:dirt_with_snow"] = true,
+	["default:dry_dirt"] = true,
+	["default:dry_dirt_with_dry_grass"] = true,
 	["default:dirt_with_grass"] = true,
 	["default:dirt_with_dry_grass"] = true,
 	["default:dirt_with_coniferous_litter"] = true,
@@ -13,7 +16,8 @@ local dirt_surfaces = {
 	["woodsoils:dirt_with_leaves_1"] = true,
 	["woodsoils:dirt_with_leaves_2"] = true,
 	["woodsoils:grass_with_leaves_1"] = true,
-	["woodsoils:grass_with_leaves_2"] = true
+	["woodsoils:grass_with_leaves_2"] = true,
+	["meditteranean_biome:dirt_with_mediterranean_grass"] = true
 }
 
 local conifer_surfaces =  {
@@ -27,7 +31,8 @@ local conifer_surfaces =  {
 	["woodsoils:dirt_with_leaves_2"] = true,
 	["woodsoils:grass_with_leaves_1"] = true,
 	["woodsoils:grass_with_leaves_2"] = true,
-	["default:dirt_with_snow"] = true
+	["default:dirt_with_snow"] = true,
+	["meditteranean_biome:dirt_with_mediterranean_grass"] = true
 }
 
 local sand_surfaces = {
@@ -35,6 +40,7 @@ local sand_surfaces = {
 	["default:sand"] = true,
 	["default:desert_sand"] = true,
 	["cottages:loam"] = true,
+	["darkage:mud"] = true,
 	-- note, no silver sand here.
 	-- too cold for a palm, too... well... sandy for anything else.
 }
@@ -64,7 +70,7 @@ for i in ipairs(moretrees.treelist) do
 		grow_function = "moretrees.grow_"..treename
 	end
 
-	biome_lib.dbg(dump(moretrees[tree_biome].surface), 4)
+	biome_lib:dbg(dump(moretrees[tree_biome].surface))
 
 	biome_lib:grow_plants({
 		grow_delay = moretrees.sapling_interval,