Merge branch 'master' of https://github.com/minetest-mods/moretrees

1 files changed, 25 insertions, 4 deletions

diff --git a/init.lua b/init.lua
index d2c5128..8189ffd 100644
--- a/init.lua
+++ b/init.lua
@@ -73,6 +73,8 @@ moretrees.cutting_tools = {
 
 dofile(modpath.."/tree_models.lua")
 dofile(modpath.."/node_defs.lua")
+dofile(modpath.."/date_palm.lua")
+dofile(modpath.."/cocos_palm.lua")
 dofile(modpath.."/biome_defs.lua")
 dofile(modpath.."/saplings.lua")
 dofile(modpath.."/crafts.lua")
@@ -85,7 +87,8 @@ if moretrees.spawn_saplings then
 	moretrees.spawn_oak_object = "moretrees:oak_sapling_ongen"
 	moretrees.spawn_sequoia_object = "moretrees:sequoia_sapling_ongen"
 	moretrees.spawn_palm_object = "moretrees:palm_sapling_ongen"
-	moretrees.spawn_pine_object = "moretrees:pine_sapling_ongen"
+	moretrees.spawn_date_palm_object = "moretrees:date_palm_sapling_ongen"
+	moretrees.spawn_cedar_object = "moretrees:cedar_sapling_ongen"
 	moretrees.spawn_rubber_tree_object = "moretrees:rubber_tree_sapling_ongen"
 	moretrees.spawn_willow_object = "moretrees:willow_sapling_ongen"
 	moretrees.spawn_acacia_object = "moretrees:acacia_sapling_ongen"
@@ -94,13 +97,16 @@ if moretrees.spawn_saplings then
 	moretrees.spawn_jungletree_object = "moretrees:jungletree_sapling_ongen"
 	moretrees.spawn_fir_object = "moretrees:fir_sapling_ongen"
 	moretrees.spawn_fir_snow_object = "snow:sapling_pine"
+	moretrees.spawn_poplar_object = "moretrees:poplar_sapling_ongen"
+	moretrees.spawn_poplar_small_object = "moretrees:poplar_small_sapling_ongen"
 else
 	moretrees.spawn_beech_object = moretrees.beech_model
 	moretrees.spawn_apple_tree_object = moretrees.apple_tree_model
 	moretrees.spawn_oak_object = moretrees.oak_model
 	moretrees.spawn_sequoia_object = moretrees.sequoia_model
 	moretrees.spawn_palm_object = moretrees.palm_model
-	moretrees.spawn_pine_object = moretrees.pine_model
+	moretrees.spawn_date_palm_object = moretrees.date_palm_model
+	moretrees.spawn_cedar_object = moretrees.cedar_model
 	moretrees.spawn_rubber_tree_object = moretrees.rubber_tree_model
 	moretrees.spawn_willow_object = moretrees.willow_model
 	moretrees.spawn_acacia_object = moretrees.acacia_model
@@ -109,6 +115,8 @@ else
 	moretrees.spawn_jungletree_object = "moretrees.grow_jungletree"
 	moretrees.spawn_fir_object = "moretrees.grow_fir"
 	moretrees.spawn_fir_snow_object = "moretrees.grow_fir_snow"
+	moretrees.spawn_poplar_object = moretrees.poplar_model
+	moretrees.spawn_poplar_small_object = moretrees.poplar_small_model
 end
 
 if moretrees.enable_beech then
@@ -131,8 +139,13 @@ if moretrees.enable_palm then
 	biome_lib:register_generate_plant(moretrees.palm_biome, moretrees.spawn_palm_object)
 end
 
-if moretrees.enable_pine then
-	biome_lib:register_generate_plant(moretrees.pine_biome, moretrees.spawn_pine_object)
+if moretrees.enable_date_palm then
+	biome_lib:register_generate_plant(moretrees.date_palm_biome, moretrees.spawn_date_palm_object)
+	biome_lib:register_generate_plant(moretrees.date_palm_biome_2, moretrees.spawn_date_palm_object)
+end
+
+if moretrees.enable_cedar then
+	biome_lib:register_generate_plant(moretrees.cedar_biome, moretrees.spawn_cedar_object)
 end
 
 if moretrees.enable_rubber_tree then
@@ -166,6 +179,14 @@ if moretrees.enable_fir then
 	end
 end
 
+if moretrees.enable_poplar then
+	biome_lib:register_generate_plant(moretrees.poplar_biome, moretrees.spawn_poplar_object)
+	biome_lib:register_generate_plant(moretrees.poplar_biome_2, moretrees.spawn_poplar_object)
+	biome_lib:register_generate_plant(moretrees.poplar_biome_3, moretrees.spawn_poplar_object)
+	biome_lib:register_generate_plant(moretrees.poplar_small_biome, moretrees.spawn_poplar_small_object)
+	biome_lib:register_generate_plant(moretrees.poplar_small_biome_2, moretrees.spawn_poplar_small_object)
+end
+
 -- Code to spawn a birch tree
 
 function moretrees.grow_birch(pos)