From 3996b55c0355f3feccaf8198f801b744a335b67e Mon Sep 17 00:00:00 2001
From: Vanessa Ezekowitz <vanessaezekowitz@gmail.com>
Date: Sun, 3 May 2015 21:18:35 -0400
Subject: [PATCH] phase out generic dark, mahogany, and white wood and rename
 the base wood to _plain instead of beech

---
 homedecor/furniture.lua                       |  24 +-
 homedecor/init.lua                            |  12 +
 homedecor/misc-nodes.lua                      |  12 +-
 homedecor/models/homedecor_banister_left.obj  | 182 ++++++------
 homedecor/models/homedecor_banister_right.obj | 268 +++++++++---------
 homedecor/tables.lua                          |   2 +-
 .../textures/homedecor_generic_wood_beech.png | Bin 640 -> 0 bytes
 .../homedecor_generic_wood_boards_overlay.png | Bin 0 -> 102 bytes
 .../textures/homedecor_generic_wood_dark.png  | Bin 251 -> 0 bytes
 .../homedecor_generic_wood_mahogany.png       | Bin 588 -> 0 bytes
 .../textures/homedecor_generic_wood_plain.png | Bin 0 -> 605 bytes
 .../textures/homedecor_generic_wood_white.png | Bin 246 -> 0 bytes
 homedecor/wardrobe.lua                        |   2 +-
 13 files changed, 257 insertions(+), 245 deletions(-)
 delete mode 100644 homedecor/textures/homedecor_generic_wood_beech.png
 create mode 100644 homedecor/textures/homedecor_generic_wood_boards_overlay.png
 delete mode 100644 homedecor/textures/homedecor_generic_wood_dark.png
 delete mode 100644 homedecor/textures/homedecor_generic_wood_mahogany.png
 create mode 100644 homedecor/textures/homedecor_generic_wood_plain.png
 delete mode 100644 homedecor/textures/homedecor_generic_wood_white.png

diff --git a/homedecor/furniture.lua b/homedecor/furniture.lua
index 90ffe009..6ff4354c 100644
--- a/homedecor/furniture.lua
+++ b/homedecor/furniture.lua
@@ -1,21 +1,21 @@
 local S = homedecor.gettext
 
-local table_colors = { "", "mahogany", "white" }
+local table_colors = {
+	{ "",          homedecor.plain_wood },
+	{ "_mahogany", homedecor.mahogany_wood },
+	{ "_white",    homedecor.white_wood }
+}
 
-for _, i in ipairs(table_colors) do
-	local color = "_"..i
-	local color2 = "_"..i
+for i in ipairs(table_colors) do
 	local desc = S("Table ("..i..")")
 
-	if i == "" then
-		color = ""
-		color2 = "_beech"
+	if i == 1 then
 		desc = S("Table")
 	end
 
