From 66dcae6e45f56ed07c4bcf5aa7ceddbb3937a9c1 Mon Sep 17 00:00:00 2001
From: Wuzzy <almikes@aol.com>
Date: Tue, 14 Mar 2017 18:53:31 +0100
Subject: [PATCH] Add rose bush and lilac

---
 mods/ITEMS/mcl_flowers/init.lua                   |  10 +++++++---
 .../mcl_flowers_double_plant_rose_bottom.png      | Bin 0 -> 900 bytes
 .../mcl_flowers_double_plant_rose_top.png         | Bin 0 -> 655 bytes
 .../mcl_flowers_double_plant_syringa_bottom.png   | Bin 0 -> 638 bytes
 .../mcl_flowers_double_plant_syringa_top.png      | Bin 0 -> 626 bytes
 5 files changed, 7 insertions(+), 3 deletions(-)
 create mode 100644 mods/ITEMS/mcl_flowers/textures/mcl_flowers_double_plant_rose_bottom.png
 create mode 100644 mods/ITEMS/mcl_flowers/textures/mcl_flowers_double_plant_rose_top.png
 create mode 100644 mods/ITEMS/mcl_flowers/textures/mcl_flowers_double_plant_syringa_bottom.png
 create mode 100644 mods/ITEMS/mcl_flowers/textures/mcl_flowers_double_plant_syringa_top.png

diff --git a/mods/ITEMS/mcl_flowers/init.lua b/mods/ITEMS/mcl_flowers/init.lua
index f7af8aa8..14b08ffe 100644
--- a/mods/ITEMS/mcl_flowers/init.lua
+++ b/mods/ITEMS/mcl_flowers/init.lua
@@ -71,7 +71,10 @@ minetest.register_node("mcl_flowers:fern", {
 	},
 })
 
