From d646a07ee6ed230274dd9f702c9cfd819fca976d Mon Sep 17 00:00:00 2001
From: Delyth Williams <delyth.angharad@gmail.com>
Date: Thu, 25 Jun 2020 21:12:31 +0000
Subject: [PATCH] Welsh pixie/grassets

---
 .../voxel/sprite/flowers/flower_purple-5.vox  | Bin 0 -> 1360 bytes
 .../voxel/sprite/flowers/flower_purple-6.vox  | Bin 0 -> 1508 bytes
 .../voxel/sprite/flowers/flower_purple-7.vox  | Bin 0 -> 1756 bytes
 .../voxel/sprite/flowers/flower_purple-8.vox  | Bin 0 -> 1884 bytes
 .../voxel/sprite/flowers/flower_red-5.vox     | Bin 0 -> 1444 bytes
 .../voxel/sprite/grass/grass_large-0.vox      | Bin 0 -> 1312 bytes
 .../voxel/sprite/grass/grass_large-1.vox      | Bin 0 -> 2392 bytes
 .../voxel/sprite/grass/grass_large-2.vox      | Bin 0 -> 1804 bytes
 .../voxel/sprite/mushrooms/mushroom-11.vox    | Bin 0 -> 2172 bytes
 .../voxel/sprite/mushrooms/mushroom-12.vox    | Bin 0 -> 1940 bytes
 .../voxel/sprite/mushrooms/mushroom-13.vox    | Bin 0 -> 2568 bytes
 .../voxel/sprite/mushrooms/mushroom-14.vox    | Bin 0 -> 1328 bytes
 .../voxel/sprite/mushrooms/mushroom-15.vox    | Bin 0 -> 1192 bytes
 .../voxel/sprite/mushrooms/mushroom-16.vox    | Bin 0 -> 1600 bytes
 common/src/terrain/block.rs                   |   2 +
 voxygen/src/scene/terrain.rs                  | 122 +++++++++++++++++-
 16 files changed, 121 insertions(+), 3 deletions(-)
 create mode 100644 assets/voxygen/voxel/sprite/flowers/flower_purple-5.vox
 create mode 100644 assets/voxygen/voxel/sprite/flowers/flower_purple-6.vox
 create mode 100644 assets/voxygen/voxel/sprite/flowers/flower_purple-7.vox
 create mode 100644 assets/voxygen/voxel/sprite/flowers/flower_purple-8.vox
 create mode 100644 assets/voxygen/voxel/sprite/flowers/flower_red-5.vox
 create mode 100644 assets/voxygen/voxel/sprite/grass/grass_large-0.vox
 create mode 100644 assets/voxygen/voxel/sprite/grass/grass_large-1.vox
 create mode 100644 assets/voxygen/voxel/sprite/grass/grass_large-2.vox
 create mode 100644 assets/voxygen/voxel/sprite/mushrooms/mushroom-11.vox
 create mode 100644 assets/voxygen/voxel/sprite/mushrooms/mushroom-12.vox
 create mode 100644 assets/voxygen/voxel/sprite/mushrooms/mushroom-13.vox
 create mode 100644 assets/voxygen/voxel/sprite/mushrooms/mushroom-14.vox
 create mode 100644 assets/voxygen/voxel/sprite/mushrooms/mushroom-15.vox
 create mode 100644 assets/voxygen/voxel/sprite/mushrooms/mushroom-16.vox

