From fe3a075769beefb3c76bb51949f750f3d9a97219 Mon Sep 17 00:00:00 2001 From: mDiyo Date: Sat, 19 Apr 2014 22:10:51 -0800 Subject: [PATCH] Unmerged 1.6.4 commit: Fix heart rendering #918 --- .../assets/tinker/textures/gui/newhearts.png | Bin 2087 -> 4654 bytes .../tconstruct/armor/ArmorProxyClient.java | 14 +++++++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/resources/assets/tinker/textures/gui/newhearts.png b/resources/assets/tinker/textures/gui/newhearts.png index 5b0e326a5219b63eb152971a5fe368fb72991fad..be6b93ae8627da8c5cf8af4d63b0e2e0e73a7684 100644 GIT binary patch literal 4654 zcmeHLcTiK^wm)FO1}LaV|BO^=k|2se00Ak9G(n0$kd}`cBuES;(GLYF66r<+M5H4T zY0?BmL29H(6GRC;6cdmZ3HQW%XWq z^gM@BH}z2hWbzaHU4t@ubLh$HgZ@=C|8R`L*m^LO=KKY!KL45TN z6gm9qb`|f=yn?B_UT&h0reKI(t|?`VyeCbH)Hsk-xBK1qmuswT0lug!`kBr%?YkrN zv)cr4lhhH=aR`T}fJA@hDkGQetNB8@F{%vciOm2jPdK<6`@- zN{`QU46VMA5g^^)@aFg_mOhA-S~@?mu`PfTqsFC0=qc@@Ie3RbcF|I6tR;wRg)V0v ziLBO>O?Jd}N$&jNasnw5gRM2tJeb?Ce%5_24cK%>TcBF#to{+B$pTg?1Rq5V84R`8 z9~ZTRHqf=H$N}Cd_q9)&J(D*maq%^$9n zsI`=$x_kn@amME*E&fywKYX?G(N=3YPpFF{V&^qZh8}!t8u^u0)%jfU_MR^l^UJU| zC&Jrkg(R#8k{Fb8wZW++!^oET+P3Ant&cQMS6!qznEsGH2}LnAuTQ#Bvie>Vy1MbR zUBRsuS65Iv?kPdv^5ggi4VMNU8_UAe9xM$8g8Ed7>Si#!M1V!|;9Ft4O?=sW$!vFD zEO*a0J+wd_MY}X^q%K%HlS?RryyI4k1{U<7%QC#@To?lHfgDdqJ%ekc;TMvyZ8T@$ zzF(UwDfnfHLwh~gzc$+yV1<(0uX#qr*cTB^V(h;VO(*`Y{WkyCg<#sWZP;^xwwT0Y zkluQrO>B!g;XXO@p$)l{k2)^BvVaS+grfZ=R7_<;5ZD{gP>j6kB?80L5^7%E8k^{a z!Kj!{7jNaA=Lf!>1a7xE0>zmHJsg=H=?WfQEW^#rwtmgX;S45r{b1$Rl8|?0O>o`L z2m39y5E{RPrPE-mFG$qi<65&);}AZBZR_~PL5KD2pwu_Z`E4BwpfxZf<$#_Gy_O`r z4h{)^%e{dBiaI!}U3n;KPdXvv*W+4_Rn=!Z>z7aYop00rTlyCI4#t}U09Qdc;xtCw zT))X=)47D_Vmm7Ab0H9DuTUD1C|6+ByxjdfK0QL46=Nza&WHH(yz;TWB-Y(X8gppk zc6*A6__?SZbKA~Dx5oYLHE&;AcN;HZ{m&><$A>9a%{x&DpQ$0tUr-5?kFa8vb?I9+ zU6ZZ*6`!mBEc-69(0FZZR@X6D3tG?_$9k!yK_B2!V=~jp{Wq{LcP48QQyU2c;W?9!72^o!%!JIlS~w#p#?z{` z>uu?p(@D2ziD(U)mGiXVk%UJu@uM~x(3;uj-^_!@)(kA)ncrS9G2~V6{@pXjXYz1$n ztWx+eAWXMC86}pXCG-@zIVCy$iv)#1AU?{PPi21MfaOMshj!MnM2G12&uS1o8D*S@ zsg>tpY8d@qNoN^{_O*&wTu~4vNom2Ht(sLhfD=c>H1gJu51eE?I-Z5H*HOW>V8!tI0BnxQ^hit;s!F%>NAnd(rhBEmBIr*HfmP)~wG8lo~bE%K` z5M(9-IRlTDJ^RZUtaWSB3WS@(P0@2D*(Af8Exc;BGV}xD1NO~FNM8H-eW-C>Py5PuwRJ#|l>WZAy#V1W3cnNgCBb9LBq%Cap* zc8AAh;~W5UG*;@>Ud_B_0c>~%2rZ|~ z(Ek7(anhlpo;$au8!8x!0i|(s(Jc~ZkACbtv}b~8;6`G$KMFp_Ti8@)*HYG0_GrOh z#0s2#O4WmcH%Vl4*3XQfN!u@%l5Ja7nbRjf_hoKkepa+jPIU>U$=bG5&=T}M7dIsAGy4lG4@6|9?~l}y&a%bnJ- z*L+$J&Eq{-YkgiT)!yp6>hQ~_AQZjI6fM%pzR2hlyn2xVuW4l8Wws;dqktu@YVG6f z5@{DcV)nnV=t#SSb<7Z0>0O`k<}v59IwN+@*2$4EJ1eWt+}ZPYik`Xqhq#AWLO;}I zVh9xugS@NJ0}k_hx1=i7VQHD7Yojw!Q7RoQOosV%9ku_c^h&>MnvnELPWQNqX{6wt zAGuc~7t+RHp6$HZmJGvIk1$iFeHbdp(QHs^XXfid*^x~T!<5m(BFBy-l&2wSG5Txz zz^zakV=}#_%0oH1-z7hCTw#~p!KYF;Bm!Zxm7puyRA=S){eDg>gWq*R-mYshi-q-JV|fWk?VR11iRivIMg9+QD* znS*L2bp}Bh1JP?Jk~r6!`>Zncn8MZPlD0KbW1T~hJ8NGsX)!Se?CWopl@=5jgPx5c zKfUEuRD`bWS5s4)4PB}+Dk?7am}*a{t*vzc)eqsPg3!L_y1}lu=8GxEv#7E>h{t_{ z)VGPA97eNPR9u=^RCL5WHutJ5p>TD-ix zA)kwEtel;dLAAENUaO%yrEHAg;NY#Dd!cM zDk1*hQXk!sJXVKWiP5dYEvNpe_V^bH)iX-%uZ5}m`S~RpOG!zP5RinA>1FV1Z``8Z zyQ+d0OS4m)CNr452$fvav6i*@GliYW@>fb&V%j0r0?~JqQ&N5-%yfU@m5KB58{32% ziYgDkcZUsxZ>6EqV1h)<&P)hCcxhBVo_61=z1I9REjK^k2$FCgnQ_4ea)cFq$eAbu zfvTxVL0lV@>R?H1&D$1o$u|uRb1e7YyEw<84{mO5_RR^#QtrOKoiH~MF|kgO1v^EV zh=_`a}bWr@4$%RD>a6u%N&KTU@(|}07+GqdWw(5$jC@C-TB&-XmUg7dXXcl z3EWOokny2b9)vp~p`lZ=Jvks(xe)N}_WayjTWyp^fXhVvGKdGMO4kD4yz2xv5Kbz* z`eddgV)|WtM=InSr~@yql|%C!$-001ajn|_=VZXAt#k>VLU)VQLfNIyR(M6^^?BBzJ{vmd}bIMlZc-$%#TU*^7B*T0EWd; z%)mf}3ZEAblQFX&rlKa~`yRYLata-XHA*|+r%MTvYk-;hA<-1|zd;D;@ zo7JOuBF1!4F`*2nO?c5&Sp7UWwPE*h_{LMM z0IIf?1}1Z~p2}uY>uPJC2Y%I}Kfpp4`k3tssEsKuQ-j1t9+v=CAVVn&l5O1Y%#EtM zTIBCtdHh37Jl|#yiKsYkS7XI}=l0JQJi;kMt<>4CfvcQ)Z4+4i~X6%od1mXA(?jd*$a;#KDTZG^pAafURrtsjm z90f`;s*{|wuJXiuZEl3k(bLsx=*Ny_p&$wT!9)6hb9XXZ34;MI+07EY}DrPqn+L-N* z$P@;IhOxklE2^JJyGm^ggM$Ir zx$YbHnC<2cP(2RPTZR|_fIr&z0JpgTT`u4$09XKk8~_~s4G(Yu4+yne)2QV=-Gbp|2^4H%0_d{Xr literal 2087 zcmdT^c~Fx_6#t-VsDPG&qhMPsv??kdgn$?%qXrRBQG#;F(cuUR5#*2~Kq4wCAVmZT z0fUs7AVx$8MeZ-4V< zQx6?<&|PY@6aWBS$9-s50MLM-2B5VBGTxE5u#j2e@9cmEKy@!-mt;ep&rj|1i~;~{ zef7`)@~^LgoUmxe1NN{1ofXT>5%p+qB;=`bMDKEo>mPl->v+yv!v``EJj}9Z{c22# zPuJPzgyo};1Ikton2+u@OYp#dfiHdLyxh}k+=N}rj@wXu=tPHkmCqBJ|8mBv-rM&` z1Bglk>!aJU8}kwHRCs*Cj8(+Mfrjw=U41kJ$M}4FQc~WYtD+l*Td`&|z^cTYaWO^T z(`$PcZHR^GODbWtdFIz$=SLT|VOs;OnK=X8;2nH17F(Ian~E#!lIKwFmJG3QbS^79 ztDSP$&6dQ=ArRuSmNfML=RG#I!0PQQXgpniUQvd>exk8U^V+IwF4#HKu#ZZuSQx}PQK_M#3~Y_v zbr*=$JNKIAMvCWkHuLJTF>X&g1rFon2>t3g5sQp6_8J))rtYOy+<&b;@lKBKf2wim zlE++AhX-!6y|_&;ok!EXhzxG60_Cqf;;#-pp48ju;>ssm2;-+*H(4FiLz)ur!vA5}~3mEsisZ{2sp<9P119 zaR!UXEfBZ{_YtlK-}uh;xDxyjn5n?Er_GZ>MifWj_8V)#KK2xESlJLlpRv`hts^xI zaHR}v8fw*D;TtbW3}c0}Al$9ppgXs2Wdgy*{v-=e7tfE64HPPZ-~|={jCifG-}`0y zHj=Ph6;CA>m$P#!VayccZxwy(E}V0y?~)nIza<30Lq`HvGp?~StfX4TlM zo=lS!(m66~R@BICmM(!a=S#wM14pJpPppB*a_VfakZJA&yFBv7a-G1ns)>?huF{{r z^9mVi$y{58F_{Ph1~maqKnqv{oB@6Z%J95f0{>!P@s8Mj#mr$zg7VQiZH>5|TriU_ zO&vbjwC!+t%S6q~>L}3!r#c{dR7dm4MNVNWO8pURX{~5Uf$DnD>Uq?XMMeB!a4yt^ zPf@V3b}kvKt?`4kJ4k zCJ#-d1Daa_A$UM>mM?6Fio?paTtJ;vJcY^T-!QZrI-m_llsm?Q$LEdF60*csm4R)L zGc!m;91bT(-MXBWm8IO7K-CKf2(W96TRaYqI~Cz(!EAR;2Ix5aZsMFfP|!@1$+l0) z9{MQU*R35oRW_o3-W}jqHdT9hQ}XU9wa#dH5b78AJ`IO$LTLhV+8>JbhiV^#4