From 84d0b45c9a9f079d23f21f4b3ab16048c84543fb Mon Sep 17 00:00:00 2001
From: LeMagnesium <mg.minetest@gmail.com>
Date: Tue, 3 May 2016 21:15:17 +0200
Subject: [PATCH] [moretrees & columnia] Update and fix reference to acacia
 tree

 - For #429
---
 mods/columnia/init.lua         | 12 +++++++++++-
 mods/moretrees/description.txt |  1 +
 mods/moretrees/init.lua        |  4 ++--
 mods/moretrees/mod.conf        |  1 +
 4 files changed, 15 insertions(+), 3 deletions(-)
 create mode 100644 mods/moretrees/description.txt
 create mode 100644 mods/moretrees/mod.conf

diff --git a/mods/columnia/init.lua b/mods/columnia/init.lua
index 164b0f86..eaec47e0 100755
--- a/mods/columnia/init.lua
+++ b/mods/columnia/init.lua
@@ -676,6 +676,17 @@ columnia.register_column_ia("pinewood", "default:pine_wood",
         "Pineewood Column Linkdown",
         default.node_sound_wood_defaults())
 
+columnia.register_column_ia("acacia", "default:acacia_wood",
+        {snappy=2,choppy=2,oddly_breakable_by_hand=2,flammable=3},
+        {"default_acacia_wood.png"},
+        "Acacia Column",
+        "Acacia Column Top",
+        "Acacia Column Bottom",
+        "Acacia Column Crosslink",
+        "Acacia Column Link",
+        "Acacia Column Linkdown",
+        default.node_sound_wood_defaults())
+
 if core.get_modpath( 'moretrees' ) then
 	local morewood = {
 		{ name='beech', description='Beech Tree' },
@@ -686,7 +697,6 @@ if core.get_modpath( 'moretrees' ) then
 		{ name='palm', description='Palm Tree', },
 		{ name='spruce', description='Spruce Tree' },
 		{ name='willow', description='Willow Tree' },
-		{ name='acacia', description='Acacia Tree' },
 		{ name='rubber_tree',	description='Rubber Tree' },
 		{ name='fir', description='Douglas Fir' }
 	}
diff --git a/mods/moretrees/description.txt b/mods/moretrees/description.txt
new file mode 100644
index 00000000..7c867233
--- /dev/null
+++ b/mods/moretrees/description.txt
@@ -0,0 +1 @@
+This mod adds a whole bunch of new types of trees to the game
diff --git a/mods/moretrees/init.lua b/mods/moretrees/init.lua
index 8af25438..b8e82bc2 100755
--- a/mods/moretrees/init.lua
+++ b/mods/moretrees/init.lua
@@ -2,13 +2,13 @@
 --
 -- This mod adds more types of trees to the game
 --
--- Some of the node definitions and textures came from cisoun's conifers mod
+-- Some of the node definitions and textures came from cisoun's conifers mod 
 -- and bas080's jungle trees mod.
 --
 -- Brought together into one mod and made L-systems compatible by Vanessa
 -- Ezekowitz.
 --
--- Firs and Jungle tree axioms/rules by Vanessa Ezekowitz, with the
+-- Firs and Jungle tree axioms/rules by Vanessa Ezekowitz, with the 
 -- latter having been tweaked by RealBadAngel, most other axioms/rules written
 -- by RealBadAngel.
 --
diff --git a/mods/moretrees/mod.conf b/mods/moretrees/mod.conf
new file mode 100644
index 00000000..b95f3e82
--- /dev/null
+++ b/mods/moretrees/mod.conf
@@ -0,0 +1 @@
+name = moretrees