16 files changed, 347 insertions, 2 deletions
diff --git a/moretrees/LICENSE b/moretrees/LICENSE
index 7cffc99..ecc5c14 100644
--- a/moretrees/LICENSE
+++ b/moretrees/LICENSE
@@ -7,13 +7,14 @@ All source code:
 Date & cocos palm code (date_palm.lua, cocos_palm.lua)
 	© 2016, Rogier <rogier777@gmail.com>
 	Published under the terms and conditions of the WTFPL.
-All date & date palm textures, date-based food, cocos flower & green coconuts:
+All date & date palm textures, date-based food, cocos flower & green coconuts,
+and all poplar textures:
 	© 2016, Rogier <rogier777@gmail.com>
 	Published under the terms and conditions of CC-BY-SA-3.0 Unported.
 	- Three of the date palm textures are modifications of existing moretrees textures
 	- The green coconuts are a modification of the brown coconut
 	- The date cake batter is a modification of the acorn muffin batter
-All sapling textures (textures/*_sapling.png):
+All other sapling textures (textures/*_sapling.png):
 	© 2013, Tim Huppertz <mitroman@naturalnet.de>
 	Published under the terms and conditions of CC-BY-SA-3.0 Unported.
 All other textures:
diff --git a/moretrees/biome_defs.lua b/moretrees/biome_defs.lua
index 46228f5..463f4b8 100644
--- a/moretrees/biome_defs.lua
+++ b/moretrees/biome_defs.lua
@@ -196,6 +196,97 @@ moretrees.cedar_biome = {
 	max_count = 10,
 }
 
+
+-- Poplar requires a lot of water.
+moretrees.poplar_biome = {
+	surface = "default:dirt_with_grass",
+	avoid_nodes = moretrees.avoidnodes,
+	avoid_radius = 6,
+	seed_diff = 341,
+	min_elevation = 0,
+	max_elevation = 50,
+	near_nodes = {"default:water_source"},
+	near_nodes_size = 15,
+	near_nodes_vertical = 5,
+	near_nodes_count = 1,
+	humidity_min = -0.7,
+	humidity_max = -1,
+	rarity = 50,
+	max_count = 15,
+}
+
+-- The humidity requirement it quite restrictive (apparently).
+-- Spawn an occasional poplar elsewhere.
+moretrees.poplar_biome_2 = {
+	surface = "default:dirt_with_grass",
+	avoid_nodes = moretrees.avoidnodes,
+	avoid_radius = 6,
+	seed_diff = 341,
+	min_elevation = 0,
+	max_elevation = 50,
+	near_nodes = {"default:water_source"},
+	near_nodes_size = 15,
+	near_nodes_vertical = 4,
+	near_nodes_count = 10,
+	humidity_min = 0.1,
+	humidity_max = -0.6,
+	rarity = 50,
+	max_count = 1,
+}
+
+-- Subterranean lakes provide enough water for poplars to grow
+moretrees.poplar_biome_3 = {
+	surface = "default:dirt_with_grass",
+	avoid_nodes = moretrees.avoidnodes,
+	avoid_radius = 6,
+	seed_diff = 342,
+	min_elevation = 0,
+	max_elevation = 50,
+	near_nodes = {"default:water_source"},
+	near_nodes_size = 1,
+	near_nodes_vertical = 25,
+	near_nodes_count = 1,
+	humidity_min = -0.5,
+	humidity_max = -1,
+	rarity = 0,
+	max_count = 30,
+}
+
+moretrees.poplar_small_biome = {
+	surface = "default:dirt_with_grass",
+	avoid_nodes = moretrees.avoidnodes,
+	avoid_radius = 4,
+	seed_diff = 343,
+	min_elevation = 0,
+	max_elevation = 50,
+	near_nodes = {"default:water_source"},
+	near_nodes_size = 10,
+	near_nodes_vertical = 5,
+	near_nodes_count = 1,
+	humidity_min = -0.7,
+	humidity_max = -1,
+	rarity = 50,
+	max_count = 10,
+}
+
+moretrees.poplar_small_biome_2 = {
+	surface = "default:dirt_with_grass",
+	avoid_nodes = moretrees.avoidnodes,
+	avoid_radius = 4,
+	seed_diff = 343,
+	min_elevation = 0,
+	max_elevation = 50,
+	near_nodes = {"default:water_source"},
+	near_nodes_size = 10,
+	near_nodes_vertical = 4,
+	near_nodes_count = 5,
+	humidity_min = 0.1,
+	humidity_max = -0.6,
+	rarity = 50,
+	max_count = 3,
+}
+
+
 moretrees.fir_biome = {
 	surface = "default:dirt_with_grass",
 	avoid_nodes = moretrees.avoidnodes,
diff --git a/moretrees/default_settings.txt b/moretrees/default_settings.txt
index 0a5fc88..257baec 100644
--- a/moretrees/default_settings.txt
+++ b/moretrees/default_settings.txt
@@ -15,6 +15,7 @@ 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
diff --git a/moretrees/init.lua b/moretrees/init.lua
index 2c50fd9..8189ffd 100644
--- a/moretrees/init.lua
+++ b/moretrees/init.lua
@@ -97,6 +97,8 @@ 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
@@ -113,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
@@ -175,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)
diff --git a/moretrees/node_defs.lua b/moretrees/node_defs.lua
index b1df5f7..1c0796b 100644
--- a/moretrees/node_defs.lua
+++ b/moretrees/node_defs.lua
@@ -12,6 +12,8 @@ moretrees.treelist = {
 	{"date_palm",		"Date Palm Tree",	"date_palm_fruit_trunk",	"Date Palm Tree",		{0, 0, 0, 0, 0, 0},	0.0 },
 	{"spruce",		"Spruce Tree",		"spruce_cone",	"Spruce Cone",	{-0.2, -0.5, -0.2, 0.2, 0, 0.2},	0.8 },
 	{"cedar",		"Cedar Tree",		"cedar_cone",	"Cedar Cone",	{-0.2, -0.5, -0.2, 0.2, 0, 0.2}, 0.8 },
+	{"poplar",		"Poplar Tree"},
+	{"poplar_small",	"Poplar Tree"},
 	{"willow",		"Willow Tree"},
 	{"rubber_tree",	"Rubber Tree"},
 	{"fir",			"Douglas Fir",		"fir_cone",		"Fir Cone",		{-0.2, -0.5, -0.2, 0.2, 0, 0.2},	0.8 },
@@ -72,6 +74,7 @@ for i in ipairs(moretrees.treelist) do
 
 	if treename ~= "jungletree"  -- the default game provides jungle tree, acacia, and pine trunk/planks nodes.
 		and treename ~= "acacia"
+		and treename ~= "poplar_small"
 		and treename ~= "pine" then
 
 		saptex = "moretrees_"..treename.."_sapling.png"
@@ -273,6 +276,43 @@ for i in ipairs(moretrees.treelist) do
 	end
 end
 
+-- Add small poplar saplings
+
+local poplar_sapling = minetest.registered_nodes["moretrees:poplar_sapling"]
+local poplar_sapling_ongen = minetest.registered_nodes["moretrees:poplar_sapling_ongen"]
+local poplar_small_sapling = {}
+local poplar_small_sapling_ongen = {}
+for k,v in pairs(poplar_sapling) do
+	poplar_small_sapling[k] = v
+end
+for k,v in pairs(poplar_sapling_ongen) do
+	poplar_small_sapling_ongen[k] = v
+end
+poplar_small_sapling.tiles = {"moretrees_poplar_small_sapling.png"}
+poplar_small_sapling.inventory_image = "moretrees_poplar_small_sapling.png"
+poplar_small_sapling_ongen.tiles_ongen = {"moretrees_poplar_small_sapling.png"}
+poplar_small_sapling_ongen.inventory_image_ongen = "moretrees_poplar_small_sapling.png"
+poplar_small_sapling_ongen.drop = "moretrees:poplar_small_sapling"
+minetest.register_node("moretrees:poplar_small_sapling", poplar_small_sapling)
+minetest.register_node("moretrees:poplar_small_sapling_ongen", poplar_small_sapling_ongen)
+if moretrees.spawn_saplings then
+	table.insert(moretrees.avoidnodes, "moretrees:poplar_sapling")
+	table.insert(moretrees.avoidnodes, "moretrees:poplar_small_sapling_ongen")
+end
+
+local poplar_leaves_drop = minetest.registered_nodes["moretrees:poplar_leaves"].drop
+minetest.override_item("moretrees:poplar_leaves", {
+	drop = {
+		max_items = poplar_leaves_drop.maxitems,
+		items = {
+			{items = {"moretrees:poplar_sapling"}, rarity = 1.33 * poplar_leaves_drop.items[1].rarity },
+			{items = {"moretrees:poplar_small_sapling"}, rarity = 1.33 * poplar_leaves_drop.items[1].rarity },
+			{items = {"moretrees:poplar_leaves"} }
+		}
+	}
+})
+
+
 -- Extra nodes for jungle trees:
 
 local jungleleaves = {"yellow","red"}
diff --git a/moretrees/screenshot.lua b/moretrees/screenshot.lua
new file mode 100644
index 0000000..cb2ad7a
--- /dev/null
+++ b/moretrees/screenshot.lua
@@ -0,0 +1,168 @@
+-- Usage:
+-- - Create a new world
+-- - Set world mapgen: v6
+-- - Set world seed: 2625051331357512570
+-- - Enable the moretrees mod
+-- - Edit the moretrees source
+--   - Disable all trees in default_settings.lua
+--   - Recommended: make saplings grow fast in default_settings.lua:
+--     sapling_interval = 5
+--     sapling_chance = 1
+--   - Apply the patch below to moretrees
+--     (so that jungle trees are always large, and differently-colored):
+--     use 'git apply --ignore-space-change'
+--   - Make sure this file (you are reading) will be loaded when minetest starts !
+--     (e.g. add 'dofile(modpath.."/screenshot.lua")' to init.lua)
+-- - Start minetest
+-- - Goto 700,y,-280 (approximately)
+-- - Make sure the world is loaded between x = 650 .. 780 and z = -350 .. -180
+-- - Give the chat command '/make-scene'
+-- - Wait & walk/fly around until all trees have grown
+-- - goto the platform at 780, 30, -277
+-- - Set the viewing range to 300, with fog enabled
+-- - Take a screenshot.
+
+-- Patch to apply to moretrees
+--[[
+diff --git a/init.lua b/init.lua
+index 8189ffd..afd4644 100644
+--- a/init.lua
++++ b/init.lua
+@@ -225,9 +225,12 @@ moretrees.ct_rules_b1 = "[-FBf][+FBf]"
+ moretrees.ct_rules_a2 = "FF[FF][&&-FBF][&&+FBF][&&---FBF][&&+++FBF]F/A"
+ moretrees.ct_rules_b2 = "[-fB][+fB]"
+ 
++local jleaves = 1
+ function moretrees.grow_jungletree(pos)
+        local r1 = math.random(2)
+        local r2 = math.random(3)
++       r1 = jleaves
++       jleaves = jleaves % 2 + 1
+        if r1 == 1 then
+                moretrees.jungletree_model.leaves2 = "moretrees:jungletree_leaves_red"
+        else 
+@@ -235,6 +238,7 @@ function moretrees.grow_jungletree(pos)
+        end
+        moretrees.jungletree_model.leaves2_chance = math.random(25, 75)
+ 
++       r2=3
+        if r2 == 1 then
+                moretrees.jungletree_model.trunk_type = "single"
+                moretrees.jungletree_model.iterations = 2
+]]
+
+
+minetest.register_chatcommand("make-scene", {
+	func = function()
+		minetest.place_node({x=780, y=30, z=-277}, {name="default:obsidian"})
+		minetest.place_node({x=780, y=30, z=-278}, {name="default:obsidian"})
+		minetest.place_node({x=781, y=30, z=-277}, {name="default:obsidian"})
+		minetest.place_node({x=781, y=30, z=-278}, {name="default:obsidian"})
+		minetest.place_node({x=781, y=30, z=-276}, {name="default:obsidian"})
+		minetest.place_node({x=780, y=30, z=-276}, {name="default:obsidian"})
+
+		for z = -360, -300 do
+			dy=2
+			for x = 630 + (-z - 360)/3, 660 + (-z - 300)/3 do
+				for y = 5, 22 do
+					minetest.place_node({x=x, y=y, z=z}, {name="default:desert_stone"})
+				end
+				for y = 23, 25 + dy do
+					minetest.place_node({x=x, y=y, z=z}, {name="default:desert_sand"})
+				end
+				dy = 0
+			end
+		end
+
+		minetest.place_node({x=717, y=2, z=-298}, {name = "moretrees:palm_sapling"})
+		minetest.place_node({x=713, y=2, z=-302}, {name = "moretrees:palm_sapling"})
+		minetest.place_node({x=713, y=2, z=-307}, {name = "moretrees:palm_sapling"})
+		minetest.place_node({x=717, y=2, z=-318}, {name = "moretrees:palm_sapling"})
+		minetest.place_node({x=723, y=2, z=-320}, {name = "moretrees:palm_sapling"})
+
+		minetest.place_node({x=645, y=26, z=-314}, {name="moretrees:date_palm_sapling"})
+		minetest.place_node({x=653, y=26, z=-322}, {name="moretrees:date_palm_sapling"})
+		minetest.place_node({x=649, y=26, z=-334}, {name="moretrees:date_palm_sapling"})
+		minetest.place_node({x=662, y=26, z=-342}, {name="moretrees:date_palm_sapling"})
+
+		minetest.place_node({x=672, y=5, z=-305}, {name="moretrees:oak_sapling"})
+		minetest.place_node({x=690, y=6, z=-322}, {name="moretrees:oak_sapling"})
+		minetest.place_node({x=695, y=7, z=-335}, {name="moretrees:oak_sapling"})
+		minetest.place_node({x=699, y=4, z=-301}, {name="moretrees:oak_sapling"})
+
+		minetest.place_node({x=751, y=5, z=-254}, {name="moretrees:apple_tree_sapling"})
+		minetest.place_node({x=729, y=3, z=-275}, {name="moretrees:apple_tree_sapling"})
+		minetest.place_node({x=747, y=4, z=-270}, {name="moretrees:apple_tree_sapling"})
+
+		minetest.place_node({x=671, y=5, z=-283}, {name="default:junglesapling"})
+		minetest.place_node({x=680, y=4, z=-287}, {name="default:junglesapling"})
+		minetest.place_node({x=702, y=4, z=-288}, {name="default:junglesapling"})
+
+		minetest.place_node({x=646, y=12, z=-199}, {name="moretrees:spruce_sapling"})
+		minetest.place_node({x=644, y=14, z=-177}, {name="moretrees:spruce_sapling"})
+		minetest.place_node({x=678, y=9, z=-211}, {name="moretrees:spruce_sapling"})
+		minetest.place_node({x=663, y=10, z=-215}, {name="moretrees:spruce_sapling"})
+
+		minetest.place_node({x=637, y=3, z=-263}, {name="moretrees:sequoia_sapling"})
+		minetest.place_node({x=625, y=3, z=-250}, {name="moretrees:sequoia_sapling"})
+		minetest.place_node({x=616, y=3, z=-233}, {name="moretrees:sequoia_sapling"})
+		minetest.place_node({x=635, y=3, z=-276}, {name="moretrees:sequoia_sapling"})
+		minetest.place_node({x=681, y=11, z=-260}, {name="moretrees:sequoia_sapling"})
+		minetest.place_node({x=682, y=10, z=-247}, {name="moretrees:sequoia_sapling"})
+
+		minetest.place_node({x=737, y=7, z=-195}, {name="moretrees:cedar_sapling"})
+		minetest.place_node({x=720, y=8, z=-189}, {name="moretrees:cedar_sapling"})
+		minetest.place_node({x=704, y=7, z=-187}, {name="moretrees:cedar_sapling"})
+
+		minetest.place_node({x=731, y=2, z=-227}, {name="moretrees:poplar_sapling"})
+		minetest.place_node({x=721, y=2, z=-233}, {name="moretrees:poplar_sapling"})
+		minetest.place_node({x=712, y=1, z=-237}, {name="moretrees:poplar_sapling"})
+		minetest.place_node({x=743, y=3, z=-228}, {name="moretrees:poplar_small_sapling"})
+		minetest.place_node({x=750, y=3, z=-230}, {name="moretrees:poplar_small_sapling"})
+		minetest.place_node({x=731, y=5, z=-233}, {name="moretrees:poplar_small_sapling"})
+
+		minetest.place_node({x=702, y=2, z=-274}, {name="moretrees:birch_sapling"})
+		minetest.place_node({x=697, y=2, z=-271}, {name="moretrees:birch_sapling"})
+		minetest.place_node({x=696, y=2, z=-264}, {name="moretrees:birch_sapling"})
+		minetest.place_node({x=710, y=2, z=-265}, {name="moretrees:birch_sapling"})
+
+		minetest.place_node({x=707, y=8, z=-247}, {name="moretrees:fir_sapling"})
+		minetest.place_node({x=699, y=10, z=-254}, {name="moretrees:fir_sapling"})
+		minetest.place_node({x=729, y=5, z=-261}, {name="moretrees:fir_sapling"})
+		minetest.place_node({x=732, y=5, z=-252}, {name="moretrees:fir_sapling"})
+		minetest.place_node({x=741, y=4, z=-262}, {name="moretrees:fir_sapling"})
+
+		minetest.place_node({x=751, y=2, z=-286}, {name="moretrees:willow_sapling"})
+
+		minetest.place_node({x=760, y=5, z=-223}, {name="moretrees:rubber_tree_sapling"})
+		minetest.place_node({x=762, y=5, z=-230}, {name="moretrees:rubber_tree_sapling"})
+		minetest.place_node({x=766, y=5, z=-243}, {name="moretrees:rubber_tree_sapling"})
+		minetest.place_node({x=764, y=6, z=-252}, {name="moretrees:rubber_tree_sapling"})
+	end
+})
+
+--[[
+The following is a search/replace command suitable for vi (/vim) or sed, to convert minetest log
+messages to equivalent lua commands:
+
+s/.*\(\(moretrees\|default\)[^ ]*\) at (\([-0-9]\+\),\([-0-9]\+\),\([-0-9]\+\)).*/\t\tminetest.place_node({x=\3, y=\4, z=\5}, {name="\1"})/
+
+E.g. a minetest log line of the following kind:
+		2016-07-03 11:30:50: ACTION[Server]: singleplayer places node moretrees:rubber_tree_sapling at  (760,5,-223)
+Becomes:
+		minetest.place_node({x=760, y=5, z=-223}, {name="moretrees:rubber_tree_sapling"})
+(Except that the example log line above has an extra space added, so it won't be converted)
+
+vi/vim users: Add the minetest log lines to this file, then enter the following command, with
+<expression> replaced with the search/replace expression above.
+	:%<expression>
+
+sed users: Add the minetest log lines to this file, then execute the following command at the shell
+prompt with <expression> replaced by the search/replace expression above. Don't forget the
+single-quotes.
+	sed '<expression>' < screenshot.lua > screenshot-new.lua
+
+Windows users: You're probably out of luck. And the effort of doing such a thing is probably
+larger anyway than the effort of copying an existing line and typing things manually.
+]]
+
diff --git a/moretrees/screenshot.png b/moretrees/screenshot.png
index cae4346..b9ab5de 100644
--- a/moretrees/screenshot.png
+++ b/moretrees/screenshot.png
diff --git a/moretrees/textures/moretrees_poplar_leaves.png b/moretrees/textures/moretrees_poplar_leaves.png
new file mode 100644
index 0000000..64568bc
--- /dev/null
+++ b/moretrees/textures/moretrees_poplar_leaves.png
diff --git a/moretrees/textures/moretrees_poplar_sapling.png b/moretrees/textures/moretrees_poplar_sapling.png
new file mode 100644
index 0000000..9d5f32a
--- /dev/null
+++ b/moretrees/textures/moretrees_poplar_sapling.png
diff --git a/moretrees/textures/moretrees_poplar_small_sapling.png b/moretrees/textures/moretrees_poplar_small_sapling.png
new file mode 100644
index 0000000..fb9bd03
--- /dev/null
+++ b/moretrees/textures/moretrees_poplar_small_sapling.png
diff --git a/moretrees/textures/moretrees_poplar_trunk-1.png b/moretrees/textures/moretrees_poplar_trunk-1.png
new file mode 100644
index 0000000..e4e1540
--- /dev/null
+++ b/moretrees/textures/moretrees_poplar_trunk-1.png
diff --git a/moretrees/textures/moretrees_poplar_trunk.png b/moretrees/textures/moretrees_poplar_trunk.png
new file mode 100644
index 0000000..47672fb
--- /dev/null
+++ b/moretrees/textures/moretrees_poplar_trunk.png
diff --git a/moretrees/textures/moretrees_poplar_trunk_top.png b/moretrees/textures/moretrees_poplar_trunk_top.png
new file mode 100644
index 0000000..4c55858
--- /dev/null
+++ b/moretrees/textures/moretrees_poplar_trunk_top.png
diff --git a/moretrees/textures/moretrees_poplar_wood.png b/moretrees/textures/moretrees_poplar_wood.png
new file mode 100644
index 0000000..55e6b44
--- /dev/null
+++ b/moretrees/textures/moretrees_poplar_wood.png
diff --git a/moretrees/tree_biomes.txt b/moretrees/tree_biomes.txt
index 22e1032..0dd0345 100644
--- a/moretrees/tree_biomes.txt
+++ b/moretrees/tree_biomes.txt
@@ -18,6 +18,7 @@ willow		- 5 to + 5	    n/a		water, 15	   5	dirt_with grass		337		20
 acacia		    n/a		    n/a		  n/a		n/a	dirt_with_grass,
 									desert_sand		n/a		15
 rubber		- 5 to + 5	 above +32	water, 15	  10	dirt_with_grass		338		20
