Merge remote-tracking branch 'upstream/master' into nalc-1.2-dev

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

default_settings.txt

@@ -2,19 +2,19 @@
 
 -- Enable the various kinds of trees.
 
-moretrees.enable_apple_tree		= false
-moretrees.enable_oak			= false
-moretrees.enable_sequoia		= false
-moretrees.enable_palm			= false
-moretrees.enable_date_palm		= false
-moretrees.enable_cedar			= false
-moretrees.enable_rubber_tree	= false
-moretrees.enable_willow			= false
-moretrees.enable_birch			= false
-moretrees.enable_spruce			= false
-moretrees.enable_jungle_tree	= false
-moretrees.enable_fir			= false
-moretrees.enable_poplar			= false
+moretrees.enable_apple_tree		= true
+moretrees.enable_oak			= true
+moretrees.enable_sequoia		= true
+moretrees.enable_palm			= true
+moretrees.enable_date_palm		= true
+moretrees.enable_cedar			= true
+moretrees.enable_rubber_tree	= true
+moretrees.enable_willow			= true
+moretrees.enable_birch			= true
+moretrees.enable_spruce			= true
+moretrees.enable_jungle_tree	= true
+moretrees.enable_fir			= true
+moretrees.enable_poplar			= true
 moretrees.enable_beech			= false
 
 -- set this to true to make moretrees spawn saplings at mapgen time instead
@@ -32,13 +32,13 @@ moretrees.enable_stairs			= true
 
 -- If this variable is set to true, register fences for moretrees wood
 
-moretrees.enable_fences         = true
+moretrees.enable_fences         = false
 
 -- Set this to true if you want the plantlike drawtype for leaves, which
 -- improves some peoples' framerates without resorting to making leaf nodes opaque.
 -- Affects default leaves and default jungle leaves also.
 
-moretrees.plantlike_leaves		= true
+moretrees.plantlike_leaves		= false
 
 -- Enable this if you want moretrees to redefine default apples so that they
 -- fall when leaves decay/are dug.

mod.conf

@@ -1,3 +1,4 @@
 name = moretrees
 depends = default, biome_lib, vessels
 optional_depends = doors, stairs, moreblocks, intllib, farming
+min_minetest_version = 5.2.0

node_defs.lua

@@ -26,6 +26,7 @@ local dirs3 = { 14, 11, 16, 5, 14 }
 
 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"
@@ -134,12 +135,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", {
@@ -390,8 +388,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, {

saplings.lua

@@ -40,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.
 }