-	homedecor.register("table"..color, {
+	homedecor.register("table"..table_colors[i][1], {
 		description = desc,
-		tiles = { "homedecor_generic_wood"..color2..".png" },
+		tiles = { table_colors[i][2] },
 		node_box = {
 			type = "fixed",
 			fixed = {
@@ -64,15 +64,15 @@ for i in ipairs(chaircolors) do
 	local color2 = chaircolors[i][1]
 	local name = S(chaircolors[i][2])
 	local chairtiles = {
-		"homedecor_generic_wood_beech.png",
+		homedecor.plain_wood,
 		"wool"..color..".png",
 	}
 
 	if chaircolors[i][1] == "" then
 		color = ""
 		chairtiles = {
-			"homedecor_generic_wood_beech.png",
-			"homedecor_generic_wood_beech.png"
+			homedecor.plain_wood,
+			homedecor.plain_wood
 		}
 	end
 
diff --git a/homedecor/init.lua b/homedecor/init.lua
index e4f667a1..901e3132 100644
--- a/homedecor/init.lua
+++ b/homedecor/init.lua
@@ -99,6 +99,18 @@ function homedecor.find_ceiling(itemstack, placer, pointed_thing)
 	return isceiling, pos
 end
 
+homedecor.plain_wood = "homedecor_generic_wood_plain.png^"..
+					   "(homedecor_generic_wood_boards_overlay.png^[colorize:#a7682020:100)"
+
+homedecor.mahogany_wood = "(homedecor_generic_wood_plain.png^[colorize:#401010:125)^"..
+					      "(homedecor_generic_wood_boards_overlay.png^[colorize:#66493880:200)"
+
+homedecor.white_wood = "(homedecor_generic_wood_plain.png^[colorize:#e0f0ff:200)^"..
+					   "(homedecor_generic_wood_boards_overlay.png^[colorize:#ffffff:200)"
+
+homedecor.dark_wood = "(homedecor_generic_wood_plain.png^[colorize:#140900:200)^"..
+					  "(homedecor_generic_wood_boards_overlay.png^[colorize:#21110180:180)"
+
 -- nodebox arithmetics and helpers
 -- (please keep non-generic nodeboxes with their node definition)
 dofile(homedecor.modpath.."/handlers/nodeboxes.lua")
diff --git a/homedecor/misc-nodes.lua b/homedecor/misc-nodes.lua
index 7bd7d3e6..9383a030 100644
--- a/homedecor/misc-nodes.lua
+++ b/homedecor/misc-nodes.lua
@@ -244,7 +244,7 @@ homedecor.register("filing_cabinet", {
 	description = S("Filing Cabinet"),
 	mesh = "homedecor_filing_cabinet.obj",
 	tiles = {
-		"homedecor_generic_wood_beech.png",
+		homedecor.plain_wood,
 		"homedecor_filing_cabinet_front.png",
 		"homedecor_filing_cabinet_bottom.png"
 	},
@@ -282,7 +282,7 @@ homedecor.register("pool_table", {
 minetest.register_alias("homedecor:pool_table_2", "air")
 
 homedecor.register("coatrack_wallmount", {
-	tiles = { "homedecor_generic_wood_beech.png" },
+	tiles = { homedecor.plain_wood },
 	inventory_image = "homedecor_coatrack_wallmount_inv.png",
 	description = "Coatrack (wallmounted)",
 	groups = {snappy=3},
@@ -306,7 +306,7 @@ homedecor.register("coatrack_wallmount", {
 homedecor.register("coat_tree", {
 	mesh = "homedecor_coatrack.obj",
 	tiles = {
-		"homedecor_generic_wood_beech.png",
+		homedecor.plain_wood,
 		"homedecor_generic_wood_neutral.png"
 	},
 	inventory_image = "homedecor_coatrack_inv.png",
@@ -717,8 +717,8 @@ homedecor.banister_materials = {
 	},
 	{	"white_dark",
 		"dark topped",
-		"homedecor_generic_wood_white.png",
-		"homedecor_generic_wood_dark.png",
+		homedecor.white_wood,
+		homedecor.dark_wood,
 		"group:wood",
 		"group:stick",
 		"dye:brown",
@@ -726,7 +726,7 @@ homedecor.banister_materials = {
 	},
 	{	"brass",
 		"brass",
-		"homedecor_generic_wood_white.png",
+		homedecor.white_wood,
 		"homedecor_generic_metal_brass.png",
 		"technic:brass_ingot",
 		"group:stick",
diff --git a/homedecor/models/homedecor_banister_left.obj b/homedecor/models/homedecor_banister_left.obj
index 554ab1a4..b656d44d 100644
--- a/homedecor/models/homedecor_banister_left.obj
+++ b/homedecor/models/homedecor_banister_left.obj
@@ -38,82 +38,82 @@ v 0.265203 0.312500 0.499999
 v -0.297297 -0.125000 0.499999
 v 0.202703 0.312500 0.499999
 v -0.234797 -0.125000 0.499999
-vt 0.062500 0.812500
-vt 0.062500 0.750000
-vt 1.000000 0.750000
-vt 0.937500 0.812500
-vt 0.062500 0.937500
-vt 0.937500 0.937500
-vt 1.000000 1.000000
-vt 0.062500 1.000000
-vt 0.625000 0.375000
-vt 0.625000 0.312500
-vt 0.750000 0.312500
-vt 0.750000 0.375000
-vt 0.062500 0.875000
-vt 1.000000 0.812500
-vt 0.937500 0.875000
-vt 1.000000 0.937500
-vt 0.812500 0.375000
-vt 0.812500 0.312500
-vt 0.937500 0.312500
-vt 0.937500 0.375000
+vt -0.312500 0.500000
+vt -0.312500 0.437500
+vt 0.625000 0.437500
+vt 0.562500 0.500000
+vt 0.125000 0.687500
+vt 1.000000 0.687500
+vt 1.062500 0.750000
+vt 0.125000 0.750000
+vt 1.000000 0.125000
 vt 1.000000 0.062500
-vt 0.062500 0.062500
-vt 0.062500 0.000000
-vt 1.000000 0.000000
-vt 0.062500 0.625000
-vt 0.937500 0.625000
-vt 0.937500 0.687500
-vt 0.062500 0.687500
-vt 1.000000 0.250000
-vt 0.062500 0.250000
-vt 0.062500 0.187500
-vt 1.000000 0.187500
-vt 0.062500 0.437500
-vt 0.937500 0.437500
-vt 0.937500 0.500000
-vt 0.062500 0.500000
-vt 0.062500 0.375000
-vt 0.125000 0.375000
-vt 0.125000 0.437500
-vt 0.125000 0.250000
-vt 0.125000 0.312500
-vt 0.062500 0.312500
-vt 0.437500 0.375000
-vt 0.375000 0.375000
-vt 0.375000 0.312500
-vt 0.437500 0.312500
+vt 1.125000 0.062500
+vt 1.125000 0.125000
+vt 0.125000 0.625000
+vt 0.125000 0.562500
+vt 1.062500 0.562500
+vt 1.000000 0.625000
+vt 1.062500 0.687500
+vt 1.187500 0.125000
+vt 1.187500 0.062500
+vt 1.312500 0.062500
+vt 1.312500 0.125000
+vt 0.875000 0.875000
+vt -0.062500 0.875000
+vt -0.062500 0.812500
+vt 0.875000 0.812500
+vt -0.312500 0.375000
 vt 0.562500 0.375000
-vt 0.500000 0.375000
-vt 0.500000 0.312500
-vt 0.562500 0.312500
-vt 0.125000 0.062500
-vt 0.125000 0.125000
-vt 0.062500 0.125000
+vt 0.562500 0.437500
+vt 0.875000 1.000000
+vt -0.062500 1.000000
+vt -0.062500 0.937500
+vt 0.875000 0.937500
+vt 0.437500 0.187500
+vt 1.312500 0.187500
+vt 1.312500 0.250000
+vt 0.437500 0.250000
+vt 0.437500 0.125000
+vt 0.500000 0.125000
+vt 0.500000 0.187500
+vt -0.375000 0.812500
+vt -0.312500 0.812500
+vt -0.312500 0.875000
+vt -0.375000 0.875000
+vt 0.812500 0.125000
+vt 0.750000 0.125000
+vt 0.750000 0.062500
+vt 0.812500 0.062500
+vt 0.937500 0.125000
+vt 0.875000 0.125000
+vt 0.875000 0.062500
+vt 0.937500 0.062500
+vt -0.250000 0.875000
+vt -0.250000 0.937500
+vt -0.312500 0.937500
+vt -0.312500 0.312500
+vt -0.250000 0.312500
+vt -0.250000 0.375000
+vt -0.125000 0.937500
+vt -0.125000 0.875000
+vt -0.125000 1.000000
+vt -0.187500 0.625000
+vt -0.375000 0.625000
+vt -0.375000 0.562500
+vt -0.187500 0.562500
+vt -0.125000 0.625000
+vt -0.125000 0.562500
 vt 0.062500 0.562500
-vt 0.125000 0.562500
-vt 0.125000 0.625000
-vt 1.000000 0.125000
-vt 0.000000 0.125000
-vt 0.000000 0.062500
-vt 0.000000 0.250000
-vt 0.000000 0.187500
-vt 0.187500 0.875000
-vt 0.000000 0.875000
-vt 0.000000 0.812500
-vt 0.187500 0.812500
-vt 0.250000 0.875000
-vt 0.250000 0.812500
-vt 0.437500 0.812500
-vt 0.437500 0.875000
-vt 1.000000 0.500000
-vt 0.000000 0.500000
-vt 0.000000 0.312500
-vt 1.000000 0.312500
-vt 0.000000 0.562500
-vt 1.000000 0.562500
-vt 0.000000 0.750000
+vt 0.062500 0.625000
+vt 1.375000 0.250000
+vt 0.375000 0.250000
+vt 0.375000 0.062500
+vt 1.375000 0.062500
+vt -0.375000 0.312500
+vt 0.625000 0.312500
+vt 0.625000 0.500000
+vt -0.375000 0.500000
 vn -0.000000 0.000000 1.000000
 vn 0.000000 0.000000 -1.000000
 vn 0.000000 -1.000000 0.000000
@@ -129,25 +129,25 @@ s off
 f 6/1/1 1/2/1 3/3/1 2/4/1
 f 17/5/2 13/6/2 14/7/2 12/8/2
 f 17/9/3 12/10/3 26/11/3 28/12/3
-f 4/13/1 16/1/1 5/14/1 15/15/1
-f 25/13/2 23/15/2 24/16/2 22/5/2
-f 25/17/3 22/18/3 29/19/3 27/20/3
-f 3/21/4 1/22/4 12/23/4 14/24/4
-f 6/25/5 2/26/5 13/27/5 17/28/5
+f 4/13/1 16/14/1 5/15/1 15/16/1
+f 25/13/2 23/16/2 24/17/2 22/5/2
+f 25/18/3 22/19/3 29/20/3 27/21/3
+f 3/22/4 1/23/4 12/24/4 14/25/4
+f 6/26/5 2/27/5 13/28/5 17/2/5
 f 5/29/4 16/30/4 22/31/4 24/32/4
 f 4/33/5 15/34/5 23/35/5 25/36/5
 f 27/37/5 35/38/5 31/39/5 4/33/5
-f 16/30/4 33/40/4 37/41/4 29/42/4
-f 32/43/6 36/44/6 34/45/6 30/46/6
-f 31/47/6 35/48/6 37/49/6 33/50/6
-f 1/22/4 30/51/4 34/52/4 26/53/4
-f 28/54/5 36/55/5 32/56/5 6/25/5
-f 26/22/1 34/51/1 36/52/1 28/53/1
-f 29/30/1 37/40/1 35/41/1 27/42/1
+f 16/40/4 33/41/4 37/42/4 29/43/4
+f 32/44/6 36/45/6 34/46/6 30/47/6
+f 31/48/6 35/49/6 37/50/6 33/51/6
+f 1/42/4 30/52/4 34/53/4 26/54/4
+f 28/55/5 36/56/5 32/57/5 6/26/5
+f 26/42/1 34/52/1 36/53/1 28/54/1
+f 29/40/1 37/41/1 35/42/1 27/43/1
 g Cylinder_Cylinder_top
-f 10/57/1 9/58/1 11/59/1 8/21/1
-f 20/32/2 18/29/2 21/60/2 19/61/2
-f 10/62/7 8/63/7 18/64/7 20/65/7
-f 9/66/8 19/67/8 21/68/8 11/69/8
-f 8/70/9 11/71/9 21/72/9 18/73/9
-f 9/74/10 10/75/10 20/3/10 19/76/10
+f 10/32/1 9/58/1 11/59/1 8/22/1
+f 20/32/2 18/29/2 21/60/2 19/58/2
+f 10/61/7 8/62/7 18/63/7 20/64/7
+f 9/65/8 19/66/8 21/67/8 11/68/8
+f 8/69/9 11/70/9 21/71/9 18/72/9
+f 9/73/10 10/74/10 20/75/10 19/76/10
diff --git a/homedecor/models/homedecor_banister_right.obj b/homedecor/models/homedecor_banister_right.obj
index bdf14934..683c4f9d 100644
--- a/homedecor/models/homedecor_banister_right.obj
+++ b/homedecor/models/homedecor_banister_right.obj
@@ -1,153 +1,153 @@
-# Blender v2.73 (sub 0) OBJ File: 'bannister_right.blend'
+# Blender v2.73 (sub 0) OBJ File: 'bannister.blend'
 # www.blender.org
 o Cylinder
-v -0.265203 0.250000 0.437499
-v -0.202703 1.187500 0.437499
-v -0.265203 1.250000 0.437499
-v 0.297297 -0.187500 0.437499
-v 0.234797 0.812500 0.437499
-v -0.202703 0.250000 0.437499
-v 0.047297 1.000000 0.499999
-v -0.483953 1.468750 0.499999
-v 0.578547 0.531250 0.499999
-v -0.421453 1.531250 0.499999
-v 0.516047 0.468750 0.499999
-v -0.265203 0.250000 0.374999
-v -0.202703 1.187500 0.374999
-v -0.265203 1.250000 0.374999
-v 0.297297 0.750000 0.437499
-v 0.234797 -0.187500 0.437499
-v -0.202703 0.250000 0.374999
-v -0.483953 1.468750 0.312499
-v 0.578547 0.531250 0.312499
-v -0.421453 1.531250 0.312499
-v 0.516047 0.468750 0.312499
-v 0.234797 -0.187500 0.374999
-v 0.297297 0.750000 0.374999
-v 0.234797 0.812500 0.374999
-v 0.297297 -0.187500 0.374999
-v -0.265203 0.250000 0.499999
-v 0.297297 -0.187500 0.499999
-v -0.202703 0.250000 0.499999
-v 0.234797 -0.187500 0.499999
-v -0.265203 0.312500 0.437499
-v 0.297297 -0.125000 0.437499
-v -0.202703 0.312500 0.437499
-v 0.234797 -0.125000 0.437499
-v -0.265203 0.312500 0.499999
-v 0.297297 -0.125000 0.499999
-v -0.202703 0.312500 0.499999
-v 0.234797 -0.125000 0.499999
-vt 0.062500 0.812500
-vt 0.937500 0.812500
-vt 1.000000 0.750000
-vt 0.062500 0.750000
-vt 0.062500 0.937500
-vt 0.062500 1.000000
-vt 1.000000 1.000000
-vt 0.937500 0.937500
-vt 0.625000 0.375000
-vt 0.750000 0.375000
-vt 0.750000 0.312500
-vt 0.625000 0.312500
-vt 0.062500 0.875000
-vt 0.937500 0.875000
-vt 1.000000 0.812500
-vt 1.000000 0.937500
-vt 0.812500 0.375000
-vt 0.937500 0.375000
-vt 0.937500 0.312500
-vt 0.812500 0.312500
+v 0.265203 0.250000 -0.437499
+v 0.202703 1.187500 -0.437499
+v 0.265203 1.250000 -0.437499
+v -0.297297 -0.187500 -0.437499
+v -0.234797 0.812500 -0.437499
+v 0.202703 0.250000 -0.437499
+v -0.047297 1.000000 -0.499999
+v 0.483953 1.468750 -0.499999
+v -0.578547 0.531250 -0.499999
+v 0.421453 1.531250 -0.499999
+v -0.516047 0.468750 -0.499999
+v 0.265203 0.250000 -0.374999
+v 0.202703 1.187500 -0.374999
+v 0.265203 1.250000 -0.374999
+v -0.297297 0.750000 -0.437499
+v -0.234797 -0.187500 -0.437499
+v 0.202703 0.250000 -0.374999
+v 0.483953 1.468750 -0.312499
+v -0.578547 0.531250 -0.312499
+v 0.421453 1.531250 -0.312499
+v -0.516047 0.468750 -0.312499
+v -0.234797 -0.187500 -0.374999
+v -0.297297 0.750000 -0.374999
+v -0.234797 0.812500 -0.374999
+v -0.297297 -0.187500 -0.374999
+v 0.265203 0.250000 -0.499999
+v -0.297297 -0.187500 -0.499999
+v 0.202703 0.250000 -0.499999
+v -0.234797 -0.187500 -0.499999
+v 0.265203 0.312500 -0.437499
+v -0.297297 -0.125000 -0.437499
+v 0.202703 0.312500 -0.437499
+v -0.234797 -0.125000 -0.437499
+v 0.265203 0.312500 -0.499999
+v -0.297297 -0.125000 -0.499999
+v 0.202703 0.312500 -0.499999
+v -0.234797 -0.125000 -0.499999
+vt -0.312500 0.500000
+vt 0.562500 0.500000
+vt 0.625000 0.437500
+vt -0.312500 0.437500
+vt 0.125000 0.687500
+vt 0.125000 0.750000
+vt 1.062500 0.750000
+vt 1.000000 0.687500
+vt 1.000000 0.125000
+vt 1.125000 0.125000
+vt 1.125000 0.062500
 vt 1.000000 0.062500
-vt 1.000000 0.000000
-vt 0.062500 0.000000
-vt 0.062500 0.062500
-vt 0.062500 0.625000
-vt 0.062500 0.687500
-vt 0.937500 0.687500
-vt 0.937500 0.625000
-vt 1.000000 0.250000
-vt 1.000000 0.187500
-vt 0.062500 0.187500
-vt 0.062500 0.250000
-vt 0.062500 0.437500
-vt 0.062500 0.500000
-vt 0.937500 0.500000
-vt 0.937500 0.437500
-vt 0.062500 0.375000
-vt 0.125000 0.437500
-vt 0.125000 0.375000
-vt 0.062500 0.312500
-vt 0.125000 0.312500
-vt 0.125000 0.250000
-vt 0.437500 0.375000
-vt 0.437500 0.312500
-vt 0.375000 0.312500
-vt 0.375000 0.375000
-vt 0.562500 0.375000
-vt 0.562500 0.312500
-vt 0.500000 0.312500
-vt 0.500000 0.375000
-vt 0.062500 0.125000
-vt 0.125000 0.125000
-vt 0.125000 0.062500
-vt 0.062500 0.562500
 vt 0.125000 0.625000
+vt 1.000000 0.625000
+vt 1.062500 0.562500
 vt 0.125000 0.562500
-vt 1.000000 0.125000
-vt 0.000000 0.062500
-vt 0.000000 0.125000
-vt 0.000000 0.187500
-vt 0.000000 0.250000
-vt 0.187500 0.875000
-vt 0.187500 0.812500
-vt 0.000000 0.812500
-vt 0.000000 0.875000
-vt 0.250000 0.875000
-vt 0.437500 0.875000
-vt 0.437500 0.812500
-vt 0.250000 0.812500
-vt 1.000000 0.500000
-vt 1.000000 0.312500
-vt 0.000000 0.312500
-vt 0.000000 0.500000
-vt 0.000000 0.562500
-vt 0.000000 0.750000
-vt 1.000000 0.562500
+vt 1.062500 0.687500
+vt 1.187500 0.125000
+vt 1.312500 0.125000
+vt 1.312500 0.062500
+vt 1.187500 0.062500
+vt 0.875000 0.875000
+vt 0.875000 0.812500
+vt -0.062500 0.812500
+vt -0.062500 0.875000
+vt -0.312500 0.375000
+vt 0.562500 0.437500
+vt 0.562500 0.375000
+vt 0.875000 1.000000
+vt 0.875000 0.937500
+vt -0.062500 0.937500
+vt -0.062500 1.000000
+vt 0.437500 0.187500
+vt 0.437500 0.250000
+vt 1.312500 0.250000
+vt 1.312500 0.187500
+vt 0.437500 0.125000
+vt 0.500000 0.187500
+vt 0.500000 0.125000
+vt -0.375000 0.812500
+vt -0.375000 0.875000
+vt -0.312500 0.875000
+vt -0.312500 0.812500
+vt 0.812500 0.125000
+vt 0.812500 0.062500
+vt 0.750000 0.062500
+vt 0.750000 0.125000
+vt 0.937500 0.125000
+vt 0.937500 0.062500
+vt 0.875000 0.062500
+vt 0.875000 0.125000
+vt -0.312500 0.937500
+vt -0.250000 0.937500
+vt -0.250000 0.875000
+vt -0.312500 0.312500
+vt -0.250000 0.375000
+vt -0.250000 0.312500
+vt -0.125000 0.875000
+vt -0.125000 0.937500
+vt -0.125000 1.000000
+vt -0.187500 0.625000
+vt -0.187500 0.562500
+vt -0.375000 0.562500
+vt -0.375000 0.625000
+vt -0.125000 0.625000
+vt 0.062500 0.625000
+vt 0.062500 0.562500
+vt -0.125000 0.562500
+vt 1.375000 0.250000
+vt 1.375000 0.062500
+vt 0.375000 0.062500
+vt 0.375000 0.250000
+vt -0.375000 0.312500
+vt -0.375000 0.500000
+vt 0.625000 0.500000
+vt 0.625000 0.312500
+vn 0.000000 0.000000 -1.000000
 vn 0.000000 0.000000 1.000000
-vn -0.000000 0.000000 -1.000000
 vn 0.000000 -1.000000 0.000000
-vn -1.000000 0.000000 0.000000
 vn 1.000000 0.000000 0.000000
+vn -1.000000 0.000000 0.000000
 vn 0.000000 1.000000 0.000000
-vn -0.707100 0.707100 0.000000
-vn 0.707100 -0.707100 0.000000
-vn -0.707100 -0.707100 0.000000
 vn 0.707100 0.707100 0.000000
+vn -0.707100 -0.707100 0.000000
+vn 0.707100 -0.707100 0.000000
+vn -0.707100 0.707100 0.000000
 g Cylinder_Cylinder_verticals
 s off
 f 6/1/1 2/2/1 3/3/1 1/4/1
 f 17/5/2 12/6/2 14/7/2 13/8/2
 f 17/9/3 28/10/3 26/11/3 12/12/3
-f 4/13/1 15/14/1 5/15/1 16/1/1
-f 25/13/2 22/5/2 24/16/2 23/14/2
-f 25/17/3 27/18/3 29/19/3 22/20/3
-f 3/21/4 14/22/4 12/23/4 1/24/4
-f 6/25/5 17/26/5 13/27/5 2/28/5
+f 4/13/1 15/14/1 5/15/1 16/16/1
+f 25/13/2 22/5/2 24/17/2 23/14/2
+f 25/18/3 27/19/3 29/20/3 22/21/3
+f 3/22/4 14/23/4 12/24/4 1/25/4
+f 6/26/5 17/4/5 13/27/5 2/28/5
 f 5/29/4 24/30/4 22/31/4 16/32/4
 f 4/33/5 25/34/5 23/35/5 15/36/5
 f 27/37/5 4/33/5 31/38/5 35/39/5
-f 16/32/4 29/40/4 37/41/4 33/42/4
-f 32/43/6 30/44/6 34/45/6 36/46/6
-f 31/47/6 33/48/6 37/49/6 35/50/6
-f 1/24/4 26/51/4 34/52/4 30/53/4
-f 28/54/5 6/25/5 32/55/5 36/56/5
-f 26/24/1 28/51/1 36/52/1 34/53/1
-f 29/32/1 27/40/1 35/41/1 37/42/1
+f 16/40/4 29/41/4 37/42/4 33/43/4
+f 32/44/6 30/45/6 34/46/6 36/47/6
+f 31/48/6 33/49/6 37/50/6 35/51/6
+f 1/42/4 26/52/4 34/53/4 30/54/4
+f 28/55/5 6/26/5 32/56/5 36/57/5
+f 26/42/1 28/52/1 36/53/1 34/54/1
+f 29/40/1 27/41/1 35/42/1 37/43/1
 g Cylinder_Cylinder_top
-f 10/57/1 8/21/1 11/58/1 9/59/1
-f 20/30/2 19/60/2 21/61/2 18/29/2
-f 10/62/7 20/63/7 18/64/7 8/65/7
-f 9/66/8 11/67/8 21/68/8 19/69/8
-f 8/70/9 18/71/9 21/72/9 11/73/9
-f 9/74/10 19/75/10 20/3/10 10/76/10
+f 10/30/1 8/22/1 11/58/1 9/59/1
+f 20/30/2 19/59/2 21/60/2 18/29/2
+f 10/61/7 20/62/7 18/63/7 8/64/7
+f 9/65/8 11/66/8 21/67/8 19/68/8
+f 8/69/9 18/70/9 21/71/9 11/72/9
+f 9/73/10 19/74/10 20/75/10 10/76/10
diff --git a/homedecor/tables.lua b/homedecor/tables.lua
index 987b37b4..a22a9d72 100644
--- a/homedecor/tables.lua
+++ b/homedecor/tables.lua
@@ -197,7 +197,7 @@ homedecor.register("desk", {
 	description = "Desk",
 	mesh = "homedecor_desk.obj",
 	tiles = {
-		"homedecor_generic_wood_beech.png",
+		homedecor.plain_wood,
 		"homedecor_desk_drawers.png",
 		"homedecor_generic_metal_black.png",
 	},
diff --git a/homedecor/textures/homedecor_generic_wood_beech.png b/homedecor/textures/homedecor_generic_wood_beech.png
deleted file mode 100644
index 7e44cea5223f0d2e4adddbfbd629dd8178cc674c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 640
zcmV-`0)PF9P)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM0006<Nkl<ZD9;7K
zOO6vU5CG7!UH){ZJIQ1S5)#RR9Y}Bu#A!Gc*I@~n<$#zOM1GzAxb3oCyeGbWeIEi_
zYsbl>lAIWf5rT|Hrp(N?wo(9Rnn-G`aKGQ1MXjW;wataK)I=l{3#rp^b*oKEku#xl
z-+#R9T7mVl5uBAX(MP3}j~ysLRTHJ<?j08@LyB`?8l5$Zy9N)xZZRY-S-XX?SaM>K
z^K{8l!^2S<%PDXU=+Gzi^RdGZ_fgdL;dj~H2Mv)knR=;A1)^3)aipSL?60O>mtkO$
z5j66g{S;y)WwW7qo^Lk>r7ISNq%cw@jf-$Tp*CCucIRNUMD0)|=RlOY00NgZcM_ek
zC5D&??BZ2-zHrI-5?mTn*N+F!`0qTA^K!c(AB13uSqe`vfRHFJxsa5A`*kwLAk<(?
z7)CC}PaW61XjcH@aDx3}1^`!K3Q0MODbD`ZE87B0cDX{troE@cAr~&$n4*oH{nQVv
ztpZ|H%^TH9tyq|rf@g_2QA`y5E#=~8492>~Rm*nrGa847$0I7Kjpfq$K!{k?i(DuN
zW{^4hm$)oLEY~4X1eoyS&c+x8^{%RwamRnxzoXyc2nE_zWq0?t(^ap9k*F)1K_lpf
zrv7ponubFp02qSWYB`q_PLn)Ot8MF(dOn`2s(StQt@`r80dvaKT}SKma<lHE440ch
zF_$v<a=Cb|^=7-7JU#t-QlCGq&&Nq=k%gQ><^p|IalHNMlXms$)g8-xK2Ogtm#S$@
a+x!Q!FMW0b^wZn`0000<MNUMnLSTYu7Am;_

diff --git a/homedecor/textures/homedecor_generic_wood_boards_overlay.png b/homedecor/textures/homedecor_generic_wood_boards_overlay.png
new file mode 100644
index 0000000000000000000000000000000000000000..6fc6073a1f1ca11d693c847fb64c9ddf28c896d5
GIT binary patch
literal 102
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`x}GkMAr_~T6BOic7#aY9VE~7Q
yS%cs+kt~MYj2{m@;9}l%C}T!@<6RC<b_UZGOspEGEn|Ti89ZJ6T-G@yGywpj4;teD

literal 0
HcmV?d00001

diff --git a/homedecor/textures/homedecor_generic_wood_dark.png b/homedecor/textures/homedecor_generic_wood_dark.png
deleted file mode 100644
index 88b835d0ed7ce43cd00398f90426fd46d23325f8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 251
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!O@L2`tC5nBp`wtgB(I6Gu$ii`
znToKnvXGsYn1hbEv67Ivs)&QOxRb7gk~oiw1h2iexTXxhsfw_=6rZi8m`9_DCD5EI
zPZ!4!2}#z2fkCYXBCH!^7Ko-D`1}4czsRj}UnNh6xVKYtO+0PaHry!QzDQjmyg{jJ
z4#SG`x=~MAGgQBwoi(4KvRILUW9=6+#-#fO)0WqpCGWGWcg$a${x9{cIfE+8-x>R!
sS-oSolsxTxug)iBvW)PtPhex}Cv4Yk-uC1&6VMe5p00i_>zopr0OvGHWB>pF

diff --git a/homedecor/textures/homedecor_generic_wood_mahogany.png b/homedecor/textures/homedecor_generic_wood_mahogany.png
deleted file mode 100644
index 25ab29fb9023768b5278a859767e5935e739679c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 588
zcmV-S0<-;zP)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM0006LNkl<ZD9;7K
z*@`4Z6adh>X5?1Y_ROFo3ciZqN6gRozdnm1B8WCKy;NppM#Nn_2Y>nWlUb<hSsN3k
zCx{@ph@^RDYEeW?_ZA>b^6|sFaUemM3R=L3a5^9*6W$MdShRU~WKsO}pZ=kcTt~`G
zRje(U@U=S-6yoam?blO8*gcLG-EvU*Y9{&p#jRUr$}osZIz~pcdlLWlAF^s%4>wls
znSZ>Hd|yni^w(>=A48!!<}$E63_>CdVPP!W9oAXeVGb@Vm_2LljZ??ct$jHI5yv4R
zLXZHXFyFSWgpeRFcTh&rfe1#43<jjktgWjsQB=$BunfcV;T|b(L1D4qk5=(%=T_Tt
zz4X=*k_8a4_l}56;o*cJ?@LZXvM#K=pYH2$)*1|#sQ|#=2fUL2096PNQju<652Im(
z=Ibbhah`^rXaNx+0*ujHJ!`Tuddf0Sh{%wG%4vaw=FuFE)+3@D_`u^dUnbsr4ovdr
z=Q|U!C}eBhn0Xk-a0_z)h~D3Hj??}<Gu!|`et6L832w8Jtn#$=+x@nJLBKSZ%XNI-
zD;F$?MH!Gpg%69{e$*n}9001}MX`n1c5M5(T&5oQeA`MX-#jk-<HtvUH234Es<N*0
z>Dc#E2zzGjzU?QAT(3)Q_VoFUfBx=q+fHIiglZlECqO@rm)dnG%VkZ-eLugvZe<*0
a9RCMJ8ETp~4Ig;`0000<MNUMnLSTZqdJyaY

diff --git a/homedecor/textures/homedecor_generic_wood_plain.png b/homedecor/textures/homedecor_generic_wood_plain.png
new file mode 100644
index 0000000000000000000000000000000000000000..4df1e39c34173edf8032e59a53a96df4e36b9f22
GIT binary patch
literal 605
zcmV-j0;2tiP)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM0006cNkl<ZD9;7K
zS#sny3;<9N1Q$_i%WgYUl}b*Lqvm}1P0HhCdJ`#%1cAI~{`vc_0b~&oQP5e7g03Dq
z&tbHkTQe#QM5qGjouNk_r?(g3!2o@4eF$1WYqsxC8FD&BH_feN&@n_tRZ7Wm<9-~X
z3ZkMePB1Ttn;Ml?Td$Ytv><3da%)VzRtmDN>*#%`f&x0&bDopu#%{7iRPqi6V9-#Y
zFwaBq=w{!J^t1{OKA6&ayMCiV08`86gK^Fyn$CtwK4O}V?T(1`7${x9O3rCsK-E~E
zp77Z2Wc4@<S)%prb$~l$55Xe^6($6<zzp1W9fgIA3+g7q3@%Y^m~#OmCIqJ_#<#|X
z96`tF4BAD2w}-cCtT)Ec<566UJ|-km?l1-bKrd>6%T*M$RTr%Gqi<b7$%ep<x!)%T
z<Q%||-Ug3ScCt9l&dk2m-nj!PTEv!Xazppq<>&i$y{f47lZ|P5dgj5~qiXM{qL%VL
z^42Nf{{HV{4t71CjdPdps|AfI_&KGQALViXbt&sQJ7ZFc2Mawe_aDDKx87>L>5!M#
zb7Q^V$|4%)c}bpQEVT=>3Oi2}m-PL02@a>_R6G3leoxW8zOMT)*J}mo2ofh(#~2Dn
z2P}m{@EyX(SFxz;DJ<*q^{ZSzZx-32seAi)zs2ZIFVEfqdhb7rXA{qV{E05)+&(_G
r5X|}aH{Q!patPMN@YtA8m#5`_-}rj6PI!GA00000NkvXXu0mjfsVf|n

literal 0
HcmV?d00001

diff --git a/homedecor/textures/homedecor_generic_wood_white.png b/homedecor/textures/homedecor_generic_wood_white.png
deleted file mode 100644
index 1089b65e455e6c463ac73b0d2005d7bb7a350ee6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 246
zcmeAS@N?(olHy`uVBq!ia0vp^0wBx*Bp9q_EZ7UA_IkQFhDb>29^}qDtiZz%aQ}bL
zS$1iEU#T>wgGPc~*L|z`r)Adq^k>FBmo(I2y!N(Ye$~9(%Sxw=Q!;<f4bt8lZMDy@
zLqf?|SWwu|)uZ+M7W3VI_dU^)^x}+}e><)_OMLAIA+N=mldZB!Jq0qO4jt(b5#;1N
zbJu;k30vouH5ZPY`M;r4g!%vVscrQR2Rs^QbcU&MG5)!(5c>VL{ejr_o0nFvy1&zU
u%j!-`FYEpN@6-x%B99#EE1LQ^^DnzX#``6VaW@n|9`bbcb6Mw<&;$U*i(--h

diff --git a/homedecor/wardrobe.lua b/homedecor/wardrobe.lua
index eb394884..7ce388b1 100644
--- a/homedecor/wardrobe.lua
+++ b/homedecor/wardrobe.lua
@@ -8,7 +8,7 @@ local wd_cbox = {
 homedecor.register("wardrobe", {
 	mesh = "homedecor_bedroom_wardrobe.obj",
 	tiles = {
-		"homedecor_generic_wood_beech.png",
+		homedecor.plain_wood,
 		"homedecor_wardrobe_drawers.png",
 		"homedecor_wardrobe_doors.png"
 	},
-- 
GitLab