+poplar		    n/a		-10 to +26	water, 15h,5v	   1	dirt_with_grass		341,342,343	10
 
 beech		    n/a		    n/a		  n/a		n/a	dirt_with_grass		2		10
 
diff --git a/moretrees/tree_models.lua b/moretrees/tree_models.lua
index 791bddb..9372fe9 100644
--- a/moretrees/tree_models.lua
+++ b/moretrees/tree_models.lua
@@ -43,6 +43,37 @@ moretrees.oak_model={
 	fruit_chance=3,
 }
 
+moretrees.poplar_model={
+	axiom="TTTaaBCCCCCCCCCCCcccBBB[[f]&&G++f++Gf++Gf++Gf++G--]G[[f]&&G++f++Gf++Gf++Gf++G--]Gff",
+	rules_a="T",
+	rules_b="[[T]&&G++f++ff++ff++ff++f--]G",
+	rules_c="[[T]&&G++f++ff++ff++ff++f--G++[d]G[d]G++G[d]G[d]G[d]G++G[d]G[d]G[d]G++G[d]G[d]G[d]G++G[d]G]G",
+	rules_d="f",
+	trunk="air",
+	trunk="moretrees:poplar_trunk",
+	leaves="moretrees:poplar_leaves",
+	angle=45,
+	iterations=0,
+	random_level=0,
+	trunk_type="single",
+	thin_branches=false,
+}
+
+moretrees.poplar_small_model={
+	axiom="TT[T]BCCCCccBBff",
+	rules_a="T",
+	rules_b="[[f]&&G++f++Gf++Gf++Gf++G--]G",
+	rules_c="[[T]&&G++f++[d]Gf++[d]Gf++[d]Gf++[d]G--]G",
+	rules_d="f",
+	trunk="moretrees:poplar_trunk",
+	leaves="moretrees:poplar_leaves",
+	angle=45,
+	iterations=0,
+	random_level=0,
+	trunk_type="single",
+	thin_branches=false,
+}
+
 moretrees.sequoia_model={
 	axiom="FFFFFFFFFFddccA///cccFddcFA///ddFcFA/cFFddFcdBddd/A/ccdcddd/ccAddddcFBcccAccFdFcFBcccc/BFdFFcFFdcccc/B",
 	rules_a="[&&&GGF[++^FFdd][--&Fddd]//Fdd[+^Fd][--&Fdd]]////[&&&GGF[++^FFdd][--&Fddd]//Fdd[+^Fd][--&Fdd]]////[&&&GGF[++^FFdd][--&Fddd]//Fdd[+^Fd][--&Fdd]]",