-local function add_large_flower(name, desc, longdesc, inv_img, bottom_img, top_img)
+local function add_large_flower(name, desc, longdesc, bottom_img, top_img, inv_img)
+	if not inv_img then
+		inv_img = top_img
+	end
 	minetest.register_node("mcl_flowers:"..name, {
 		description = desc,
 		_doc_items_longdesc = longdesc,
@@ -146,8 +149,9 @@ local function add_large_flower(name, desc, longdesc, inv_img, bottom_img, top_i
 	})
 end
 
-add_large_flower("peony", "Peony", nil, "mcl_flowers_double_plant_paeonia_top.png", "mcl_flowers_double_plant_paeonia_bottom.png", "mcl_flowers_double_plant_paeonia_top.png")
-
+add_large_flower("peony", "Peony", nil, "mcl_flowers_double_plant_paeonia_bottom.png", "mcl_flowers_double_plant_paeonia_top.png")
+add_large_flower("rose_bush", "Rose Bush", nil, "mcl_flowers_double_plant_rose_bottom.png", "mcl_flowers_double_plant_rose_top.png")
+add_large_flower("lilac", "Lilac", nil, "mcl_flowers_double_plant_syringa_bottom.png", "mcl_flowers_double_plant_syringa_top.png")
 
 -- Lily Pad
 minetest.register_node("mcl_flowers:waterlily", {
diff --git a/mods/ITEMS/mcl_flowers/textures/mcl_flowers_double_plant_rose_bottom.png b/mods/ITEMS/mcl_flowers/textures/mcl_flowers_double_plant_rose_bottom.png
new file mode 100644
index 0000000000000000000000000000000000000000..1802fd1eb7686f2579c7bd333346b1bc67a44450
GIT binary patch
literal 900
zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4rT@h2A3sW#~2tGSkfJR9T^xl_H+M9WCckk
zdj$D1FjT2BFf=qXF#P<_z|ioLfuYoZf#FpG1B2BJ1_tr`N%2SB7#JAx1AIbU|Ns9#
zk%?6xnSsTQL1h91iw%QVJA<J)1G71UP!R)95d)h)1FJQI!5juV7Y2bUhVQNp-`V+h
zv2tHz<1{p5;0k5Xn#LfQ&mdaKAkxAh+`yoq#$ayCAXLvF-^IY0&A=MRz!u2BU&+7{
z&hY>Le=G0&?F<YIj3q&S!3+-1Zlr-YN#5=*3>~bp9t;c&oCO|{#S9GG!XV7ZFl&wk
z0|NtliKnkC`$J|vAzfp$*UHTd42&N<T^vI!PUi+cth!~u)ALqCaH7G+UNMckY_EUs
zf9%)jw9C)_)6HF*Ypk?m+d1SehObnYdStOFzwEBD+JniDjRctewc<JN?mK_;W8Eps
zRVsn++IAddKW_a}xzMh`@lf=h*Vli`PG2GtS)#Y}jQ$}77YqBqA||ghOWQ8Q^>i*%
z*<vrJD%dHv<I1%tjkm#vM1mjfl|3jVx~+BvZ}^s18Ru?hYrj8P7$o*juxa{=L|gtl
z3;e1()aSUjGWV<$HIfr5-lnnZOGD|=;(1}^^M#BhrF!-%%;49t<ky$cH8<L^xNzp)
z{|@hj&+@B3dz7{4sLGq{`;CTE#hQ%MzC>>fOP=}Ov&O@TckPuRt0z)njJI}Jh~H&@
zlXZC00nQn>PQ_?<dhXoa%v96FzjckD!fQ{#$L-b+dnznT#U(YIj@+HQc_EX;*NZP_
zxkzg|N<EtMV0Yukmq%XRyxnAZ`J$hiHs9)&N69bd{4_hYBAMl3QQ@4)!e+*)-1jVJ
z&3mH6r7Rp*wq3QP!ryG_<PBZ%&2P(A-M^pv(4%vq<H;Kz=NHa>qOLsYVS8jmkI!|c
z=sTf*HU&O4XFFzKp<EyOpz-i2yC}ArJFdT`3$P3AJa(G3<@ULK4`aWl2mIS{$@P(*
z(}{AY?L5n0v#b4Xllp)7;0~^W-4ks;?%&a^$Wn6S@n;4G2GtVRh?11Vl2ohYqSVBa
zR0bmhLvvjNV_id&5JL+q6H_ZwLu~^?D+2?KZ5>@G8glbfGSez?YlwVpV8+0}z~JfX
K=d#Wzp$P!=oKX(|

literal 0
HcmV?d00001

diff --git a/mods/ITEMS/mcl_flowers/textures/mcl_flowers_double_plant_rose_top.png b/mods/ITEMS/mcl_flowers/textures/mcl_flowers_double_plant_rose_top.png
new file mode 100644
index 0000000000000000000000000000000000000000..ab055e02379a2aa6335219633ef42b2649ebb0bc
GIT binary patch
literal 655
zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I7G?$phQ^Te;|vT8Ea{HEjtmSN`?>!lvVtU&
zJ%W507^+km7#f-x7=Hd|U}$*Bz))(y!0;-8fx&791A}<}r1+z53=9kg0X`wF|NsC0
z?&`3Mm3tx+>qR!s@9g{n$qWW_7zFbf#M&9`To{Ck7<h^pSnL>BY#9Fk|9|-)*DMAG
z2F8*gzhDN3XE)M7oFs2|7k-Id3^y4V7&r?&B8wRqxP?KOkzv*x2?hoR_7YEDSN4a@
zd_ua$X0Mf-85kI?JY5_^G|u-<+?#jEK%|x5zVwlgL!y4^CiiVG;wIZLDBd(abj&4u
ziC1XisU!aC#||l%yvqKfTG1AFd!<0MZuGuiZ>rzzH2ZM=;tSh*P3taw<UMgI=1zmg
zl~=RkZ5GU2DdGCi!9UAjVS%|^sm_dNm&O0{dZbtsHl1(M&%CZA8zqotcx}t}!-*-5
zlfT?NE;!HUnBUeVTOA9kLSJz`JMetr(>wDxc|7JP#zzUPxo|>h(+0imda3P=lU52o
z<EuC^$s_#fvUjQ$j^ec&o9lllcbl1dm(~<Lb~zVh6DqRiwf3JILB`To4#YRS*R{C5
zWYc87EZ*clr;nVwk#H$dR9)D8-zNWA%fClR?o4>8$1(GGF|*C}XuZq(l0uH$4nEA*
zv+Ilcdj`X_Q)Z<~NoNjdHqH!M8?Yk(PeQe#`~m%&`|K9mdS8fQU|>)!ag8WRNi0dV
zN-j!GEJ<ZBGB7mPH89pSGzl@Zure{VGBwmTFtjo-(Ad_|g`y!hKP5A*61RrP*9K+`
P3=9mOu6{1-oD!M<MIrIB

literal 0
HcmV?d00001

diff --git a/mods/ITEMS/mcl_flowers/textures/mcl_flowers_double_plant_syringa_bottom.png b/mods/ITEMS/mcl_flowers/textures/mcl_flowers_double_plant_syringa_bottom.png
new file mode 100644
index 0000000000000000000000000000000000000000..2031aaf00dfbb8a68dfb7fd819049b984f516d22
GIT binary patch
literal 638
zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I7G?$phQ^Te;|vT8Ea{HEjtmSN`?>!lvVtU&
zJ%W507^+km7#f-x7=Hd|U}$*Bz))(y!0;-8fx&791A}<}r1+z53=9mq0X`wF|NsBr
zHFw{t_Vx2CmUwn+n3jozFER3)u4UgSckjTXqRBCt&0#(hwes3y{{R1P>)<8Az`(#*
z666=m;PC858i<qR?e4;tzt_N@fq{Xuz$3Dlfq`2Xgc%uT&5>YWU|=ut^mS!_$jm3C
zYi#yfxtW21QODE8F+}5hYrnPk;Q)!Y`!d}s(H4z*dh_OKc1$?EB;ZBDZ63bJJH|_v
zG&eUnA8%NhvSs<?*(Jd*<Ug=a;mf=EDcfe}q_mIH`%WJ&uVxH5$KWHl(CpaCFZX^1
zGs}GZ%c*1IkgRH9yuOY}CrQBZzPD3PH?!CUi*o(h8-FKoImWI!J*UpY+@j)C?y*y{
z%DXu>PkAGoD4K9sw$kiNyX0!KfW*@}UzC?yF}8l3+iFnh_FLkt<g~cx)5q79TO4cc
z@OAB&@h~E1vAOSMg$WHe^|FuOt4mhunHVS5`s<6~v+CvZZrn1vvb$o&%&jJqgPBjN
z6lL1(U#hqH($8$|*oQXaS<ekuru}K1&UZoL{8v#c+ar?xPFLNpPb#Pla_04yZb)5!
z>{a}OuLpPW%f0%+&i~&gH2%Z;)eH;_swJ)wB`Jv|saDBFsfi`23`Pcq=DG&Px`rkp
xh89*PrdFng+6IPJ1_m12I=WCa<mRVjrd8tB5c%4`jDdlH!PC{xWt~$(698F^?Ct;n

literal 0
HcmV?d00001

diff --git a/mods/ITEMS/mcl_flowers/textures/mcl_flowers_double_plant_syringa_top.png b/mods/ITEMS/mcl_flowers/textures/mcl_flowers_double_plant_syringa_top.png
new file mode 100644
index 0000000000000000000000000000000000000000..f89a8eae9ce1beabe2f8fd2c547585e1a8b35c80
GIT binary patch
literal 626
zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I7G?$phQ^Te;|vT8Ea{HEjtmSN`?>!lvVtU&
zJ%W507^+km7#f-x7=Hd|U}$*Bz))(y!0;-8fx&791A}<}r1+z53=9lf0X`wF|NsBL
zci_>g_Vv5w?wen+q-b(XW^-8h5~IM0hMwIT_Kk9;Wg>plwf_JAAG+aTE&~GtV@Z%-
zFoVOh8)+a;lDE4H@3$?9Ul|w}I14-?iy0WWg+Z8+Vb&Z81_lQ95>H=O_J_=TLb}Fg
zua%n_7#Nj3T^vI+&i78(=y%vapl!XU3YX4_M~stxB>4G>6+bmup}cB}jRWJxv_)J=
z{0612I+23j<`W_+Olrz}F8A_mdvE>w|9|cS_4_9OH9GOs&Ot@=w(!%LcUN3!;!kYc
zW;pS)*T>+-)@tP!MVZ@}o<DJDsW={$DpV~WWg;-mwD*tof-KW*^UYG%))*#!%&Qe<
zzsGv^?%}dzC9BZRm66d5Yg@c^x@I(b&WI3D;$#cSoUU_WhJnRu!PuakS9n%Uonblq
za`ffQ<==(c6@ES9dhjsyx45xY`Uk^**>f51n@yHa<y~*<9#r>W`LnwoDl0xS%9Oep
zE2yT&J$+rt?YS!S*}=l=%|StLd+f{uu2pVh&gK8Q^>fFY3va(YNPn?(mj1qji`UjM
zDmIwTT(&;_Gy?;JYKdz^NlIc#s#S7PYGO$$gOP!uxvqh+uAxbYp@o%+sg<drwt=CQ
lfq}-hjxH1px%nxXX_dG&M7}mKV_;xl@O1TaS?83{1OVfu=sW-b

literal 0
HcmV?d00001