From 1646bf4157bac9ac0d9212586f18a08c3dcd046d Mon Sep 17 00:00:00 2001
From: Vanessa Ezekowitz <vanessaezekowitz@gmail.com>
Date: Tue, 28 Jul 2015 07:37:45 -0400
Subject: [PATCH] moved shrubbery to home decor mod

---
 crafts.lua                                |  25 -------------
 init.lua                                  |  42 ----------------------
 textures/gloopblocks_shrubbery_bottom.png | Bin 404 -> 0 bytes
 textures/gloopblocks_shrubbery_sides.png  | Bin 317 -> 0 bytes
 textures/gloopblocks_shrubbery_top.png    | Bin 198 -> 0 bytes
 5 files changed, 67 deletions(-)
 delete mode 100644 textures/gloopblocks_shrubbery_bottom.png
 delete mode 100644 textures/gloopblocks_shrubbery_sides.png
 delete mode 100644 textures/gloopblocks_shrubbery_top.png

diff --git a/crafts.lua b/crafts.lua
index 5ea31d4..63b377a 100644
--- a/crafts.lua
+++ b/crafts.lua
@@ -358,28 +358,3 @@ minetest.register_craft({
 	}
 })
 
-minetest.register_craft({
-	output = "gloopblocks:shrubbery 3",
-	recipe = {
-		{ "group:leaves", "group:leaves", "group:leaves" },
-		{ "group:leaves", "group:leaves", "group:leaves" },
-		{ "group:stick", "group:stick", "group:stick" }
-	}
-})
-
-minetest.register_craft({
-	type = "shapeless",
-	output = "gloopblocks:shrubbery_large",
-	recipe = {
-		"gloopblocks:shrubbery"
-	}
-})
-
-minetest.register_craft({
-	type = "shapeless",
-	output = "gloopblocks:shrubbery",
-	recipe = {
-		"gloopblocks:shrubbery_large"
-	}
-})
-
diff --git a/init.lua b/init.lua
index 9c12903..67c2630 100644
--- a/init.lua
+++ b/init.lua
@@ -17,48 +17,6 @@ end
 
 -- Nodes
 
