From 2278082d41ae6d3045795220c524572b2088d237 Mon Sep 17 00:00:00 2001
From: Matt Caughey <Catcwe316@comcast.net>
Date: Mon, 23 Sep 2013 21:38:15 -0400
Subject: [PATCH] Removed short grass from the Marsh

---
 common/biomesoplenty/biomes/BiomeGenMarsh.java  |   9 ---------
 .../biomesoplenty/textures/blocks/item_reed.png | Bin 455 -> 456 bytes
 .../biomesoplenty/textures/blocks/reed.png      | Bin 610 -> 592 bytes
 .../textures/blocks/reedbottom.png              | Bin 511 -> 494 bytes
 4 files changed, 9 deletions(-)

diff --git a/common/biomesoplenty/biomes/BiomeGenMarsh.java b/common/biomesoplenty/biomes/BiomeGenMarsh.java
index 8394fcd02..e97d8e8aa 100644
--- a/common/biomesoplenty/biomes/BiomeGenMarsh.java
+++ b/common/biomesoplenty/biomes/BiomeGenMarsh.java
@@ -59,13 +59,4 @@ public class BiomeGenMarsh extends BiomeGenBase
 			}
 		}
 	}
-
-	/**
-	 * Gets a WorldGen appropriate for this biome.
-	 */
-	 @Override
-	 public WorldGenerator getRandomWorldGenForGrass(Random par1Random)
-	 {
-		 return par1Random.nextInt(2) == 0 ? new WorldGenTallGrass(Block.tallGrass.blockID, 1) : new WorldGenTallGrass(Blocks.foliage.get().blockID, 1);
-	 }
 }
diff --git a/resources/assets/biomesoplenty/textures/blocks/item_reed.png b/resources/assets/biomesoplenty/textures/blocks/item_reed.png
index 1aad53aba920a47a73f24b729d513c2a6bea60ab..3a5545347c92013f9216534ff3d905b4f7abbe29 100644
GIT binary patch
delta 368
zcmV-$0gwL21IPoAJPN)501mzZ>O!%=kwz(hL`g(JR5(v#7#iU8){_4V+k*c?xx|5a
z%>iHy+vjHf2N@9JszKO*HIw4tih^C#{};#T{GZ<%`2X~(EaGgB@Y4A|qudOv7-ZOy
z#Yz7=i=6+bhZ@1f@dA*dxlR86YtzjCgA4<)ee6}h8pB*5UI2LqL}LXYMJp%f{P(bb
zRsh=w^2Vm=DPRqUmY4jWT<Ho953pivVEgRi|J}uY|0kFG|A!e?nPmL`)XI$ii9x3S
zLEh>qbp?A3ss#Z+isO9Ez={GLH2)u4n({x))A;}5?liE?rE&UT+Rst-e`=rsrU4+u
zAk84ZgXpwi!~fZ#=Kn)IjKE>xYA*L%KfqB1EC<zs2|$`bE=dbA`XA$=@!#G=8LSu-
z7O+?VsR7Yg!GZa4U}u92vDB48i8@#;;04J6`d~#ML%=jKng$p!FaQ9+o4y^8u|c%}
O0000<MNUMnLSTYzpSa@y

