From e35997d9e3e36c1a8082e37e98d331bd5ddbdc34 Mon Sep 17 00:00:00 2001
From: Daniel Borchmann <daniel@algebra20.de>
Date: Sun, 20 Dec 2020 09:44:57 +0100
Subject: [PATCH] Fix wrong acacia tree reference in columnia mod

Acacia trees have been moved from moretrees to default.
---
 ...01_columnia-acacia-tree-from-default.patch | 28 +++++++++++++++++++
 patches/series                                |  1 +
 2 files changed, 29 insertions(+)
 create mode 100644 patches/01_columnia-acacia-tree-from-default.patch

diff --git a/patches/01_columnia-acacia-tree-from-default.patch b/patches/01_columnia-acacia-tree-from-default.patch
new file mode 100644
index 0000000..326994c
--- /dev/null
+++ b/patches/01_columnia-acacia-tree-from-default.patch
@@ -0,0 +1,28 @@
+--- a/columnia/init.lua
++++ b/columnia/init.lua
+@@ -665,6 +665,17 @@ columnia.register_column_ia("pinewood",
+         "Pineewood Column Linkdown",
+         default.node_sound_wood_defaults())
+ 
++columnia.register_column_ia("acaciawood", "default:acacia_wood",
++        {snappy=2,choppy=2,oddly_breakable_by_hand=2,flammable=3},
++        {"default_acacia_wood.png"},
++        "Acacia Wood Column",
++        "Acacia Wood Column Top",
++        "Acacia Wood Column Bottom",
++        "Acacia Wood Column Crosslink",
++        "Acacia Wood Column Link",
++        "Acacia Wood Column Linkdown",
++        default.node_sound_wood_defaults())
++
+ if core.get_modpath( 'moretrees' ) then
+ 	local morewood = {
+ 		{ name='beech', description='Beech Tree' },
+@@ -675,7 +686,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/patches/series b/patches/series
index e69de29..30a73c8 100644
--- a/patches/series
+++ b/patches/series
@@ -0,0 +1 @@
+01_columnia-acacia-tree-from-default.patch