diff --git a/assets/voxygen/voxel/sprite/flowers/flower_purple-5.vox b/assets/voxygen/voxel/sprite/flowers/flower_purple-5.vox
new file mode 100644
index 0000000000000000000000000000000000000000..ef6786d847fc5e743fd842d48bc11ce8f63f65c0
GIT binary patch
literal 1360
zcmeIy&r6eW90&04uV=1Mq^0Td2mY9X4&4u%PITB~%pB9Q3Cjt2Xc7!{h7DxH=wg>b
zI!%IzFb@UY5`qo}K@gs#d(p|i<K24`g~1LTJ2ZIldA{$@=lg8?K4Zz-3mv;ch*>*!
zi$#oELd?e&qqU_4UtE@5WL-!t#%g6L6=IT<5_zR$K`FJRlzyy~$xC5n6=@RE%1TnC
z$&gUYNGU6?Sq%xzj1*}yrM2OjG)duDQ=~~q$C@Fbm?_6E!zwg0l7<;+lA>l+ktQK)
zRt*WoOx17?uQfB0h8by+!nvYIlaS68LqaiAPVV8gW=7I5BVDTM!b#%hq%BPOSVTM?
z$AACs8DvI^co8aKJMa)se4BVQP(a3;`|D>mp6J5(-8Kx~YlT1Eia^#4d#?qlkHPXi
z#=2b?^ESZmb;0kujL@}4jEr$+svY)BC%S@7@PwMt%dFb(WZSlp8y&@RAW*fBVi8~F
z=ka@EqiX-YCx^MVC1m@yvDTf#dVQjD&fko=AvaRt7G&&pY(}qE^gn-ni61}T;={pC
zMSk{K2M3ohJ-q|3H;IXfEd+zh=<lC9pY2Q4W9UH>mY;Q_!*>Ne{H|wvOZEHlJ`Rtb
z<MsQ~Gsj7!qJK7fr*Kftane(@?-@RQ&rkcJqQ7fdcvtrZvGqNCdlkp=VP(H_#tC2g
z656I5a9_7jywQNhusOd+KH7=IfD7qiH=fS+Asuib+Ur8FrLH^^i9`_Ovk8a82!%rD
M`!dN{l>Pz!0HXE_ivR!s

literal 0
HcmV?d00001

diff --git a/assets/voxygen/voxel/sprite/flowers/flower_purple-6.vox b/assets/voxygen/voxel/sprite/flowers/flower_purple-6.vox
new file mode 100644
index 0000000000000000000000000000000000000000..7a957d70f6e6b8d89b7326c7253925fa2ee2d799
GIT binary patch
literal 1508
zcmeH{%}Z2K7{>3%d(NGyB$_mx{J?L}LB|;z9nrz27;{j|6ikI&G*S$Hg$;;~(Z)83
zv>FK_%3Kt*O9)yR1VOm6_C+iIj;H5p3Inrf*`k3T&wZcgJ@2`5&*hHY7_Z(m3}Yys
zyiPH`DZ>~|PA1N{1%KW@oTiRXOeSBMu4@?gh={Q)Vy=i-t0MM8u_P<DWG#`bO+;i_
zQMG%mh$g1W+LoFZqKIXyd7B7PL=#gKXV51iiZkdF$MqF`B194G)|xd@t~!c)Xzros
zgeYR!dQKBlH0RP6{ZmsNw^q!Et?3ixs-v@FIGo|k3Q@$eomou`aX5p%IGo|kdfZwu
zBetebl&c<hy=O*<B9`r$(ZmvZ;^A6eD|*D%^oSz1=}ik!#In3;O-$RHc8Dp=#CzaS
zO+}AbnmxpJm=WcwoZ1_?b|r4e;ZYd_0|WTazxxbwo$GiSS;1Q9J{|>^@StS{=|JYM
z&#Y&p7CpBr(R#ZAZK(=`=KY9om1E+4_;5ydoe$lCVzdQ(XbYZ4<WdPbyV=uMh4^3%
zYQv?dkCdU2UZMA7Egnavs|(YiP{ACz96pVX;@9G0!Te5r2E&z8m~UFcTwMkWXGik;
z+R8B8?#D#59O-x!mJ%29@{gaN;rox*c(=2W=O5o|YwHyH`!^5>jG?!872)tSnwy7D
zdYdNBqWx|urk~WII(PvM{IADrUH!VhjorO<ym))`%yAIQ%a40+uIwE8IA|!C*LNK4
z`C;40%Quz6o1&LUE^Oh;^8xJd=I1qo9t2b8P}!&9zpRkET8xsYoXl8G)L^8=hg63j
mkB6F&3i*&|^dVecbl4M%#SrG%M59qeB9W7I>9HZWUx43av>_@0

literal 0
HcmV?d00001

diff --git a/assets/voxygen/voxel/sprite/flowers/flower_purple-7.vox b/assets/voxygen/voxel/sprite/flowers/flower_purple-7.vox
new file mode 100644
index 0000000000000000000000000000000000000000..1b2d067e26725f9a7ba49fd20245f8cc2710fd4a
GIT binary patch
literal 1756
zcmeIy&1+Ow7zXfj&)0j-s7Obx#uzas3UM&Wj2#_`L8lU%5Th}H)CjsTp)e#FMFTQ3
zk#5pWMO;M$5wTJ#xKk)}VL=eomAF^B%HQ$$+=PS<WYMLI4*Yn}dERsHIdkVS6X!4P
zyRVcQDG!}vQSZD`<3pDQHm4JQHvP-R$xA~I^h&ILXVF^KL{v@dq%M-wwblzFdO>S*
zTg2Sf+SbI`hIrd>VjG@BY%Q?HbQ~z!MxtC*lOdJ3YC@U}SyGxAY3*u;)siyINRuI(
z&MoI;NUUpk$4Y^mcU4b9fg)LPJQs5kaXc4u%A|Q<PC|iVI**)FNNdLN+<s1zA(i+!
zOG-1-{<CFOh8ZQ685t7mc`jB8<h-AYWX1C=%*B6>teJEk*drgAQ%GyZb6=U&WJo14
zYe{KlTDULAh8ZQ685#0UW`zPdFSC)HFcaZ^90z9PBQpw=s4%0+kV?XgC8e3^z<oG2
z%qX$U$dGqoMktW;VJ4CjW)ip$$AKC7$czGM9hbe06`?@R#Y!aWV<kgY*ps-NVYPu7
zxyUu-Gwe}Ft7P7f{qTKR+0}P+cz789`+A?j(y=?ZSFB?(e;q&f+``SnbyRZm|M@pN
zF}5Eker!Yc<vr+~+Jk(x1?4BLn0!%Kxkq0|7Ja$x=*?x(+p`VD?{?r=AJ?4Oi}Kla
z>@Vy@XK@z}GTZ1qSuB?^fBZP6^Z5<?SX#p0<Ky_}#*Gd8S3Bo1+I9uiu0_ms%;VbD
zvF3HXyD)mB1(T&#RLXmCYhZU%|F72%@bS}cc>eNkQ@(cA?(QoX9K4HMZUQGyE}&4D
z#-T%_>ub9vx8lf8J2Cxh2ln-Riv#?wYuBdr?T4p$_5KbXJzIU|SnhA?udTgMf4P!l
z`M`$#&ZDb){`pij_3t}}Kejx^(6uLc^Kcj+UN!gI&j$2NeS@|$9xbOFmQHWSj*?x!
zM{S@TV~4YtI@*F?M!GPS&tl+U7KPR=D{K1u`%&O;Q!15EEEd<Vt4xd_{Rj90S%E@7

literal 0
HcmV?d00001

diff --git a/assets/voxygen/voxel/sprite/flowers/flower_purple-8.vox b/assets/voxygen/voxel/sprite/flowers/flower_purple-8.vox
new file mode 100644
index 0000000000000000000000000000000000000000..747443745fbe1b0d8c3c2e89bd0f538543c12587
GIT binary patch
literal 1884
zcmeIy&1;lb6bA5n@3|l6zEhD-{YV-k#zY|wCYiCLBQe;q#3sbFX#%Mc>Y@q4Fdr5h
zkolsUbfbu?NTHOXE)=?}Q0T%!p{2NzF5FeR%HMJNypaS3vgopl4*WRxJm=2bcV^z1
z<&Uo(d!Uq>FVB92qGp0pOS9Le-%1-i(wfS^)s<_reS`%bzeCijMWmX{su{Iz6X_PS
zZbfD4tW7;?(@N56Or6Mdm`x`ts<Eb8)buJztDzbZb(yIfm93Jt9oDuQwZ$C0vF&JV
zRg>))vN*#wEviFL7QMrMZ`&Mf%d>3<wzvk{jHn5Ej_4EYQ?6^YYY<q7+P%`oH4G3~
zaG=O_H6aHghqI7_PjibL2rRg?cj&<aJJ%-fy1`=&5qxls01OclaO~Qikpr{CwIYX1
znn&co5FttX1U<yGW?b87Unj7jjjub<gpB-ahpH_yFb)}5VCOr*qe289d_4ijzT+7=
z`_~C-Cha3;5EA4N)0*)eqeG3rf;OS%Koc?wI2UV+4A_RQamc|!@W>#7522QT<<Rwv
zoCD599+5*xkU<2a8TSKMEoj442bz!(<2<Y_GB6GqSO}i03=w?bY66~-G2<MpBQgjH
zGKfGFw}Oimh6vurN&+s#N(LNb#&Iiy>LN1m3HCt9U<NU*oV-~4@KRaX?VpI6o12sW
z{dYfu&2x9<ez7GR`7h+F@!Rs{>6TP->;L*YyRdj%E_^yDW1k(7iPa;LZ}dy~;ef3C
zSlE7z$>FR_<_^e2E-Mq`??~~zgK};XdoCZ9@|7VuUN|fx#XdQSY_I!dqg<Bt^XFwP
zpWkyXo15~>(vtjr>(-w0&qvl}Veq;%MmMBBye>EQFZS-6=#zyr{jyRTkV^Te+@5~7
zXa4iA-^ibTJ(3@u-RsGBu61ney3EYnlU#0DE?(?Np|B>WPA%;29bMTkXKoypwL8Od
zZ2XX%z<b?!Zd(6%`B<L6xGUd1ee;>i)>O}YXYVJiXWO}Ko!E0ea`w%cKRs4G^9Rn!
zlYQUI?9GSr+qZM_@_Fxk=nBjD>f17S*-QWXPBuR{AO}l!_cfZ+L$Y`}E30Sw<?H!T
mS<Po<`earL1N*l3OifKm0pCrjRFYz`xcj`y^1P(~0RI4I<5T_s

literal 0
HcmV?d00001

diff --git a/assets/voxygen/voxel/sprite/flowers/flower_red-5.vox b/assets/voxygen/voxel/sprite/flowers/flower_red-5.vox
new file mode 100644
index 0000000000000000000000000000000000000000..fa6c49be7d1d0879f9f70104d237bd2a461b329a
GIT binary patch
literal 1444
zcmeH{%}Z2K7{<>%?>T42Qq1vl@&ms?2X$s_bVS9buoSgy1iv6jXGWbx8YW2NNE_QE
zQUoJGM3{?$HjxmtPzZu(CGLY(w(D<rdatH1FpG9=y72J3@AE$A+;h*l+|irkm0LoH
zp-}$~hIp!l80nwv&9)1^9Dj74IX*Gjf5)<2A;wrlB1vSektOFXlJi7zP21EgL9-l~
zC8DIUX=qLgHAh0l6jMkwXIO$%j7V`t#e`yyB@O2c=a^FH7zrI!Od)m5umtHSkzO@S
zq1a<d!#Tq_rW7Vh!bB8PNE0<IK_)_E5{4-hdn{=<XE?`{mLo!zV@5G8>4-?_m?4&8
zX|64D%t#iIV^uLV%Tk<E?6DL}+qLF-G}ksQXM&`2+9GE{l5?8K$zz?<nrl*AYrCJ7
zl$6E$nDtB9RQCP3pW*9QLP8yHwHO!}z<>S2J;=+(R6#D{H5ZU<%*Qi-G2XWqVZWmo
z2jgy}+Bfhdkifd{9v-%=;C@pAanJH!pIKM98eL=MXue$rZ=?*q1vf(5rI`5OKc1tr
z#)VE#0lXd;ye;_%Tq;C+CugozAT(HoYF<xmpak{oW%^FmLm@18bRg>UW$YuB!v4qz
zek?6z?9bFLW4L?@3k~bITeFPC+;Do%TY}+MHztCmh=(e$(t9zj|LOB{9DaX|ce|Tu
z{^?qqo2Ss%w+WAD6g@pj`2A5dHV&U<8zyqmI$MnB;~G@96rqma^>nPwuLnEW`?i6X
zZ%_6dN8M@t)9kIp?y--fx{UqWwv%Um+!1O0Ev@k;=N0-FxAEo001oy94mYf`Ox2(h
zEs;EwUo&uD)<|6~Kw(gw^&j+BA>8Cbq|J>-Lk)=dT<EQL!C#tloayfFhM&(S7z`p1
O2%L?Jj}F291N;WVR}?A$

literal 0
HcmV?d00001

diff --git a/assets/voxygen/voxel/sprite/grass/grass_large-0.vox b/assets/voxygen/voxel/sprite/grass/grass_large-0.vox
new file mode 100644
index 0000000000000000000000000000000000000000..c896adafed5edb70846ecd87df905bde72ae2350
GIT binary patch
literal 1312
zcmeH`ze`(D6vw~!-20N3A5G&>a1tRyr*3JfQVOw%eW)o|ku*bHLLrDCIH-e#PA!4r
zQnI)SZf-&;E)Gtjvot?=$v@CJnR@z7q0r%y%`FE$96sl~d+xiJ_cq>CW}5(3OHr8#
z*#LMORTr}(VK~AP@}%;v8g-dR@r)Rt1wqRaacCJBx}h7op-USgZA-*S+rZK--O_Ex
zz|mdDilaMv(18T>pd&8m8YH@qMAu4!o}edVNRpn6#U*2dkRHaChzsed9wgPXL|m$8
zknTg$^fWz9&kP}%z9r%^>}7{mvIB9W{9s@uM;;E>mKI8X56&~HFIfH8x_h42>tas7
zKgs!?RK0@!zJUH{_(%PW*7atwte2(8yZ+?mj((f_ppB=S-u`s`Kp(x|)~S_>w_l!y
z)@Go41^@o93Xio`oY#+~*WUG$;^YSI^9I5f&~TYlNuBJI&!kCC{om~W@AK=nq2s{e
cmg38<;`o!|>`2{LXmCQ#IsbP2eE#G31C~?SwEzGB

literal 0
HcmV?d00001

diff --git a/assets/voxygen/voxel/sprite/grass/grass_large-1.vox b/assets/voxygen/voxel/sprite/grass/grass_large-1.vox
new file mode 100644
index 0000000000000000000000000000000000000000..dd6e0a0a15e8d634415398d15c87d49956f6ee00
GIT binary patch
literal 2392
zcmeH{v5O={6o+3`y{dXu-93AP!bKunU}ScJiU_M7x~MCt$hm<ghj54>7^s1Qk+L8r
za*5f2nVBGBVqhd*EY5T@)Bk|+c4YbOoq-&~Wo9?<QM}))-#0VOFmJwk^^qGQ^2*`S
zF^4=~L|#8Sxze8xyt;q6z<KqplcNXYdCEN}5=7Pp&dEAL_Oh<PVjUntQCa&aYlRGw
zn6s=C7^u+!DP-U)IRtUI9d3u);dZzkZikx;iaOj5H+zu8oE>huphgFzkb$q{5X5f`
zob#Iq+51fe34RkGLQ%i*(QgzoNMg=@lfXcY4oD#bU&$dzz#T^C0`7o2;10M0ZZaqu
zaEDPNdyvGO1MV;yr&<`Rkr%QOMqhD45XG&y6}RG6+&W57++<KxaVu^eb5z_q`mDGW
zH@PWp@<LYFRq{$-;%E{l=i(S4`#4sR5XS%!ipJ5$IB8@Ll9+QGQ;w5ys>P`qc_Axt
z@)aipNt1zdX^N12!ks1wX$m3XPE*k|`IvCCj|n$(PPplUTEb1Iq$z=~<Tc^WTLb6v
zHbVA!TYbizw*ev)&08PyR%6DUw~{jMyiH&^<E8^r$iUZ(o4y!s!)>??x8b&}1j9`R
zMGd#%W)G5>v*D%-YIHyf8Td*LLCVg+xw4Cpec4rzP<8<#6fHX+%T6JKB<5Up2@KTe
zfD|(Dl^lZ9*`(sGbA;?G?uxt4AynLTE?Q?FEAEP$U8=Y%?uwh-=vbYl)HxM)l^lX}
zi%B;-*DVpU@8${;x+R2ej+{li#m8<|$RMekeeUK225NMyTcmVLD(ouxInv|n&nigh
z&jR?^FB<!^43e00f0lB;7^hlKzh8Xq&+Hr-=nwP<`UCxe{y=}APnMYTK!2b=&>!dz
z^auLf@vEhRgcaXqMQ^oakhEHSUeV#KoRIwicMjMeusa|-SYCVK*+bDg|Br3oOIl-l
zd-KN=7us)^SMA5gR{L(Y_N%nNf0p*s>7Dy`U;6XtjrRMM<Mzwp(cP=t^UY^IXx}{f
zZaaPaoxS^u*FR|wz5RZB;N`1(_s18dU3*yCN0;`$|8tifZPzY8)jm6Xac}>Ac>f9f
zpHIM^mS!)(30#Md;S0C{-|hd+{`d3zb?da<3;FcDCSQKo<lE1ieE)URucXDB@B{u^
K_x7Lv1N;N$GTCwf

literal 0
HcmV?d00001

diff --git a/assets/voxygen/voxel/sprite/grass/grass_large-2.vox b/assets/voxygen/voxel/sprite/grass/grass_large-2.vox
new file mode 100644
index 0000000000000000000000000000000000000000..07f239379125579943532876456e252574af7023
GIT binary patch
literal 1804
zcmeH`F=!M)6o%iMd9!b3cJ~qsA(aRztn4DFh!7>{p+-=Vm_nN%1Q7%awNS890%9X+
z>;iT+B8b>n*eIqJZ}+&n{;<BS9RDo@izS_12EO}u-uvF{vFu*Iymok-h%PPnR}s`?
zL|6OkD@D7(%0UG4VC}|w|Es|T*1Pt{(10BcOrU`%5E`flZ4wP4YLRI`hT$<h9$03$
zKo~A)lNc^QkBq6<naTuHSvGJ@C1NV|piMGWL@lzZ$XK`*u7ztWQCo{xxS&n4byN%2
z!WFnun;^Aifh%yORxfY?30#3IH5pg4b8sD82iFZn99+;QxnWdSM|N<tA-im7LN>IV
z)uI{PY^Xki3n+sNI2)4D5j%yeaCIoEBN2tGBNae8il{~O$auJZWP%@A_9Iasexx3>
zNggghk4zY|3u6-ihpFWNKa54fSUqTy!Z@N9IgH7~3A+eCj;+S2HGpwVaVi=y7sn2D
z^%1jxB4*<x!XcA4?DB~TfOE{{6Y)9bkQq|)iF(i`<&&s+6XB34rtFHD3B}B6fw`g)
z1yam}i>X6ReKAw)m5L@}AGw&ZD=|~fESFR9K+8rlq?EHvO3aiqbx7=$%EqG>xx`$r
zF`<Wh^x*ay^`K4LL%-e6VLvy$a_-DBN&7MrrLKkQ-`0=g^Xc1CFMT-L>oQaNLh1J>
zN*}knkNVlamcFm7rq9d$&iS3w_tL8qx6{_KTb=!d%}43r&AaKq#kJ1<>H?*WLzEsY
zcHjT(;*qqmbTU0zKHoXNU)+BJ|MLm>Q<VG#unsoCL+}i2gE!sp?7#o#*X~x@3wnGf
d(ewL>UO!Fr_GOY6l-v$@kMno;KEM6`{{RRNQLX?0

literal 0
HcmV?d00001

diff --git a/assets/voxygen/voxel/sprite/mushrooms/mushroom-11.vox b/assets/voxygen/voxel/sprite/mushrooms/mushroom-11.vox
new file mode 100644
index 0000000000000000000000000000000000000000..bd0964fd5d771696841d5d9c6da303deac011be1
GIT binary patch
literal 2172
zcmeH}ON-=G7>1K`{mw0^dy;N@dR&QkU5JRTMj4u>nehh0%m|9O(S^7XU5O;AO)smG
zRO+|N)Wr9|Y-GT#3#Z`W&G$YhCvXU%9)14!?jcE%2luWYB9b2|Nxr^*df&$Zzu603
zM?QY?^!g(a+aw8Tl1P>8lumXU5Kx2!Ql&csluqH0l%humq+)Okj=?eXY-fQoY%e6=
zYsL3Q@txFsZ;9`f;d=r?3OE5LI;jPmKri;n3OETT;Ut`dlW-DF!l}*ztrQ%tNp)mY
zr>xp@q2Y8#N_R@@&Joh;Jz3pxLA{mKlOi~RLt5$xaADvKoPjfNrjypdnVt(fSZU#G
zue9wQ*<M-;XM4_F%Y<t=5WopHaOql74r?9OI;?daIfs4x)(Jn5^l-lS<l%fz&i76P
z^kGms44%RuZ9pFeC$a;{41I<kX*2ZM;CS9zk>h#!bB`pM4^HN-);ZSYSeN(Y^MS<d
z;KXdJHIilrWoHBV*@49Tp!FQx{2=Wd-5lKl-2&YL-2&a>KzunWy+pShrClB<EJxxi
zbgR+PY7};bZiQ}*ZasQhkKC@&tw&;;TB%JfH4^BUw5dI9j@)iW3Y#OPMXgy;6EHD(
zQ7c(AQWcF-#YrQD#;l9Kl*WvtI1@Z!MtUla$`lQ=#Ynzrbih8q#7xRYr)5LH0L3t~
z@<d33v~lL}z{C_-qsmt5vQ@go^N>`wp2{OLWu4lxW`M_ZWvzYLlE)qa_lEMB31zD@
zTmzHA<shwE&8n7wiODPMU2PdvO`z(SnyO)@I&oxTt0uM8i2-h_XClrH-eHdED?F##
z>MZVewheT4%gkAu+Ow7c9@EAC{Fd2s<ZHJ<U*OCy>OdFIvzP{`JB`<OngBB32r~#E
z19_YcW{}0SaqT6};j#^MdCFp%czt*K)zzo>k{92Qo12^I760Ee`0UN|>E_+b>D!Or
zn0~!_|D|`~&p#f#)cxaqxq4^%;^AA<qc7i{zIpQA^!;}qOh5hb;q=STpG?31cK_e+
Oef94Br{@#@L;MZhfucnK

literal 0
HcmV?d00001

diff --git a/assets/voxygen/voxel/sprite/mushrooms/mushroom-12.vox b/assets/voxygen/voxel/sprite/mushrooms/mushroom-12.vox
new file mode 100644
index 0000000000000000000000000000000000000000..b824175151a8eabdf1c98cd3829bb0306d9e227f
GIT binary patch
literal 1940
zcmeIyOKVg~6u|MSI*+RAd;2E(2}DqE6dYzZu2g&wf^QiTcj6#SEe2f8q6LlVjwEp>
zh~LX^BH8rn`oAuO*@-I`HvBk`I#mUIZ}(sKcFueVA>6sPb(auc=MWxkJ-OLW1)mu@
zoW{=Xldbzg!sioI!=YF>RM-?98jr-{ky@lj^eIow2vLtMSW~m(RIN$yX3<{;@mAI8
z`@4|66-f1$J|l*_keC;SAbC+WFVyn8;CWFHGV7IfNG$t?pk=>6tsDm@hg8-eu`UfM
z)n(ASEKsXQ!O4+xZK>3yROTRYwo+J}wUlNnN0iwrBj{{Z5R4g{9TsA6dWe}Bq{1FZ
zWd;U`-GRc8Qg`5p(j8<3?OIWyF=HKPb}e{!P!Mz1a%N9q52P{!t6h`W?<ou^^-WU0
z_SEl1p_YD~rEfv0q1t~g#9;lNSpQjJDAd83@qV44PH(C+XJpQpVqs6|*9M>R%6TwI
zn!iyPlFZ+T%-04dk4jJHYt{LQ6Ek%%`ZixDh|NzF2B*#_)4H?IS%*67L`R<bnL9Ff
zz^A;-n-=berlE-p`wBzSVPACM{^7*P9nt99z}*9P(}&Z`Q{S0~I(;9wlk+ll9=MNK
zrn5Jeq8m%qjkOVzZ8R}zqb54UshxU?d79l^iEZ+}Y%)XiDL>U7-oAb<=+~cC*xueA
zfBCt;gX^#E{qQr|IludL@4uH{jLSdYj_<F2{NGtO&TNkln0fZw-{aE@kH_6}TjQg%
mSH8_Wzjbl^=k}%X#hu^B{~rADt^ezt`MKYj?|DAcKfo91>vjPE

literal 0
HcmV?d00001

diff --git a/assets/voxygen/voxel/sprite/mushrooms/mushroom-13.vox b/assets/voxygen/voxel/sprite/mushrooms/mushroom-13.vox
new file mode 100644
index 0000000000000000000000000000000000000000..87d69de590faf94a77b127541d56336f05d6cba7
GIT binary patch
literal 2568
zcmeIyKW|h=6vpAXbIy6s%v}ee2%(6ICKW}hNJ$q*0%A-8f(U`rfD}dYpS9iEUZ{|$
z(xk|D;CtjF(O-Te=-s4n!Ag&2&U?<iJ9l@r&mKL${ckDd*X^C(SjvZ9%F~^_yIZ5+
zwfgKD>+=_TJO9N<OF5lN2`_Iv%A1ICp|J`+z4n-1M@(d_g4c~l-2^mNQM;Xo+l5#?
z>>?nz$i<%3&CdjLKXZ5H{anaV2X#2t__>K%)DUvi$+d8cvw&b8+=m)M!h#F|Az>mz
zK*&)iH3Tc#cLan)owRRo1cXGxRO!Ru2ndOWj$+KA!r&&(EzZpx8aj$IhYEA?Jj_AV
ziH43DC74Bp1+xf<I?>QEqlj5ln3zRC)QN_U86}xTg~5|qh<&1=V`|L6;0OqbhK}0l
z!x0b?4L*}W@RA3CI^}`E5fBo!lGl9i2#7k-Fd2QA(MLc?H1guipnASHI08bV(d#I|
z9BMEJM?gq4dL1*0m_>z&Sp<YcBkyA-nSsF(5E2a?wb6$oAS4>RlR;yhnVZ_7BOuh;
z4y`sm7cvNmYUD<afRJPjlhcPeeFTIgYv`DQ8CWobfRJe99g~=W!Nm-OL?i2?pY-8L
zA3~yyypbay<k<J|Z2ib;KXL>FGivKROXpcS&(e>olY8eG$RQ+ILk)WHpa&tT8+vrk
zO&^XBeI)xf@+3zjIdasE8X9Yz*JktDA(*rGnKR6sVdf0;x&}Es$RQ+ki<$Q&*UbBp
zBS)R{I-s%I>ezjC91tw1W5s<|+-G&1vEq9A&{%!z#AE9ups{M~zdC(#|L5)EpZ?Ex
zcXyXBuI^{>%ePz0(>vFeKfb%Z{Pq3U%gK*7md#H$mv{HRS^jx&>(cM;+1($OSC6)r
jlf8$_=H>44_Rq)5-|OEmz3$6z;_Ch;{;%(5`~!Rhr?{>p

literal 0
HcmV?d00001

diff --git a/assets/voxygen/voxel/sprite/mushrooms/mushroom-14.vox b/assets/voxygen/voxel/sprite/mushrooms/mushroom-14.vox
new file mode 100644
index 0000000000000000000000000000000000000000..7952c4543abe3ecff1758eb036d6031d0b0326f9
GIT binary patch
literal 1328
zcmeIyJxjw-6b9gP&%M=tM8Qb}5kbd-i%SbCZPk(nTWCO&rWJ&O4vHY6*g-c3K?DU6
z!J%J{?vDN+|HJXU-3ty%9lY@H<~<}Nxq)m~g84@x+RC|Q1kJ{Xe7CmY*n)*RFo_Jp
zn)_*oSXp4EkXZrOn03T#>ddhQ^B8hGQWS49Xdo4D8z9Dv<Do&4#tf9f475#3bd*YT
z7&H*01A_)*yG93X(*PyAN+r7t8i>(>L4&bfql30-?769);#7}8+ti?(zGA1(>|ln}
z_ITp8TFmFj3|^Z&&y#<@xCg~$@hcgLcGhICQINy^lANDZ<?15%*1j*fO-UDaho0+S
zze)MBE2Xn%aZjIQ^Y~uYkM1OYa3k5MCBf~x)E_>EUO(z@KedvUX)hx){;JG1Jy~pp
TvhZ^FXP<Y}`}LFew|{^y=fM!V

literal 0
HcmV?d00001

diff --git a/assets/voxygen/voxel/sprite/mushrooms/mushroom-15.vox b/assets/voxygen/voxel/sprite/mushrooms/mushroom-15.vox
new file mode 100644
index 0000000000000000000000000000000000000000..a13bfd9e88f1d1e5c7acc8dc8ac72e0004d6cc7c
GIT binary patch
literal 1192
zcmWIZk5HJ#z`)?^=;;Tf7^bi=Fa&!>x$=NGK)?*e96&lEGRiXrBnSi&K+MR<5XH#I
z7|qDY6vN2K9LvDKvXBvonShvq5y)m_iD3fL3`{^a5Ho>j2G&IkjI4_oftU$IGXXIJ
z+hPVrw#AG<%mkvDKy3CULGDhD3_$mQfVa2z|4~fCFmN~dAM9`WKRVq0e`2ij|D1HM
z|K&wN|LZFwhzfUo&y@c<&T%-^2Dh#I?^n0@zgO9;|DGi?{=4N*`tOq4|KBO2>%UcW
z)&Gdzo&RGdAH=DDpyOW9R_DLCx8;AyV7vcvDc=88sv`d@&&?UM?j7jxqNe?z{0{)#
CD*2-T

literal 0
HcmV?d00001

diff --git a/assets/voxygen/voxel/sprite/mushrooms/mushroom-16.vox b/assets/voxygen/voxel/sprite/mushrooms/mushroom-16.vox
new file mode 100644
index 0000000000000000000000000000000000000000..c7704394f86471cffe6b0430767575b3351d7266
GIT binary patch
literal 1600
zcmeH`v1=4T6vp5C-t6wo-YHm#jR;yE*w{o+Nuq|!VFEeO+ub`s2xt)zL=;oR&O#7D
zK}4|F-AhV)OaCun{03|T7D_A}`0;z+o7tUZhP}HzyYNv&?yQctC>iA<({X)km;%S(
z7pLi2RgZsY>WUl?CsKKp3Xm#utaH|0>MTeVh!btSY7Hpowf4C#;kC(vb|Eke+CsrK
zXaWtO_CT8%TIXnoCQr^d=P~ylZSd$y+6V9*=u6s{?3e7*UaTwBI<M9S8nDL0y385(
zwngyP`(S+_Wpc@^t_R#)3)g}eQP0}DxzQR}6C)wGBOqI#$U5~|2V%*AAfKbid-Zt_
zV#$G^XyA*bif=)Ti2BwM0ekS3qs7=G>ewTeETK~k9f%PDGXXK;QZ{B{$&N_btCl^8
z5dkv+G2&7-W@5=MtsN{CgC&S18`0sRVt5D)*`qDhr;c_u)>hNyr!kpK;(z|)8EjmM
z)9sbm+`ADUEY{=R!_D~O=}vt0a`s#2etEnbN9*^GT|0gKHEtdBar61-IDYmi-hT2v
z-hBKnu047auQvN}_V!zxfB1gv^Cx}xXReLn*~v;gH@zOu?@r>S{VHDkviHw^?@6E6
KpWHwF|33k&Jv)>D

literal 0
HcmV?d00001

diff --git a/common/src/terrain/block.rs b/common/src/terrain/block.rs
index 5a4b579211..5f9f5899e7 100644
--- a/common/src/terrain/block.rs
+++ b/common/src/terrain/block.rs
@@ -74,6 +74,7 @@ pub enum BlockKind {
     TableLarge,
     TableSmall,
     Wardrobe,
+    LargeGrass,
 }
 
 impl BlockKind {
@@ -230,6 +231,7 @@ impl BlockKind {
             BlockKind::TableLarge => false,
             BlockKind::TableSmall => false,
             BlockKind::Wardrobe => false,
+            BlockKind::LargeGrass => false,
             _ => true,
         }
     }
diff --git a/voxygen/src/scene/terrain.rs b/voxygen/src/scene/terrain.rs
index 08106b0953..a61a07b00f 100644
--- a/voxygen/src/scene/terrain.rs
+++ b/voxygen/src/scene/terrain.rs
@@ -109,11 +109,11 @@ fn sprite_config_for(kind: BlockKind) -> Option<SpriteConfig> {
             wind_sway: 0.1,
         }),
         BlockKind::PurpleFlower => Some(SpriteConfig {
-            variations: 4,
+            variations: 8,
             wind_sway: 0.1,
         }),
         BlockKind::RedFlower => Some(SpriteConfig {
-            variations: 4,
+            variations: 5,
             wind_sway: 0.1,
         }),
         BlockKind::WhiteFlower => Some(SpriteConfig {
@@ -141,13 +141,17 @@ fn sprite_config_for(kind: BlockKind) -> Option<SpriteConfig> {
             variations: 5,
             wind_sway: 0.1,
         }),
+        BlockKind::LargeGrass => Some(SpriteConfig {
+            variations: 3,
+            wind_sway: 0.5,
+        }),
 
         BlockKind::Apple => Some(SpriteConfig {
             variations: 1,
             wind_sway: 0.0,
         }),
         BlockKind::Mushroom => Some(SpriteConfig {
-            variations: 11,
+            variations: 17,
             wind_sway: 0.0,
         }),
         BlockKind::Liana => Some(SpriteConfig {
@@ -609,6 +613,38 @@ impl<V: RectRasterableVol> Terrain<V> {
                         Vec3::one(),
                     ),
                 ),
+                (
+                    (BlockKind::PurpleFlower, 4),
+                    make_models(
+                        "voxygen.voxel.sprite.flowers.flower_purple-5",
+                        Vec3::new(-2.5, -2.5, 0.0),
+                        Vec3::one(),
+                    ),
+                ),
+                (
+                    (BlockKind::PurpleFlower, 5),
+                    make_models(
+                        "voxygen.voxel.sprite.flowers.flower_purple-6",
+                        Vec3::new(-4.5, -4.5, 0.0),
+                        Vec3::one(),
+                    ),
+                ),
+                (
+                    (BlockKind::PurpleFlower, 6),
+                    make_models(
+                        "voxygen.voxel.sprite.flowers.flower_purple-7",
+                        Vec3::new(-5.5, -5.5, 0.0),
+                        Vec3::one(),
+                    ),
+                ),
+                (
+                    (BlockKind::PurpleFlower, 7),
+                    make_models(
+                        "voxygen.voxel.sprite.flowers.flower_purple-8",
+                        Vec3::new(-6.0, -6.0, 0.0),
+                        Vec3::one(),
+                    ),
+                ),
                 (
                     (BlockKind::RedFlower, 0),
                     make_models(
@@ -641,6 +677,14 @@ impl<V: RectRasterableVol> Terrain<V> {
                         Vec3::one(),
                     ),
                 ),
+                (
+                    (BlockKind::RedFlower, 4),
+                    make_models(
+                        "voxygen.voxel.sprite.flowers.flower_red-5",
+                        Vec3::new(-3.5, -3.5, 0.0),
+                        Vec3::one(),
+                    ),
+                ),
                 (
                     (BlockKind::WhiteFlower, 0),
                     make_models(
@@ -714,6 +758,30 @@ impl<V: RectRasterableVol> Terrain<V> {
                     ),
                 ),
                 // Grass
+                (
+                    (BlockKind::LargeGrass, 0),
+                    make_models(
+                        "voxygen.voxel.sprite.grass.grass_large-0",
+                        Vec3::new(-2.0, -2.5, 0.0),
+                        Vec3::one(),
+                    ),
+                ),
+                (
+                    (BlockKind::LongGrass, 1),
+                    make_models(
+                        "voxygen.voxel.sprite.grass.grass_large-1",
+                        Vec3::new(-5.5, -5.5, 0.0),
+                        Vec3::one(),
+                    ),
+                ),
+                (
+                    (BlockKind::LongGrass, 2),
+                    make_models(
+                        "voxygen.voxel.sprite.grass.grass_large-2",
+                        Vec3::new(-5.5, -5.0, 0.0),
+                        Vec3::one(),
+                    ),
+                ),
                 (
                     (BlockKind::LongGrass, 0),
                     make_models(
@@ -938,6 +1006,54 @@ impl<V: RectRasterableVol> Terrain<V> {
                         Vec3::one(),
                     ),
                 ),
+                (
+                    (BlockKind::Mushroom, 11),
+                    make_models(
+                        "voxygen.voxel.sprite.mushrooms.mushroom-11",
+                        Vec3::new(-8.0, -8.0, 0.0),
+                        Vec3::one(),
+                    ),
+                ),
+                (
+                    (BlockKind::Mushroom, 12),
+                    make_models(
+                        "voxygen.voxel.sprite.mushrooms.mushroom-12",
+                        Vec3::new(-5.0, -5.5, 0.0),
+                        Vec3::one(),
+                    ),
+                ),
+                (
+                    (BlockKind::Mushroom, 13),
+                    make_models(
+                        "voxygen.voxel.sprite.mushrooms.mushroom-13",
+                        Vec3::new(-5.5, -5.5, 0.0),
+                        Vec3::one(),
+                    ),
+                ),
+                (
+                    (BlockKind::Mushroom, 14),
+                    make_models(
+                        "voxygen.voxel.sprite.mushrooms.mushroom-14",
+                        Vec3::new(-2.5, -2.5, 0.0),
+                        Vec3::one(),
+                    ),
+                ),
+                (
+                    (BlockKind::Mushroom, 15),
+                    make_models(
+                        "voxygen.voxel.sprite.mushrooms.mushroom-15",
+                        Vec3::new(-1.5, -1.5, 0.0),
+                        Vec3::one(),
+                    ),
+                ),
+                (
+                    (BlockKind::Mushroom, 16),
+                    make_models(
+                        "voxygen.voxel.sprite.mushrooms.mushroom-16",
+                        Vec3::new(-5.5, -5.5, 0.0),
+                        Vec3::one(),
+                    ),
+                ),
                 (
                     (BlockKind::Liana, 0),
                     make_models(