delta 367
zcmV-#0g(R41IGi9JPN-601m$aI0aKAkwz(hLrFwIR5(v#7#iUG){Os4TRs0nxx|4*
zO>STfd*&wm2N@9Vs!Z5`jgvy*io#r!{+Gun|6kJT@&CfAIO1%N_EP^pw@eGH7-ZPV
zMPdJYi>&@<g=oXY@dA*dg^jNN8`JdugA4<){p{tz8Y7*Rz%<A^AQ~$GDOx)*^}m;Y
zwKUj9kT<qXivnvnwk+%aj7l4Dcz_jS1G{Hs|L-q$|3AIV{XfjG+9a+2=U2r1PYE*k
z5AxQ8QX8<>pjr?Bq&UIX2&^dBLG}OXr4j!lJoNuB?~VuCTp6bZrUM)m{$~VY2@jBB
zkY<qIL3C!Y_W!(4!~fy#df>2dH<$ccAM7X(mV;`+1R%{Imt+R&{Ev56`tN8A2|!R-
zz+wTU21H{8N9PBDoeeU?T2}%k>R_>e7o-Jff)#-b0ntQh8eqV{006g2yqoy$8qWX#
N002ovPDHLkV1hw{uaN)%

diff --git a/resources/assets/biomesoplenty/textures/blocks/reed.png b/resources/assets/biomesoplenty/textures/blocks/reed.png
index cf215dc48a13a2c48a4c4d787a7781113baac7d5..b9abe2d3cb41373405914fae1d4d8d61d70482a5 100644
GIT binary patch
delta 505
zcmV<V0S5l!1kePKJPN%401mwYNBfYikwz(h%t=H+R5(wCQdvtvQ4sc@^b|xzo6z#m
zMg^6Tl~~wf;WbOm)Xc<0i6q;J3M{g^m_!Q^ErbvT5!FNfsEL`=otsAWz05b?nK@^c
zqxlQTm;t`%|Hu!{-h0W<BnET!hgtIFrCwFP+p~glfS4PtfOx1KJf>pUo@)X0QOB5n
z+dT<hQ<j`d3F#v{WG@|jfG?kK4#K>oB`rEt54*uO*zmXgOh)*IO99JTooV5KHD4<{
z%2VXOoQVprcFc4Ua>jAAhXkcGYzZxvi&nwM#U%L6<+;fU@Mg3}i+T=_m(^Z_7VVFh
z^9QU6+iGAxP@N+N$JM0Nx{Z0*@=GOuy8%(b`>AMS(b39*PGb%8>`hqk{FSWxx*@e<
zWX)x&gM&yv`NQo+tjDH1)V%beot$*S2QFg;NV-BkG&B}4xAj#KAJvtR<;S-|>Mxuf
zYhsSD_J~iESQvndZL!jL#6%woIpgibLxR%hvn;ma9;oENtw0~~Rc{wyt0aD8+=#@8
zt(gNuQUmd)lpC(&9!SPU$oCG_ll?vmLN*hEuw4vAjt((*8p>e8Aigrf+*u6%ky^mP
ven|o-I{MZ9OL}$3I1{Bh957mSwHnPQE|~l@^2ZI+00000NkvXXu0mjfzSH*v

delta 523
zcmV+m0`&dR1mXmcJPN-601m$aI0aKAkwz(h-bqA3R5(v{QtK;&VHDrL;fr#Q5K(e3
zVs5!iTf;Jjcjmg;SaaWs73SJZlk40P<q}^=Q4}llA05tlde27l;hgh3zxVf^=bZCA
zieNDKuN}`-Lo`0p82lB7ZhI(y_SZ)(ax_;(JSF#=tq{8FW#PC!1^nYBU~7p3?`S@M
zV2(U$?tQKBeyCwBSA5**fUom*{(vW6EH%P(R~m8dfn3;f6v66f5o^#G*mVhjZFxot
zSg>p@gr{8t<!>i_6tCCSR7lp4J9JeNA-9GjQT%Baqimrw9XQ&Pe{l@3GR6aE1q%Z1
zHpWwiv|lHq;h3DDIi*b4851+hHrZW&%K7P{p0Tqti7*Rg^NlHm=vYf}-c-y#4XLvk
zhpud*K;)I6tyq<C>aJzZtj&SlDe)Hc%6R4%hRQ?%bPwC2wFiGcSk$RttchizrX+^3
zsVSYXp+>Zihtr4ki8>b9_2FwoGd75w?9VpB<(hb%{%I9GD8wxMIFN{t=X~9EQ&F^P
z!b{z-i_tum3cyhj|16`MfJ+LWJY&cs{1TAh#%qF;d9f#3o8TjNLGJU>470uEL<U^V
zjE9?3pih;-;?C+saOkoD7b|n*kQ`KJF)7ujGRB?A-Qj{UhOaiL_y$V?TqUbJ-17hc
N002ovPDHLkV1hqp{}=!O

diff --git a/resources/assets/biomesoplenty/textures/blocks/reedbottom.png b/resources/assets/biomesoplenty/textures/blocks/reedbottom.png
index 1c904b93cf78952b7eb5248ddf8b4a939ca270fd..6f543849e26cb52f5ff0d5e6a930a104ed68c6c6 100644
GIT binary patch
delta 407
zcmV;I0cigJ1MUNmJPN%401mwYNBfYikwz(hYDq*vR5(xVP+3pHU=Zvt(Wns<igJS-
zg;Hp#EfS!$v=Tu<L{LMBK_85XkN)e`ol=f>ADyI`+1=TrpAf*+qs08|73is_Kr=pP
z4d`(vMdPa?w5P{t*3GRwz}rZr?`0RsYa>pJzD$lDCpL5L<Ix~XK18llKG-zRyb^+c
zyH=WRI|UftA57%h6_L921U`<9;xTz<inQ~s0gP&TkAh-L5y`Db$dp24sb?@w9DlHD
zBoQxe)g1<GEeg}iKu5AuI|cKFthx3zx1o92(3bq>QMU%+7+IS1{N|xkCAX2IzNHY?
zmFx-f<<t>PZw%DbeApkr7}zx=wSq{0`RG2i)dbypI&`y|1aqAkeoLlGCbSta?Kg?H
zvgT&y3n`54tl7+)Su@&N2AZ!HmQx3TDaU9&YOPJ~<?0`QVU{D%!I16R8o_xCUGg9B
zbz+10H<%fLFSrf}uGo2)6^xRIT=0<p_;U!t56Zc|+wShC7ytkO07*qoM6N;tV1fWq
B#YzAG

delta 424
zcmV;Z0ayO+1OEe%JPN)501mzZ>O!%=kwz(hdr3q=R5(w?QQJ<!KoISBC??)wQRI>!
zphzi5X|YfR3WZWpl)D7c1Y`8UnE2?&@(E*R)-4iwF+O;b$vHds-4!^T+#VoL>Jhke
zB+`htp-OsC3c#QmBkgED7+YaChwywO!^gBl&ZfQ((`MXFMt<!pV96fR)#U2Dcx)ek
z(V<feLA%T*y!6;qGcAIx1<3GhBsSn8AA-}vwRr=C8d(7zG*3iuG!f3EO|Y`;TDMk|
z*wKT;(^hJM2{qLRcFqs?R|+|+$}TZ($o2c=oHP#WR@ml3x5m2E^)L(_R@|{<XcQvQ
zGG)NH65A$!`d}SKO_gF=Tx1Op*OfGXIdjKeNCZ7#W&_Z(v!sie5HZG)Dc?*$Cb~6m
zFuKeGPDPEy$a!gprlZDWoQxV_s_YAKYvE~Frh}34!$Z5^CN&K9jR-^blIBgm$6WCB
z5W2)(|FK^r#%mxWcpl%5z_(a<m@gEP%*P+{2WGR`pKPh~H@4LI8~bkv!Y4Ts;ya{$
Sa)E&W0000<MNUMnLSTaEA;<^-