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 f7af8aa80..14b08ffe1 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
zcmZ{bdr;E_0LQ=VDFYmAJah$7yp{|7jp<&*W4kT3lmX)<k|0g6<hTh86rvmhfzi4`
z&OmNzmKNIM0u3gF1_&jZMR^Ixf(`P5iALFRhUYr|?2rEV{PDTZeaxwvBp(Kc0l-JC
zQfL8$uCa~`Kyjvd6aZzPELjG0z3cV3fVviSDs3`Q9RV2YfJbh?xByfTz~UZ2+71Ni
zkLHiO1VEp<BSYzSyIV+9UmYm%2!9Wh7ZKP9z6fLySY_}o11$yASP)jkE8ts=6=mWI
zo!LkA8mD>kg<xc2)BEt#BcKZY^<Wzj8VOMxScmaUGdzny%>ykB%qmc_;dZ;F+x5Kw
zJPcY*Iuh?r6s^gt+mjS%q6Vt~cpgyYlmlMuH9XK^-2i}YP$w(t4)S_dv_R+zs{=g#
zP%C5^;_D^pj_N7G+p@&<YazPc3FO*ouGK4Znp%0ECgIP?z6&){-tNYAA>-NSqBu@*
zx4zOYh@5Smi}59=Y|8hvU;bfo`K>X@`S7&+4Yoo0x3LRhrSV4DQ0~{R+pEECXZ&*v
zo6p|ZG8C#1C#02;UcPa*;m16S`Qz}52_X@F<`CPhUv_bq(ue%hoddyxtbm?3JAJY*
zF1~hivY7YaTB$bhiJz&hvmlN+{ek9<rYLLD5whi6Kuid$yocNO&{#22elqLeDVAU(
z$1)Jw&U`__-12m^D8}|t>G1(~;(hk_%&5E0{U45m-z%P}<sS<)35p)(c4g^~KTy}G
z<UXI@(n{w!Ssqh1agd#UZ~t)jH=gZNW3TYc>P!7~q#6_RtIsr{F16oWW30n+NKz5B
zkt@GyKXKtSX~W;+3muB5o|kc)*4h5r<%O$@lXpy#pT{+ky!D^fJ9WQX9|^}gbreTg
zskN0Y6cl>>D(N^m{~RNXombf#VK|f`Jl6VUbAH`Y<@uSJ5{JrsT6S$>`BdqN`KYj?
zj>epwmL0cAxzm}CyVHIX(MAbz*x}6C+TpSIU9_5M<v(q{bk?QO>(u%?H!nMOuk1^G
zV*5$y+${g@puE@n6Bj*lwSnUv9<(tI^tZ$<U$MRYEX6P}_ZNT&gL0=~Z-Jpusw*oj
zFccz&;ESROK{S7B245`Qx=p%`&m;I!g5dTvHUDQQ(eHh|sOtZR92X%30JT!1_(HzN
F^e^<BQ4atB

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
zcmZ{bTS$`u07gIamY3<glvZ?685*|vFLjPFZHujKsZ-{}Te!__ibl=m2Bt-GQg$WO
z7ad|rQVAwGQc-9uH5Ci*q(ccTTslJw1S<xA?6HR)&coqw?&V5Fl)$5b04Nf%KnCEH
z2On<$4f2Xf06rD`Y(CKcILNK?^+dH;mJQU=08=CIn*>Z-fRO-PN`TV_MCn=-?=Ju#
za<k+@k|g(qyb<4^<^#U-egXUbp;R@94ut7&xCt2ogzFKkhffB4xFAV#@m-(=fR{lg
z%>&Q5QtpwmOpzcodISyt0oCH78XzdbgBL6v(E$7nl5C;>x_3x8J(;x~*9drVBm%xX
zVfIn;+pD8Q<n7RN#xGesRg%#v8r&>x<s!zBJUSsL=)Rb*njX)IpBRlZxGwL}YVVY;
z_E1acCAL4`>vx7(KW67Q(?6U07JgEu7A~!s5|&&R1@~!tPqc8Ims3S_Ri~XWo@sL~
zMv)Y;hJDREYfh?Mjy+yXEoXjuGc=~s@LTsBlVP1%6Vie10e*E|zAMma|JJp!))^2i
zexgzoQ+wy8Vy&+kLkw+GLrYJXGo*H^MO?7)e22#7N8Rjiy!9*Y0V_4rctihHFeBsU
zNA_+fx>sb$$Cm60(=MI8+-+@@R#DXM592c{$_3S-_z02BnqzsfUwC9#xy3lxK3U_<
zT`plP+REhPt9fI74@dUmcfl;5W*KA4KH5(=w98)QzSOyu^)V;yNe)}av-HflVgNLQ
zu+X4U8MGX=UaK-_ah71F(TQX_Geyp1b5c?{smw%z$sve@!MpeW8LsFwmF3s}KNM{f
OEC7%QrGmcmO7mYuA@Q;R

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