-minetest.register_node("gloopblocks:shrubbery_large", {
-	description = S("Shrubbery"),
-	drawtype = "allfaces_optional",
-	tiles = {"gloopblocks_shrubbery_top.png"},
-	paramtype = "light",
-	is_ground_content = false,
-	groups = {snappy=3, flammable=2},
-	sounds = default.node_sound_leaves_defaults(),
-})
-
-minetest.register_node("gloopblocks:shrubbery", {
-	description = S("Shrubbery"),
-	drawtype = "nodebox",
-	tiles = {
-		"gloopblocks_shrubbery_top.png",
-		"gloopblocks_shrubbery_bottom.png",
-		"gloopblocks_shrubbery_sides.png"
-	},
-	paramtype = "light",
-	is_ground_content = false,
-	groups = {snappy=3, flammable=2},
-	sounds = default.node_sound_leaves_defaults(),
-	node_box = {
-		type = "fixed",
-		fixed = {
-			{-0.312500,-0.500000,0.250000,-0.187500,-0.437500,0.375000}, --NodeBox 1
-			{0.187500,-0.500000,-0.125000,0.312500,-0.437500,0.000000}, --NodeBox 2
-			{0.000000,-0.500000,-0.312500,0.125000,-0.437500,-0.187500}, --NodeBox 3
-			{-0.375000,-0.500000,-0.062500,-0.250000,-0.437500,0.062500}, --NodeBox 4
-			{0.000000,-0.500000,-0.250000,0.125000,-0.437500,-0.125000}, --NodeBox 5
-			{0.187500,-0.437500,-0.187500,0.375000,-0.375000,0.062500}, --NodeBox 6
-			{-0.062500,-0.437500,0.125000,0.187500,-0.375000,0.375000}, --NodeBox 7
-			{-0.062500,-0.437500,-0.375000,0.187500,-0.375000,-0.062500}, --NodeBox 8
-			{-0.375000,-0.437500,0.187500,-0.125000,-0.375000,0.431179}, --NodeBox 9
-			{-0.437500,-0.437500,-0.125000,-0.187500,-0.375000,0.125000}, --NodeBox 10
-			{-0.437500,-0.375000,-0.437500,0.439966,-0.312500,0.420887}, --NodeBox 11
-			{-0.500000,-0.312500,-0.500000,0.500000,0.500000,0.500000}, --NodeBox 12
-			{0.000000,-0.500000,0.187500,0.125000,-0.437500,0.312500}, --NodeBox 13
-		}
-	}
-})
-
 minetest.register_node("gloopblocks:rainbow_block", {
 	description = S("Rainbow Block"),
 	tiles = {"gloopblocks_rainbow_block.png"},
diff --git a/textures/gloopblocks_shrubbery_bottom.png b/textures/gloopblocks_shrubbery_bottom.png
deleted file mode 100644
index 15b0b6d8c7268a5f7de5abeb104967532e811611..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 404
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbMf(g2?jS9S&l1%3uy2?jkW2198E
zLuCddWd>sz22(i(GkFFxJqAl91}h~7J1Z`GOD;!sMkgTBV06}CcJ|_O)nazjVs_VN
zao1(>)MfF}XZ6)*^)qA*Fk%lhW)CuE4>9EkHRFh~;)=22j<M#BwdRhq<xa5WNwDKd
zwBt##=Sg+qOLOAObmh+iA~*gVH~w6AfqZv?azEkP5V86YvCbH&o>-|*T>Jfj4qoNy
z;us<!$$GF`iHT9b;o`?#5_eK;PHod#d&?u_$AAA~zY9Kp%QB7|OZ#`Mb)9tO8vja9
zkG?H}E4BY~EP0{2QF(Q*zRSCHhI_xBG`P%q;=pg0MLRWOt`>euT3alaBq#dmfzWdo
zbyd%a77LraBXfW7h%a0FurYX*XWCYQxaLFG`X)aAV%_<~aOpR_*l<5y_I=ye37P-Q
u{#rOqq*~DW;)}YxHuihR`X=7_$p6SnF#E{QGY5dKX7F_Nb6Mw<&;$S!oPg8-

diff --git a/textures/gloopblocks_shrubbery_sides.png b/textures/gloopblocks_shrubbery_sides.png
deleted file mode 100644
index 6c9661a55597014047c3745567a02f70a7c430d3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 317
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbK}LV!<*E0E?_;ghluk`-f6kYiAm
zVo+0NP*-EskYvy_Vbzjj&<&N>(_qlkVKcO1GgV?XHRdog;;>X^aMEOP(q?nhV|TC8
z^U!7YGT;a@;S4t8Ot9lgvFFWn<}30MD)AAz_2Xa@&<@6uAirP+hi5m^fShhm7sn6@
zN!EkhPFEQO4jf2X7!s$`b>Pwb-}fg;wsZ(^E-aOqexg;T>x}A=n3INcSkJJ`?#NIx
z=`?IKoi=e=V@||mgO)oo*9~J-96QvMj-;k|9yE1w@^Dj|-XZ(wPtm?w>-hKY&&~h-
z|J?ELzV^p2e-z7JFWeh{y!7Mi$G`jkZ@;g9UVr=Z+t>GR_rHFE?NHT~rxStBV(@hJ
Kb6Mw<&;$THQE7Vs

diff --git a/textures/gloopblocks_shrubbery_top.png b/textures/gloopblocks_shrubbery_top.png
deleted file mode 100644
index 7434857e7b0d1a21727f40dcbbdcaf0eb9c42640..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 198
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPHV5AX?b1<@*eQWiqGq4MrkdRu?4
z-v$(7ED7=pW^j0RBMrz&^>lFz;gDrL$SBz2z{7mt%O@tQFDw@hIxw+u{d4`RHz|dM
zxn{S!+>e@w*^ReeUNhv7E}ghz{fZFj3e&Te4}XWR<SN*G|C*bWXIx9sdKvXHLkWYb
q$|e01c4QS6yxH=UJ;0&#i2R;D-q@YKdW(S;GI+ZBxvX<aXaWG`a6-@k