From e67bdcafd3f993bea6e84a8238c60d0130782e17 Mon Sep 17 00:00:00 2001
From: Vanessa Ezekowitz <vanessaezekowitz@gmail.com>
Date: Sun, 21 Jun 2015 21:03:09 -0400
Subject: [PATCH] made potted flowers directly reference minetest_game flower
 images where possible.

---
 homedecor/misc-nodes.lua                          |   5 ++++-
 ...decor_potted_bonsai.png => flowers_bonsai.png} | Bin
 ...decor_potted_cactus.png => flowers_cactus.png} | Bin
 .../textures/homedecor_potted_dandelion_white.png | Bin 131 -> 0 bytes
 .../homedecor_potted_dandelion_yellow.png         | Bin 133 -> 0 bytes
 homedecor/textures/homedecor_potted_geranium.png  | Bin 163 -> 0 bytes
 homedecor/textures/homedecor_potted_rose.png      | Bin 136 -> 0 bytes
 homedecor/textures/homedecor_potted_tulip.png     | Bin 143 -> 0 bytes
 homedecor/textures/homedecor_potted_viola.png     | Bin 130 -> 0 bytes
 9 files changed, 4 insertions(+), 1 deletion(-)
 rename homedecor/textures/{homedecor_potted_bonsai.png => flowers_bonsai.png} (100%)
 rename homedecor/textures/{homedecor_potted_cactus.png => flowers_cactus.png} (100%)
 delete mode 100644 homedecor/textures/homedecor_potted_dandelion_white.png
 delete mode 100644 homedecor/textures/homedecor_potted_dandelion_yellow.png
 delete mode 100644 homedecor/textures/homedecor_potted_geranium.png
 delete mode 100644 homedecor/textures/homedecor_potted_rose.png
 delete mode 100644 homedecor/textures/homedecor_potted_tulip.png
 delete mode 100644 homedecor/textures/homedecor_potted_viola.png

diff --git a/homedecor/misc-nodes.lua b/homedecor/misc-nodes.lua
index 86957584..5464de4d 100644
--- a/homedecor/misc-nodes.lua
+++ b/homedecor/misc-nodes.lua
@@ -98,7 +98,10 @@ for i in ipairs(flowers_list) do
 	homedecor.register("potted_"..flower, {
 		description = S("Potted flower ("..flowerdesc..")"),
 		mesh = "homedecor_flowerpot_small.obj",
-		tiles = {"homedecor_potted_"..flower..".png", "homedecor_potted.png"},
+		tiles = {
+			"flowers_"..flower..".png",
+			"homedecor_potted.png"
+		},
 		walkable = false,
 		groups = {snappy = 3},
 		sounds = default.node_sound_glass_defaults(),
diff --git a/homedecor/textures/homedecor_potted_bonsai.png b/homedecor/textures/flowers_bonsai.png
similarity index 100%
rename from homedecor/textures/homedecor_potted_bonsai.png
rename to homedecor/textures/flowers_bonsai.png
diff --git a/homedecor/textures/homedecor_potted_cactus.png b/homedecor/textures/flowers_cactus.png
similarity index 100%
rename from homedecor/textures/homedecor_potted_cactus.png
rename to homedecor/textures/flowers_cactus.png
diff --git a/homedecor/textures/homedecor_potted_dandelion_white.png b/homedecor/textures/homedecor_potted_dandelion_white.png
deleted file mode 100644
index 0b0a8230a32e702aa7afedf04cdfd18a71df53fb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 131
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPHV5AX?b1=5$VpZA-^wrlS;lQfo^
zZrABRA;yv*zhDN3XE)M-93@W|#}JO|$qQr*xSS-LnwSFG7Ba-J`0_S0_bhBU7{HXo
YV7HL5)<Jb*7*I8Xr>mdKI;Vst09sumc>n+a

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

literal 133
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPHV5AX?b1=9b|FnA_d{h!GYl5fSG
z%(x#Y#8?vK7tG-B>_!@pqvGk}7{YNqSwV<{%OS%p+1Y~Gx2utJ*$vL-gDmM52?haI
a7#KRIG0EP2;+_gr&*16m=d#Wzp$PyT>?1z_

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

literal 163
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPGa3-AeX1=6m87Y!WG_(yHjv7Qx@
zZ|0F?(A<8`!dH9O?gz@3CVd5}U@Qsp3ubV5b|VeQG4^zE4B@z*tRQY6Z6w_wspF&-
zpm<h^v17_Ej+TQGPdKI~iL}1tZn(rL7{C_I#_Yq<!MOPfi}aLGdrhEr22WQ%mvv4F
FO#t@rF5CbB

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

literal 136
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPHV5AX?b1=1cV`ZF0A&M+`o_!{H|
zurL9I7)yfuf*Bm1-ADs+)ID7sLpZJ{AK;(SyMRYIm6gN!q{OL&pe9YBhD&`0Y|6|%
dicYJf7*@G3If*uX@dRpN@O1TaS?83{1OU`{A<zH-

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

literal 143
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPE^3h)VW1=9c17(()`Jrk@ge6{}1
zWGHq0nFbVPED7=pW^j0R1H{qxba4#fxSp&a%E93vxyYbRq37U{hGPkB#xo>E6m-&O
jOz0MzaxjS@xq*Yh!H}_2cb}jdP#c4%tDnm{r-UW|%lsz4

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

literal 130
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPHV5AX?b1=6Jf)qb<sOww3lOw+V`
z%XR^U7)yfuf*Bm1-ADs+6g^!WLpZJ{FHjR`xYX1XAhuX}7e_Or&qk&xX+dcYlb9Iv
X_b|rv|MJ-eRLtP%>gTe~DWM4fxAY?`