From 805ba22e5272e1fe4dbdd082e34b682e6b31fb72 Mon Sep 17 00:00:00 2001 From: Zoko061602 <32712367+Zoko061602@users.noreply.github.com> Date: Fri, 13 Mar 2020 22:07:16 +0100 Subject: [PATCH] Fixed Armor & new Conduit texture --- resources/assets/enderio/lang/en_US.lang | 3 ++ .../enderio/textures/blocks/itemConduit.png | Bin 1311 -> 479 bytes .../textures/blocks/itemConduitCore.png | Bin 16638 -> 15103 bytes .../enderio/textures/blocks/liquidConduit.png | Bin 401 -> 213 bytes .../textures/blocks/liquidConduitAdvanced.png | Bin 1242 -> 537 bytes .../blocks/liquidConduitAdvancedLocked.png | Bin 1254 -> 524 bytes .../textures/blocks/liquidConduitCore.png | Bin 1918 -> 673 bytes .../blocks/liquidConduitCoreAdvanced.png | Bin 2149 -> 798 bytes .../blocks/liquidConduitCoreEnder.png | Bin 2062 -> 822 bytes .../textures/blocks/liquidConduitEnder.png | Bin 2410 -> 4489 bytes .../enderio/textures/blocks/meConduit.png | Bin 1308 -> 343 bytes .../enderio/textures/blocks/meConduitCore.png | Bin 2339 -> 895 bytes .../textures/blocks/meConduitCoreDense.png | Bin 2007 -> 924 bytes .../textures/blocks/meConduitDense.png | Bin 1272 -> 330 bytes .../enderio/textures/blocks/ocConduitCore.png | Bin 284 -> 383 bytes .../textures/blocks/ocConduitCoreAnim.png | Bin 721 -> 774 bytes .../enderio/textures/blocks/powerConduit.png | Bin 1246 -> 472 bytes .../textures/blocks/powerConduitCore.png | Bin 1911 -> 931 bytes .../textures/blocks/powerConduitCoreEnder.png | Bin 1931 -> 899 bytes .../blocks/powerConduitCoreEnhanced.png | Bin 1957 -> 908 bytes .../textures/blocks/powerConduitEnder.png | Bin 1255 -> 463 bytes .../textures/blocks/powerConduitEnhanced.png | Bin 1248 -> 467 bytes .../blocks/redstoneConduitCoreOff.png | Bin 1962 -> 773 bytes .../textures/blocks/redstoneConduitCoreOn.png | Bin 2215 -> 869 bytes .../blocks/redstoneConduitSwitchOff.png | Bin 2086 -> 913 bytes .../blocks/redstoneConduitSwitchOn.png | Bin 2106 -> 930 bytes .../blocks/redstoneInsulatedConduit.png | Bin 1199 -> 516 bytes .../redstoneInsulatedConduitCoreOff.png | Bin 1916 -> 917 bytes .../blocks/redstoneInsulatedConduitCoreOn.png | Bin 2084 -> 913 bytes .../textures/items/itemLiquidConduit.png | Bin 1918 -> 673 bytes .../items/itemLiquidConduitAdvanced.png | Bin 2149 -> 798 bytes .../textures/items/itemLiquidConduitEnder.png | Bin 2059 -> 822 bytes .../textures/items/itemPowerConduit.png | Bin 1911 -> 931 bytes .../textures/items/itemPowerConduitEnder.png | Bin 1931 -> 899 bytes .../items/itemPowerConduitEnhanced.png | Bin 1957 -> 908 bytes .../textures/items/itemRedstoneConduit.png | Bin 2213 -> 869 bytes .../items/itemRedstoneInsulatedConduit.png | Bin 2084 -> 913 bytes .../textures/items/itemRedstoneSwitch.png | Bin 2134 -> 920 bytes .../conduit/power/ItemPowerConduit.java | 6 ++- .../enderio/conduit/power/PowerConduit.java | 37 +++++++++--------- .../crazypants/enderio/config/Config.java | 2 + .../item/darksteel/DarkSteelController.java | 4 +- .../item/darksteel/ItemDarkSteelArmor.java | 2 +- 43 files changed, 31 insertions(+), 23 deletions(-) diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index b8e065e549..1ee49eba9a 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -805,6 +805,9 @@ enderio.item.darkSteel_armor.tooltip.line2=when powered enderio.item.endSteel_armor.tooltip.line1=Diamond+ level protection enderio.item.endSteel_armor.tooltip.line2=when powered +enderio.item.darkSteel_boots.tooltip.line1=Fall damage negated +enderio.item.darkSteel_boots.tooltip.line2=when powered + enderio.item.endSteel_boots.tooltip.line1=Fall damage negated enderio.item.endSteel_boots.tooltip.line2=when powered diff --git a/resources/assets/enderio/textures/blocks/itemConduit.png b/resources/assets/enderio/textures/blocks/itemConduit.png index 23113e58c78442d66d7cd87d615041c1cbd5598f..19fcf1979cfd437b5abf6ec8c9746ad72cb978a7 100644 GIT binary patch delta 453 zcmV;$0XqJl3f}{eB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000id z000id0mpBsWB>pGbV)=(R9HvNSKEq&Fbu6XP|*iL@CW<}zt`XMLDWYtyC>7bbjvye zvs>B&Avq?kO`3X%nx?tbH|n~E5@cDX@;ukfEn=;`;pGDMeSa4rT<~x!P*s(-lq!ls zgn(`K2)G?zmZfHox$N=e-Yal>3fi_6`#28KHm*yCsVIs>CrKij@w^_#j~wsj3BLjW zvOvZV*ynjlhTzb+h74gt;3wz@5KkXty;tCN0oYTn9Dof;(^SL+vtdOrme(MR;T*6L z3xwMPUDwHeF@LLRn#4DbV=@fGbCW+n-}iD)^jWw)fXum1)WBb}H-UM>tpLxfc@kV8 z+zJrpS^jUxvq9V5@b+E63ZNIz7trWlzTMa(@G%a4*wlQU@ac-NoGbhuz{(-af*N4P zv;p{N(+5bl1}D5%!1))E9cOdz6?nOTd7jm}u9_*aO+LPD+YfHXFU#_lhuZ`A?&n_& vzkpouFe`u+ntw8%fZYzT<9~za3MlmjUrhY6(*O+q00000NkvXXu0mjfC{WVV literal 1311 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 VnhfoTqaIpClL0GA7K-cp{~x0i^osxh literal 16638 zcmaL9c|26_|36GqjuOWbia0{ZzHjANvS-VdWZ#$Ugp93;WY3n}*p&!LWr@kYuSE)D zUqZu3GuC_F@89S1{oQ}u-`gKEXU^lgu5&G~>w3Lj&*$@aZlI?@eSzfy85tS1mZqv9 z>6?R$>`VmZ8Pb(+&Xxn|>x#dcnZJ>jlYgMCuOpeVgO{Bnhn9z}v!kJ-twXR+uj4H; zGQ>4kV>5pe-PFp-;p(8k zc~44LRM-2qql>HNV_!$3$9l&0kKOI%95@wWj$1+Uqy{`3{cSmdJRW-b$pH44BBAgum7Vπ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 z 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 k$Z63jNW`9=7bP=eexzMQ5gGo^ePx# delta 353 zcmcc0IFWgR%0xqn`rQl+e7hNs|F~ktz`!6?;u=vBoS#-wo>-L15RjOeSEA?V8lq5U ztY@lcXz2dg$((_Kk=N73F(ktM==IZnEe-;$iTD0@nkawwHdpYu*rP4C`1|D`p9`IG z`ir0K_~GH%k93QInFLtt#WoJU(D?}T_SU2uj&k*zjJx+rcDd9GkM!rRJ3W0 z|NXVh(_Z_!DE`rxn3<5$G?CLyjYNi0_}%j*zO&Rn?lPNOQoHL}*(ddR&oXDu{jqQJ z^s7GR_m*jGS2S65Tz~8OU$T4gu8Ux|O2Un$j|e#A)6tLe!8 RcwhiBc)I$ztaD0e0s!nTo2>u< diff --git a/resources/assets/enderio/textures/blocks/liquidConduitAdvanced.png b/resources/assets/enderio/textures/blocks/liquidConduitAdvanced.png index 5f5dbbe16e74a38c991762c6a38e89b4cd8daff2..8472ee8941f0274e68df5809b78bc13d2120e66d 100644 GIT binary patch delta 511 zcmVpGu1Q2eR9HvlmrY8=Fc8O+v|V-WQc!q)Ac(k7sET`UAc!Xryo=xo z6uf~xLC>My<+X|PpH5y=d8Ktx8hF1_GWqDx`Dc=*`lL8>ihs!S90ikQnfjQ&X{nBi zk#aItDqzx7ZSEbg?VMB2TDHd^UIjL`XHpxNcojH2EtI9X$NX0n^xjj`H>8xh2U^g*;c+HxAG2&UT{C0nX#P z5M+L(*3a$TeI{m$&`-n)1Oi~qF3OVM`akpCHP-uq--s2clfQ+rj=IP&+Fo)yWueBC4Ybvp+l$8IG`y5~m#G1mM;ndYp(*MK^qT zAMq-%-lt-hq-tw_o&Std%7M@Kd6U8;GO+?m{Q_Lt#}A3e-Vp!*002ovPDHLkV1kb5 B?*{+? literal 1242 zcmbVMTWB0r7#_@}5)zGXNw9RBJlLvp-MQ=x+19;e?ZR#nw@bTV9y~L1HajFUXEQT# zH*3Mr7{Ns>zDSz~p(>%Z#a9tyyQv@uVyguaA2ij6Jk%iCrdBOk&un(151|hZ%$(c* zecyln%e+1@_FP}jP!B;6eW{~~EFQ_=eYhKcy=wIi9tQocnjl7wR7${@hCZpoDa(mazkYIsA}upQ zoscqIrWA)o>uA-5$EssFqdIMS zP&-cLGZSPSxsa3?i8eTaCl!_9B~j)1XGnqLLoCm+f=cteCMp^)ldXrsYOYz(vWa9% z3$G$n(f3Ol%a+S!rW|6BJH_&CP4GQYN!Y?0Bs};gGQvP-1z8V{JRQSJT?_v+!Rx_O$kL^Cie;p@-&N1LvbK z+y>*=Jy<9(#NKG*u7#5VW)jGlv!Uas5)lfYFs5Z{h7NSyRAd^cT$omQ(WLbPFlku` zo17tXvJwildG^9f2~Lz_vK$S`NuD1SW6>y=OeUjZoQtcx6mDZvj^_i%fNgCHYqzk{ z1F>4%g}_H{4xyQL6-*S7kGvu(k?}Zr@Py@Hd$lmwp?3BDHk(>>#!M2YaUQYVEyS@r_59`v>Og=R1=77oLCQ z{-3w^QEOLENsS+_yu2^XE(>qHuMIO#9+tB7|z0znjPJiRv+xlCn9X>OX zJ}LHeqoIXV{ik=jzP-EnJAmq?%)OsC#xL2i!lWHLf4RxGeq-a>@Y9_Gvs-U&Zf@SJ gE$E*qoy0@E#JF6%v2}6nLh!dqjgBQgjJRPjV@2HIZ1DQ>ymZwX!aSWTuyq}{ zIGgfbFyOtQpfX^tf|*cT|9M=UyD`s280YsB#H5@beQS8Da|O14fF)KL!882}-->?h zbbO0Ym9^k@tC)N23@uJXD^{WV!xNFT3|B01%7G^U+ZwRPi3pGAMlPQtZUy#%I2AA| op~F$1|BMp$K*ApA!QU~_52v8MQ4BXWEC2ui07*qoM6N<$f=ONKo&W#< literal 1254 zcmbVMTWB0r7@m+uYR$!>qE;~DL{gQ`{kAh?6SKE=X*OLpD_yYQ&gIPRn9QX!lkQ|i zQcP=YsR%wQQlYdDDg_@@#FVBI1Ru18YC#c`dZ~&+`(SM`x1LFMQy)Sf9GE$`|NFlG z{FgbJAKuxqW!n}6K{~R#QUy4o(YyH``1R}czv1v`kS+xyjuF%p4YHs)CAX$FXalox@O5k7IlJ z9F=pEpla@_dtjtKT-55Lnxta`{b*k(Ljnr~3L08twl9ZqY?W7r^JtsI&{dOQG>)w~ zRm$bjq~igUCwN?=7#bBNg627irgxwWMYAMLk&J}Xw9JVzEuf7DgKC~`$c0p))ji|AN<5fsnk|dI1NQS|o1@2GSffC}j-_vAB0blb>H!vL=jTjZx84uzZ z^mOeCmYd716We|xP%va;0r<|ir@?#}Jxwr- z-Q9&EL+FjX$1`D4l(Cefja$GDvZ*)*PYB)AWldF7RTl+Zk*F9h(VUK}hN9yF6VoY; zqXdy-ugxr~^m1c@JHg$zxnxj{A|#yCof36jVQe5Q%b+J2ze8fa>pP`iPJn7d%* zqz9D1@rsT!)~tej)d?KG>bPh!i9WU0v~{QEKOJRg?ZPSGnFoNL@f-_X4Y6!)Ag_uV zuW*8dO9m(6jKXQS65|D2V|5{BNIWMpG}gfD|2K3bbc&4X zvTt7GzAl6Kr-;$Xa=F(t=jV5~{(gh6FA?v*yZQ9ny}5-qe&{S$wAM>2D=Rxqaq-`! z$I{(HkN5U(YnvMAnEB~=+vR_zzQ8}&apa?WCl?ow@?TLuzxY7n#v0X${>jXh$%W;Y u!y`z~nIAtqdp5prYkut3tH`qlTab@0zwqat@A7K&=gFprQ)d$8S8f9{@T<%K diff --git a/resources/assets/enderio/textures/blocks/liquidConduitCore.png b/resources/assets/enderio/textures/blocks/liquidConduitCore.png index ef8c4fc669cc34e603513181542b9a1cd36cb257..5d7a308eeaf54df5b8b1883a45d8890352e00bb9 100644 GIT binary patch literal 673 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 literal 2149 zcmbVNYgiL!77h@opg=%G6lljN8n)yzxeyYG7?PlYjTdAA@lqz42?WT6WFjFemQt!* zw<@*@h!R;)E@kxj;RF*0MSi~|$HRso>~E@nW9pb%hCrm1vX1CRK|E*G2I zwy8wm4FpZ)5#Kr$FWCSH)LH~!QCMUdjSd2A4h3W}IUpDW&}krp3eu=_4jBZwOg0w` z24)^2rly7E+-PCMj25=y5tC6=!=+L)GBPL`42oKtL6Xq~5F$F6R-r)^Y87C!2uam?lt;uoeH(&OBayr_tkTUS3QHN)0BNWog+^5>ZE?Lp z>(FTAzizx2t&7RjAk=6?r`Bs_*m=m8&XTd*{l1V5h>@C+6qj2hRgX~E?1yMAXKf5QLEEtt6)R2 z8dd9()fzw`07!8P6|BzC1=>#NZNNfAtJs0S5n8npc#~qT;yv2kpEU}BNXa0Q0`n>+zFq2v_@cn!|-^=t; zzN4Zoq;%i#`J<{~R2B+WZQr`}Kt+ZBm9eR*pcN}toK2|7bvOI^`aXFzJw158&wOZT z*jis-zk95qp`kulQZiaj64& z_lN7<-Q9QKJ~cUg^V!R%PgS>amYWVPZ(%>(w6`s-VnHHw$!iyv%iV7_uPINQ8mhEf z3(i!%Y$=J_N54F_-v2?+$CV3LBuo|ch_@ZCIn(?tgRC#R{OR=M=;UNd&+Vb1gI*_F z<44Ue6R$irwH*!FG@n9fsfL->k0`@Ny75r2KHlxNL$-x23fo8^bYym4P&|GG9LcKG z#Wke*pNnglGY}rPJY}6F(7COx4j5cB{T0P~* zowcZVoGrg%j}|vZomn|*KG50^QSzKyg9tx6)o2qBy{`6(tZshBa6G-bwUp-8#b0vj zq*!>Zo#kHo`Pf63l&y|A0TN58&hsvRH{twF&k`4JUrX6-zyEBg4v*PWWwCZMd!54P zOPpJo+5S_W*K(Qzg}m+Vyuv)k7t3%#oUspGxkoEiSEAw^#yjmtH+L2-+I33N{)wmL zpBG}Tar??hS8j^DkA+;0D zp|AvI^W3&v@4S&s@jC1GMVAZjMb9(Bv#1Q3T}yXbQPb)3LR0q~yVz;_4>+(Ou0|B@ z@^HnkOJ4SAi}A;zRp~jqjx!D98}=_!gvktaw6E8aQv84qSbzgX1@Kv8Q21M1|EHvf*#LG@Ty{O6O*Q>FP$wmIT z1s9iiPfSewB1a7dQb%mo=Che%DC6R#qMd=G|4zVeucV_x{r%@&@5BM>bg+-i5#Y+_)<%Yhc3aOv9}*oV_UgQ|b}h#V;1E K6V`?&=KKcH6>JCq diff --git a/resources/assets/enderio/textures/blocks/liquidConduitCoreEnder.png b/resources/assets/enderio/textures/blocks/liquidConduitCoreEnder.png index dfa54c473b39306daa4ff13306fd0309843ab2d3..c9e8c82dec8c006f60617c61bcd80e6751cdc16f 100644 GIT binary patch literal 822 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 NaPWY$Eydb5{-0s%xhwzx literal 2410 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 Ph5uD35aGrfJM#YkOH$3G diff --git a/resources/assets/enderio/textures/blocks/meConduitCore.png b/resources/assets/enderio/textures/blocks/meConduitCore.png index 96c77ce36dabc1abc10df9bb038f8fdedcfbe3eb..788ec80eaba48184c7e471e5d4e4a42b07adbcf6 100644 GIT binary patch literal 895 zcmV-_1AzRAP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0~AR_K~zXfeOAkA zQ&AM%_a^C0nkKbG8)_yQI7ymGf*?{v@G)>Mi1-*P#cy!pH;5umI_S))13^@LK@_hsif;)ZMp@_j!{ z$`KgX**3ubMuEr$fXpcr3PCg)RVRCkNDMGwJTdJyuti8rKc`$S2fbcTC$U&euB|-K z?M8QiKvq?$<^GNq~jCaTjvFbUGdN!P$oNWcA`HiN@w7<|QSaJS+2FS`u?99h31zL%5`K zh!;)DV)C3g5l_!5HkUlL6H&V=h<%`$%AEiSpKabAY1A*YKfU)RsJD*f;Pa=EM#Suh zu7o5m{!9Z&r(u!}I&LS3lz@(t0%jF3$;NybA%Jr8kjZ%=xImc0G(PGcbX<(i=Nz{m5v;X8n{_HHwxxAeLVmE%TLPMU{;tJv`y zI%3{vA4{`SlUDac4r}|Nzu#+W5iAhUmuxq?>*pV;5l(1!@kCmxKR>7)Ft+d@O|uJ{ zjU!pVbU$nT7R(*Tk$<5d VL`Qq>X>b4l002ovPDHLkV1kb-h$8?1 literal 2339 zcmbVOYg7|w8cw+jQi6B^bRh&3R6;U=K#~SyNVo*K2`E{PRVK*s zDyY$d7F`vH2SKWfKo##m1axhMEfrR0ul%YF=~les-&s|vF~-M$b5DikHx%) zz@k9x2d6lZF&L&y0bxi!Bpi=G1TX;;6qYLI0)>POuLk9Kz=wdBNM_IV9<799 zp+DXDBw87tE{E{3kW#i?!9(&PaGxh5vHNR7vp~cfYP3R#Bn1?+WW4PXND8xAfmq~? z4`0Zq^0*+E%Mb9!ffNE6M*;l!IIaNX)@DK3yo!9vkpG*!3^7khLi~v6X z0D}D(L?#gAM%_xa>zWFEmgvxln2e*79zIixP-stQke<}gk_3&nM^!i1u-cy zSf)&o$uUeO#w$T6<;zsc)w3D;a9|ds5Pk*mLliOz=6#5%!cUkNa0O&O!~=0;KH!T3 zNqzv1OC$j}5?=sPd`SWUK;dHN`27Djba=!m{A`{4Pu&@0D`!k9z9xh}Fyk%3p z&Yhio#d|yRt`!fQ9jY^)^Rm7XU2|9XE%(Juuh>f3s~OI%fCH1t8vm<*Jj$r*CvQ%x z$Sb>QcR017FT;SBpd6M4-6~mMbe}#rV2ZsGV!S|UAE>PA)|!XLy9>{4t__`zx}~Zj z7*LsVul5oct#mv>vB^rml61Q*aE(Fxw8A7i=S|MT;F@v2$kbCVWn~>#4=p*_^XRoD z$0i5;ye6=sb)&BKh@(d6KZWXhl+nL8;KktgiHUAwkBygqSZ0z(fAf;JKT7AkwEkr7 zgD;03jGJ2*{B(X-#G zdbj2-9encqP;HpwI#$6lQS{et#qRcT(ovnIG2fPcI4Z<$?Gmf$-#cq>aMPn~+AFFv z%OZrki!NzK;|xhBd<;3P6oR7}`e)EJKV)Jju_-t*KIoe zUBP4fbw73gQ=TWvMDM8PUr%z$YNeEy2QMlXTuT`$tP{tcRJU&-K2uqEM67*QlyqFM z&51_~7rV6eMKl1XW~9ESC@ed(``5}U&=v)r4!Ly>U)T;Fw$I&duSL1#klNUBW3&^G z-7%{|ODAjxhKP1aC(4eaqq-kjF8?8wyrOGls}cJmeYB<2)nAsb^8~M%yNMVc_EFXnK=EOGxaxXw#WK?%rwdQ^~ai4dTeUaoBX3V zs+MBl-IaEUd$RLa(~d9bo2aQ0H)V&sJo>OFHw!>_tW1@2hBqAKCtnD1Goi=r-4Jql zYH%Cfd`oZol;+Ut7sj!73GTv@GFh*cq1pJ>ld(7ueir^jk8M4jdOpD0t7XlE9fXsw zd^FtlylL2aQ0t{;?9B7Pc&S#QebB-aQ%{$qJL1 z&~HhWRcE+9iQ~t;#N(xBCVZtyx&En)qk8tauSC(mCdNDeC;g8uQi5khX&v(Q;^4iY z3%gBSTwNP(@+hmQ+oq>T`Nx{b+y%S579n9h_vmwb3g*ZZBL; ziimMqZO_<|dcd3ZOfhscf*)q2QycPcZak}7+2kF+qr?onQ!g0oSRqQj-z+?KPoK4O zqpG>CS$8a^^vij*_uU)&vphs7bU$tVMEqimr`CDs7>>?t7YH51na{^Xj7yC( zEup#;kH3}nG}|hToqYpm*7W5$pY=)Ol#piHJ-6D1PnI_C9JFyg;qnXao=FO23Js@? zT-2%PXIz0(yq>2=))+2Z-$j>X4n$&>AB?k+WJ|NUbLmqk?}eEitwlf+_)f1 zTL|SaH|ZZ%^wlrC{el9-7Rgc`jSM^JYbq@ciK4R`+*U2RU#_+1##z^$wR-ukuu{9_ zx4Lb;%RBA5aIM(-h-G?9gYk6-b|m%RHq)$ diff --git a/resources/assets/enderio/textures/blocks/meConduitCoreDense.png b/resources/assets/enderio/textures/blocks/meConduitCoreDense.png index 8965c6af8de0c2769ae6c74705ba96d957b79b26..e5a1bb9991821c6120236ba1b6d9d9d47787b95a 100644 GIT binary patch literal 924 zcmV;N17rM&P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D12IWNK~zXfb(YC$ zR8bIy>-LbFPG?Y~2^t7Nl#H7M#f1wY4iMZ5BB)Ej*ARRLw=VJsf{KcW3-Jk(pn_sB zXcIDar>ErFU#0){cu9V!oO7!F8qRR56HQG`CE0A&!2bTe6$%AAI5@Bf@iO)3( ztU)G|`Hx?%R$a%Mc+t$vOmaTH<%;i(x2_Zv7{N(N!hmT|>}Yo0?cb`e@jJ|hQ?uFZ z1l0)Ay3hu~IRz36kSv;m=ZZE^JY!Kd_Pfe=6+5S(9pu8Q5H6Gv!reprKQ6PTO!-U#6;WU5F|SChy*=5a1;++__~1RdNiKkxFnGIket{` z6b1rnjPhrMgQ#72tKd68f&5%Q*&!~B-L&4q34cx633^q%wzg)CgFSok?Unl=V?*0U z>wy!;@!@v>*?V_uq_;HcWtXjT$#yCm{uFD?vX89G)h(;kwr#JzV;kGQJN#y&;zg)H z;9qjs?5>}C=tf91yY522m43W)JK!>f&HAWS%A5B1%Kc7Dq1o{z18;WP8Uhp?!AVCW zU{`e<0}!7=H3#s#n}*QsE0KbvAwOLv!W_NC7XZQ}7kd`GfUkS6ETe7lisT#y*BVif@Yuq@f?gyA yMbp#M2@^SSL_+8sCW0#)zCdgJ+rm1EBKr$isa9gLT@x?>0000~sd+G26b}fje8K>V;1FO%^#(KFDkML(%O~dU zZ5kPP3c-tnYMSu~02cDrPFAfjl0MMrY6%3<`mun9B?}WThC) zo0cs|5wqH)GvYeT0JtqeDy#$-k_k_rT>&-9<X3>1q}|mcwK&+j$XR%;rfrAe}4bus{%$ zu_T;WsZ15w*VZu=0X^8o{7szW=8ZL~eAqp1;nG}f40x2p6 z8>Fyd4a8%zH5!noA}{gb|2K3r!YP`&PX4EEmbZvvbWfjm0kL@AM~H!F9uv_esK9SG z(R{8HsaR%1dBuVP9JS4KI^65dM&6e;nfDlI#x(B;JdG`Iy%#~K-y0VkN2=e zCrDToq#&TR)fTVQUhB!I78eIyMQ=XXbClNUpIiIj#z!E8#g2}x;=zH&)=$4d ztL_gC+w-VNRr#pM7Tg-R{SKcxDXHJ0Zf_W0Z=wAg+&ufXsW)suH6GaJ6Tc%>f`*^f zejl;e(^I>s%#L3S>Q&C7*9LqiF05`YIXWk|=j7&2&Ohc#ysokUeu;)gz8 zjp_TMD{yT@C2QUIdb0J)bIMk$q(HGM541-oe&71Gc%xDf78odUO27=;X1%vFgs|k>TN>zh1F7p1$mGgua_e zZT$UUDhFM0OEG+@eXng##qsyUe!3HR*j%^&h9GzJXE9%v$DbW)A9H3M;BT@857k`n z{#!)ts)E2De&q#4>Zd9Dyz+%+?{CUDD>`=W+*uO@U^j{V9*zCudW7?yc51pi9J|>xyTzF{q)B(3 z-+1V8lITKd+~dp0*!k+p_lMsJv%gg%X$!m__gh6kBfXiwYJAL8yCzLM*s z_LoQI7xsuwjLz?BhORJIzWyG6X#X^6WW-(qEsXrYoZ)VG)mv$*ss0=8wO=raF*R{HFxX+5R<9#de1=b6oWHfapnf(*kz!-Q@17iN(b-|M-^3 z3*R|dh|F}XNmR;O)$W)JIAUBg()%*}nOO1D_X>$U=98<_t~<`TVpF-$_J4R9Hvtmpu-HFbstg7$Rk0fUNWcNV!S(_9Q(~dmbb%(hM0Q zeu_l<=wC2t-k8h>Cl15bBCZY{DP-VEe< zj!cqiM$S3XYZ#`-{QWhxZHrv$13k!s!v|Q+Kv5L4Uwz**Yb~zpx_$uDG`(VBRM&NP z;IB2U^#v%UBnu+WfKqDC0MHnN>!xY2_^;+?qS%4*nZKVJJ002ovPDHLkV1g}9 BeFgvk literal 1272 zcmbVMZEVzJ94|1&oNg{;L?jAL7m%6t+UKs~H|Fi)E-@zSwa<2S>&x2C z>n<_!GM2euBoaQL9~>{?!-ORY5y>(j!9)l~2ofQ_Kp>KUfj}}Muo?8}b~pX7@WCeS z^Y;J!e*fqH(hpl(nyM;SRALxb6>pBF(1?3)MLGJ~g~EL_JnzIZPMgu`q-n!Xv>yrI;x@L z9;1{s`W%r!p3YuDGn2_VV%;tV3WbbvC6fX^n$k4yUNhFVlY;-cF|W0q?l&Qog0|6T z$tWM4btN#0-IIkpL*$LH(Na-Tq@JiD_i0df;!%-6Cq6}01UV~Zvr331C7$L;9xw`- z?UWRf^>Yd>Gc+3t1WG*f;kg(GVstPX4l#ZJVhk6ixflc1v#~JC202i|#&z3~bQzYk zRis_SMxKZjA{LY!!%7=QPpJx8bB1HsIm5&w5qxdCsw+m`uJ<1f{51vkBN56mhN640aRJLi) znHxKIjWq3F5lCJbt(_3@f!Bt&<3qKJzuG!J^7!PA?XN7u1`oW`@%Hdo{881j_gA|| zrdAE@t*FPEkG}Amen49?dFmq6YtI?ao&WTLEl{~bw;qT7{QELb?_PN6mv^tNN`%p5FDq`xnJyEzz;{9b5hZul>7i diff --git a/resources/assets/enderio/textures/blocks/ocConduitCore.png b/resources/assets/enderio/textures/blocks/ocConduitCore.png index ddd159dc14840c2d7b77699246f10b853a5b63b6..55d02f941c84c46ef5c8a6bbf9ba0a50d72d0720 100644 GIT binary patch literal 383 zcmV-_0f7FAP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0Tf9@K~zXfy_8Xo z!Y~X(leE3Y{~f*j}MUvrR`WqEtlrs53L|NZ`Wto1dI%k}2b z`fV`P22*X|T)2bwiXgpH-0%O+QU)ilMZpZf_hz7~$%&}y^;%~~UHlA8$yq%)y@bOs zILY}P0Mv0(Pmr?DGINquSm&bo{E5<~j;$-U%09hbJ?T^E zF+clx-K#@9*YxV98XwxCou{|LG+Oe^f;b`dtwOugf?v)RzR`P&_siYa-*-7IKP&&& XiShi8ihnbP0l+XkKxm{o@ diff --git a/resources/assets/enderio/textures/blocks/ocConduitCoreAnim.png b/resources/assets/enderio/textures/blocks/ocConduitCoreAnim.png index 74c1443356450da1f1fa93cb14c02c19bc21a4ce..860bade06931c6c1cdf26fa52b82eabd9d0f7a77 100644 GIT binary patch literal 774 zcmeAS@N?(olHy`uVBq!ia0vp^5anM1_q|to-U3d8P0EKI0n5o5OB#=-^rLgDR%RZ~yK~oqb=lIZ z5+x4JIQ&y)TDb4!7D2ul{>eXHcN`Omm{G)SeY2_3A|WnOa>I*VdM@|BEB=vP5HR(X z4c9}9ixKOuD_;8b!=%~zb2Cfam+(E_%F zol+~ZERCbrr}FSrs(bT~S6|YN`ILUSzk=xFi1eX9dUNr`JFH_+s8u5S(jpmF?Tv zq6^!OzpAitGvl57d(k@U*hjAyeVJ9A*WD!55Xo1z`>yJ?iN4M+yC1D9e0O=*iMtbQ z9Ymkz^`a2nJ7conMm&#a z4lY_P=cmV6ck)3EAH!#bwcU4kZ!(7jzPpyeR&Z+Vm-2?7&^4#L;-9o#5?5UiBm2wR zVWHO5N|8f_ivoWwx+x*Mpo?R{)`rJ2`(`wsti5>pbF4)B!(Y6=zWuZBnU)WXk{Mad zztb!?Y}dX0R&P@#Fbrbvi_cAZH}}_~ZMo_DKWfzm-Z4E_8zsI|dK3GKMR(R-!lvNA9*X?VIghE&{o8|m$L*g&M@ zQH%73b<;z?%W!XdtEdreA?D7Zy)8#Eulu&R>*Re>f;!Qzv$k(g((X&Ycl`X~kkd~u z9a+2XwZXfx-3C$Fhj-k6e>^aauiaT<^(w3C;Ah#BZ%W;a6zF{TuS3N0WvJ2RZEtsM z6Jd5#{C!$O?RU50B}VZN4r~&fm3pGgF6|Pf{}hamyxVJjIb-Tsr6WyhHYqM?CrW<= zT#mV;V9$J{FRt%w$IF;W84rC{N+>MqeE;g#8_CKC9aCHGYlgD#uwQiSm1y-XJ->Z+ z&wf{Z&RZth9XN58gpq-DvqaWh%i8~yF&FOi+_?DRtmoY)X#s1)RvYh`!5Oh}hUJUG zyP_Yse^^?I3HpdyVPoWiT>rSL966n_$~3hcX0Ok51qkfocy)R zrtS?@xHSKL`HVmb`&Z5T4Hnofu=7Z7xUrIdU99{boBO@{_SILIT7Gf7zL$0O@dw|3 z9r%6kw|@5R4Nt!RdQen){r-d@(5Ue zJ-GEX^FR9&DFoCspZ)dCr2fm-$KMV=xxjvI=g~uFlMO!qcg)X?NGkqo|64qH5S=81h&0jMS`VIk=r8c1 z{tD?I_E>r-^jce@Ad2}oC)<6~j4VZPJ+xWS2kYD2dCI)m*?$ndG))z0#BmIwsMq`9 zC}RF=_$_yaTLLG0pznDUh9R#3-}gx=#lzDvtn0ewIY!eot&%7Rf}_?(?`{QNr&C@l zow*5d_08rjPkiz9O%bFj>9^+N7f06?}FfSe_=2h12)Zh@`d z?Fs;wz7dI2!8yIV6}axVV&>a_!+%1@2@rh)wm?X!&o$^l00000NkvXXu0mjfD4x=d literal 1246 zcmbVMZD`zN98Xu;x!SJc2Y1SSh#8x!ESHx{a+i2#S1+kOx4YKc$!;G6pG%%=Lodl) z^4u<06-En6$DE`3L5D+_`emSFL$GeB9ipA68|s)a$52F2=O)8K#ZBgu_OAM&?1O>i zdHenTzyI@p$@EC}(VnjRx(I^kNe`(xJd(kC#~S>-8M^ug9_~e20qt~3s19663>Z!k zl4%Q!!W;xfqxu<45JY>`%ok80vqRAxD*^&c#J4J#O%REGzXJ4eh{z%wHSHwz`>Bs8 z(lnCPE-}MqDk(T-4o$dl=R`KIPmJrbLG?dOCVT}Oupk1YZEEjv}njF2hEg`^k}X`SUcGA2hjQII)qE6KB5l;K#0muZeugqXrfWb>i0nroDl zoI2Rl!mA`ThEPRen0mb)sYfG@JIZjfEHf<6@H~wXwAZi^@M+uI*s`EPPj}4+4R_<$CZqms&|Bvy-RE8Mj0Az<=$d<=G3YuLxfEi> zTt&VZ(?uXiGA);c7|jDgr$JnlXgz93@scbGF`lEEeB=Lyj=@ebL7n`kZdzNo7=!6b z7vRN8A3+;8kBhrx`0OjVL)+TZ>OkJV_}dewdZyUBJ~@44YI5I!eQkxkRX(%%4C>yd z&G(;M4By%D*7VStnc)lH{8FC1b@;*0c|RAPpF4VV^6#JTe&*G)$F@0IdWM*FYyOnlch`D$sZ&2Phb47*T`P~4ume9 zSMuvmd~r{2SLgHH*0+BRJv(P+jfFoFYcIcQ647c&Tskp~mascdaX_h3y@^ZJor{7o3wjt_*Jv{y1qZtG@HdQCU diff --git a/resources/assets/enderio/textures/blocks/powerConduitCore.png b/resources/assets/enderio/textures/blocks/powerConduitCore.png index 35537d2e55bc4a852736f644734ddf1d8004b714..b1cc5df650e6685f15d3bc4eaf8f17e09634118a 100644 GIT binary patch literal 931 zcmV;U16=%xP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D12{=UK~zXf-B!y^ z8$l54U1PApMghd*!b4mLkwAhACz3zdp$Kp5buA>3V4p@ZHy}cv_s99J_wMAxVvmZLn3xcmB!@31LM{<FY{9zkMUC|C+n7mAPt#}1zl+fJurjecLj_If>wc6N5sJ|>98O2xkJ?=uy{ zp&06t8EQEKHq{*c5EQ%x-k+V>-Se~h#bVK--QC@^+wCfXrE1mc2M6}~`dS1(e75ux z;X#j|%a^q^`*3<{-y03_S&fVVkR&3@g7zL!(0(E12iy$W&sNJGG3HzYK|Nr6-)!0= zS|PuQgzISo?ly`t&xZAO-{{EmehKXi%1EoC44ij=*8I^MWx&*xLB2Do+RzulD#(ta z1+=yGbvuS-&g^>Xd~&$n-x=g2Keh;@3Zg8-&jq!O4XZ6L8?K8bI4i9gL#P*Xk(+=U z<4%@h8WA%ZMtcl#I8dXKCAYVtH&J(TwNV~*s29ue5BO|tb2Ag>Rpt$XeMICQ1WN|B zOb|A%H!2Ycez4&eo1C9pa&={&7%@IXd_7iMUA3d7C7pvusx}vQJq7{GMA_;q&Br8n z)MSf}R#vhsP##`KmWY}3DVB4TL7>M#^%l8#6xtMhND0S?SU~j2#f2p|HyX13J-(O} z&NpF@p`H$zf+UCphlnuF>&BqY6s3{Vf@q68uEBb8d3F6G4fS-$iX8CtG=}xiXDO1) zOU+Z5Q6nmi$r*4X9|NHtHudU|st2dAFT+W$Ct8>E#Ij*PIl%LqGz~im&O9rzh!6;ab1?O`d~52}Y-~0lXjn*o6KNoaYZt z6Fe{5fA*V9C+kMA&)Y;%7h)FSCO#jw{M*8H*>7^segjW+UA~{;yn6ru002ovPDHLk FV1oQFt=a$p literal 1911 zcmbVNYg7|w8jc|ctHw$ZQB-hS?r7VjcZS5{ysZ?97C`h9Mt1b2jV#NyrR#{59tfh)0Infwt#(`KX zl7<^`1k258!Xr2wk1WEJ!lWd`D^b!aLfjaU!%DGi4kseYK_TdRoB_;u8evlj`fKV0 z0D-9l$JTXx@5MfeE4_fe43^HDJXV1aMe0ZFZ$YC3tOD$r3s25NE_g`h?vQ2MkQc9eRBmXm5}h(u+2UeC^lqb2SSM<5h%7=-S>KpwlhZj zzizw}Z8zmoxY&r>$!r>B^I@4kPG)2G`$BFY>y2_LO|VHpGPNX{ZN+U&tX3spPed4j zDN!?GHe+&`5K(~PLIo6t3C$J+6UyLl3`D~~nOq_nxAQK(G+ZK)f>KGeTmnImE=-|Q zNYqlDUJoj?dJPDVb7O6G2C<>|xHiFRk8$DOPTWm49r*FG}UA*lh+{QK!&34JmjL|x_`O0Ip z(I&^8%oXif?Vwk;$1!bljObF;rFk}>XTHi})W2Ng+_HLGM6q^oYbaUY`azgp4H?_Am-%#se`B44hGyWI?*a~X?B2^i={odll3&|r`ik6XRkCw)I;JpAZdT+GA~OD{JeB%zjfk$id&8%@ z#M|o&V5#H}hjVwf_ja5={B7L2*liPd+~O-Ih=QkaQ;P+|i{_q^v==nNQH5tK^NKd& z6oroSHOmcGnLD=>5?jUL^p-Lr9feiHh^v%fgw%p_!X z+WP#>o0yv|WSP@&RDH)QKPsvVJFu!Wd>iTa{;f$f);0`A@GqXe7JMP_;(c!(1yL2P zdLo?5&F%f=b5phNPtFCyzB6{oR!+PzQx_m0BXc*mPU-iypXw@_nCc(gQnILE|K(+E zPYS+Esg4QVKYN9L``2gA52$ZX2x(e5wBXam%7x6@gt(sl%S}ENsmsbVmz(%^19ucX zD_)a)xV7}Kjy@o3YvoNk(!KpEx4Z`UBFpb9;Uk{+4_LEiYery@JnG!q z(2(WQ)AvEO=dqtY(oNIX6qy>}Eww2h6JKY*59cr6c`{KS#7W~<&el$ufk#~MESZ?S z`7aAOW~BV@)X#a1clM&-YS+ua>%M11Hv(=?==r`g+DO*^qccvC7#P&X-@4>!TI$Q( zyoD*j1D8aRm6H=()Q6>4s$AS?gRz4=kh*Tq;qXdOn~6e0Yt!2Me}~KY8BhYx*-6o<;k6YJ29zYl}jkZ1?)W zqhz{oHIEO@%b=!x`LN^t4FQG0tJFl$C@5%J>3yP*KNuHs&sY88o8;EQfGwMzXYKfL z;8|s7f6C>@g7ekA=NlRt`o4cO=Z35E;F7Gz?LHpxgw6(SW?)9})@3p8U!kx*a%W1uB2)ghT4ly2|Yv~yj`@Gupc;n2Q cuef|pQbm8?Z#&92yMKkTI)k=K{c*v60NtJUumAu6 diff --git a/resources/assets/enderio/textures/blocks/powerConduitCoreEnder.png b/resources/assets/enderio/textures/blocks/powerConduitCoreEnder.png index 774507c9bf388298ce968c9426bf8d98f30813bc..d6ae8282e29e0b166006feaa22f311c30af9697b 100644 GIT binary patch literal 899 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 diff --git a/resources/assets/enderio/textures/blocks/powerConduitCoreEnhanced.png b/resources/assets/enderio/textures/blocks/powerConduitCoreEnhanced.png index 52cefdec03669ee092fa80429adaf0d17e7619b9..9090dfa73db1e047c240a47e35e4e92a42c931ec 100644 GIT binary patch literal 908 zcmV;719SX|P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D10hL7K~zXf-IhCV zQ$Y}g=U%_A9fy#Fgcb^L9B_aVBnm`H!&AT?gaQx+q63KnQ9=PEJOtDU3VHi&U*? zJ29~lCrlC@61BI;&9ksYw4X%TPRJOrz^%2q-2ZXG#?*hmuQ5UPBpK@2AtML@W5S4P z_{p4`g(wE6siIAOQ^aUITsYXIo*gny;M=qD$VVw|e_6IZ!ep&k*%;1%gnX{f8QQLodM5138&NUdk_J=j`D$5arxID1smj8!DeKQq zS2BO4By&2R9dYKgwQNTv3ia$Y<=tlD^#4!q!%Qghcf z7ht_GA#>%xOQ+J*Nh}3n!C69%kd1;oh$V(OkWc_a&}tSBg!o(tYSEiWJz-?I7!fUzPs#zx)0bB;nAGZ5#766Eps0{>?TCpBaX_xY;JVifYb%+I z|JRMzT3a;^6V6S>twg>BrSg%pat=(z?ze?phLktbM2ntE3X-QJ(0l`KBvnc|K%HN+!j@guIZ~Tpcb$C2scvAW1+g_6XLt;RP+6y zQbud+LwPBxPnSYVCR5rPc01;+_`-AZDsS2R3UT}1aNnP0^CoDV3%cgkmLEh&S$O#H zwkrpx>f$B*zNv|c-a?|P0t&3|tUrF>lYm_I*|6X#sM`Ci^BZfzR0hY_tGDbz@yI>0 zeY7Y7-BRXY4TO~Juh^M!r83|Dpr*aWgYz&nIp2BSEUl}o>OsIgPjbLCJC{%W-fWw$XILswN!Yxeqy*dJ?CoI zt)Dd6i5HLj`=0tMxX(TYZtWknf#MbpbWVNM}^@$V0;l8pB3xgOthYDI0ERB)GtsTb zJN6IL6AL3hn)$FoAJ-gTatscNf1r2Iia2v#_1)2mcS{qNi@x^|etGAK&Fy4M=D*r) zQT-RrSLcU$(oHHC|?nO4Rdsm!b=SXkN+Q!V9#)U_(0u?B9*2iZ@WB;4`uC2$f zF@t%xA2lcKdUo6vGM(~k8l!IENI>a=pgQCTkrtI(5pub1Aca%;&(4N4lb7rt!iHMs z*iV7Xyl{`$XKx1&FFz1nyg`%Ucdg1d^a=CJbl~q*1HvND>N-Y(TWdH3k zt+WPR^g90D=K}H+-DBzY=n$U0aZSwppr_*0;Kjn3yQjy!dM{1IbsWj)xC4~mb+$#w zWO?C#N{CW#AC{NAd!t#mBmL*m=g$MPPOt1VKYiG8qEKuc;fj6!{E^Mpc_%cG_rBju z^JKWV)%Ut#q9^nIo9{dP8LR(RU~G>+vJ?2=i`rj49|oGH8A~SGw%?4L$Dr*WyLEG7 SW6hxJ$Ek`|ZcT6byr}nn zK_BNH+x|z?f5{Ogid6A9gX>u^vM5N-p~X@%(rRoopq=#^fq#=Ei6Dt6ia-?3W(|iS z^IyYlc`{rQ80-N*s3-^mo&&Dyk`RIeJYVx%R26d{ zx{HpbTVUv(F}>Xt*nZyg+WGasRVZllazkGqD@xOEcA+x&eV;11$8e<_=`NMdR6ltI z1`|N0I_G&#S$~$%Vln4fE^j+V;95}>owHN)7N3IGIc?wXXur>>EK9z&d1Cs7x5tL% zv$$$-2$<;Y>;Z<{O91<13UoWd6wq4S1MQpecr3d;U9VTn=yd(u?{+D#$8pR(fDQ*t z^!8WaaLAiCR(r<5aH;lM^$0Y8a%!r#zXAZVMZihlsX6C)ysm(Cz*KK{1%Ok&h;(Ot qjOp#Iz19KYBh+9f*Jz&R9;tD=)#?j`qb;?^b28rsB?X0{X@eeUi_bF}x;yNgMx zAL=HE^MjxhbQT<&N)f5uh7y>#p_94R&Ee3AV%bocIPG3)WvHmnwN3Ry*#{5qdAr~5 z_y0ftmwUD=w=L4Vp&7%lNTxlNM>8J0x7>urKiB_q08MxLZM}ZCUGyu!g;=X@s}Rqa zU;ySJ&}+jdVI0GnhK)k6-<$1JG~0}V028g64q{_id~?+S+933C6%H6yg1CI-D1jS# zg6QG1bk<42lF>fm!tRk=K^qy=WS!XjFdnZeNWg?Xz^mqvT3$;-Aq73nH5}itEj&;J zs$KRI1oCw83Z|3IE(=@UQlL=Cs48$MCQ4JL8Qg0D?fH55uNy0(y+X}_R33VE+0{@! ziY*N?irtM31wiDD@`!7oq=2E6t(8q^`I%ILKwqM|p(~mSR8@_;gZ~=vbO>jR|RnY2zeWW@KTjl$O#-G%yWr#`1h%X|Q42K(?2- z+zq)((uKgc-GXfoHL9SiWc#*PvK>5`#2@G}EZwen8-oljUN{9^<8i2`UE9PLLaZ1o zm{&!O2b>_2a*-2B7H}E~Bwir3m@Y^~ndd|nxxdKQ|8M9hP7OG$Wy#1lucG2Ne@4V97airWo6{=(6PsYgJ9dD|a zj(>P_W?$~@)cANu+v@hKSJriY|Nixl1#Jy>&*JK ziSHyO`su+7V@-X7p^a~hencNXdba#Ie)r@><>g1QzQ@juo|<3v!Q{pZTKi z#KgPzMfTM9VORRc?-*5Pzua~K^c)UFCSPq)e|v7fBi5&-TVLNZoI4->@sF9>Ztd3t z_s{RY%pVJ%eq!ARvlEwQitO)aJ9ngay=Qjs{;PJZV>E;rM(G+?+kP(i^<>&|sfn%q GJO2S>y|t16 diff --git a/resources/assets/enderio/textures/blocks/powerConduitEnhanced.png b/resources/assets/enderio/textures/blocks/powerConduitEnhanced.png index b9d3794f668742e3a2aac322348600fa4c053b07..5fbec9fa9bf0228f59125c6d1b074dbb2e6ac134 100644 GIT binary patch delta 452 zcmV;#0XzQS3DX0R8Gi-<0047(dh`GQ00DDSM?wIu&K&6g000DMK}|sb0I`n?{9y$E z000SaNLh0L01m?d01m?e$8V@)0004KNkl^>M?lD?LClYdERy);b~)rjL5MA2;4 za1=5BHAKskVVA&Q59|p^VHolp5JHeriUZ@Ss>t&^o@)j$HnmoI9!-eR3fy1*@LWmB z+=uC+AXAg`Jb$Mw%joc6pW`TJ9-6PNd+NrJH{R#lc7CiwceW$+f^STDs0b9M>6#zE* uA~K!zF{XF70^9vn%)I+I{3lGD0MRd>J76P%)xG8b0000vFJDqii8|stxuKJ?J{$28Q2husb&`9 z2_5voGz98kaTZ1}?Ea#b>2Z6KdnCowDd5{so^ByDhDCOJ7Et=3i)UedYuZ{fej(yPw7*o`eW==mOl+3x*?kQDTW#LUVtcCh#Q_ zw?9fOJJpj+;c?T3xIhV{!f-4e5-C>TMV8%(a||1xS%&6Bl4T`6B(Xuf@(@VPR&!EX zZmVdaRg}oPt|ifQxm>2o0m`)dXjT+On&D`UBasE^3>q%*NWiANK zC2bY?Y)BCR9~4P3$A?G`@CpgSLXcDfYA~D=1wO>FLDcY}-|I|%&3l*b3 zUFia}Sm`5ZpyshrmyG>!>u(IZZ*4-3WxR_wx_50HVd}nXK6YsAt*6#qsTsfg#hkY_ z`s$grg%4_O6^{s8#y>2kz!T4ZGJ7L;lD-2=FC3bPe6``t<$ZO!>=Wl%a)4P|kqr>m? zj<=ut-J>=fuDd#Q@a~nVv)^7H-8Dt#I|lyRJ3Z16d2sTT@cA!)y*jYiw6J$F@!CSi z_anuIGZ*%EJ>+dWP_wc9Qup|_g#*c#n&&28fBVJm&DY-B3^u9HJ$if1{L7&JQgYMc zvC)ry{H-Ci=7+%8iJ6;sCZ_iM`SFp7+1NKFRzB@okM&}w)cpLD+Qk|FpOa|ql;3aZ G9r*_$eX;cb diff --git a/resources/assets/enderio/textures/blocks/redstoneConduitCoreOff.png b/resources/assets/enderio/textures/blocks/redstoneConduitCoreOff.png index b87124989e13c1642597419b8d667ea319a83f26..d6a8735be89b2666ad8737f2fd759ec1a76a4c70 100644 GIT binary patch literal 773 zcmV+g1N!`lP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0-8xgK~zXfWtK~l z;y?^UUA6-Vh=4QnlFy3!AEj4)1r~gbM=z~(RCqE%EtNhg$@WlFPN&n@bzK97VQALt zwd_*LtiRvyd>+S9wza_-JfF{|ZCl0QE0@b<-0gO9-0ydhk-Q`TCPpA}PCWp_ZZ;d8 zZ?_wHQ#X=6pO1=w{fLPiTl(r4Q^N&lR*uKx*!R5>2yVCAc_K88tnmR8)Wm@Ek!=E(?2_L=tuz_9rxD$Tw|3+aZL!-=8172b#ebb<x)yD~BpiU9yaR0!J_^x5gy}a4DER@f5ju$#|L+ko@hgM|K4ZCw$qhZG z{HpL0qXBwuP#1XBE+(K%1R1aMf<>G9lLovWCdWsvHc=$tl{9$-KGjq`vCv+h_(VC? z(TKAfi8%Sx0Ed1zLVHHEZJK4G&Ynt5D}k^UHR6vu3K`T3i=*R^ks+cG@(?{j`(2w{ zvh75KEYQD$6rh~cLgYb29G~)X7{3?d+Mq_3D?yW2geKv~of#DiVGC^>Ha^!O+QkmE zCUSAc7(pcIC*sdlUt4H5uR-m+f#14LBq!VmWWnSMAu{CGMhx40{#5l2IM^X%5@#1c z2=XL9w(Ix`XMc!)vekg;9f&{EbokSj0Q{3R4Mh$w5(&b2yNrvII~jvZhZ~LS&PfJm zH4mWc`10&K8F|0oQ-j0dpdfc>O$M-;#-I?GbeRwK`@L#(C+psf1fF4CRFeX7Aa_oU zWxjtE$S>#fdBkvn|J&lp5MpRxy=>%s?qm;AN@@N9QVw-qVD^Ip00000NkvXXu0mjf Dc6m@3 literal 1962 zcmbVNYg7|w8cwOY6rm7o6g43ijfcv5(y+=a%5d6nTd&zOqdKLWI5|9 zvbCjxKq-f^c&WRr0s<8kDy<7Gf(oK`4^XWFT~{Pfz=9M6Y8bXB`2s@0U6bXXqP(W^m z_n`48jAW!-Yc z-P;Tr@C-sEi)qiD(kPTbB!;5^m(B(COcn(2g>;C^5kk=00E-E+84#1f5`qvU;_yWf z514;wq#BMGMDbGDycW3<(~JaR6)_lgyPa-l(=mJx0}={_3?_@gVu2(Av}ITb*a2E> zAqy6ys7;TXtb_@(0B(!04of4%G}6=OS1?-@iWi10w)sGjA!9gTD+8i48D_KlUeC}r zA|Cz4jhCWr>I^H&h(~Q$8m=evVF+0uld=1CAvcipMih&i$fUq2QcRy_MlFO~DyESq zbi{;+^g39lL-;%p7BU5(5aJ-9&Hy7Ik0n5udJdDvXR{aVyo@j9M?x|olP%%1Aqa}% z2n1}2M8IM5_)G~;z~?M*^hFntix+)_TFBf1v(duDFSJZ|li4)`K86@Yr~M(UXx8 z^S2j1j87hMxlAAAPaBWex*Mmep#kV-c=Si{Ndx$2{mb-&RRQ9Ni2L`4hnFtBQ{|JD z7gi9e*vk#dz2PF9nVBtfZEaifH(VK+&E5YFwXpPR=G|1jjqf_)>Ak*%;v5=DpPid) z2`cxCmdbj+JM##QnXt5m`*8CO zS!F#0-2C~cD8E{-s){Y5{0)Eqa&1b$|H*S=r;bw$WF z!&ziheXFFYx&C3|c=nOyIVlI4tK zsQY;TP$h~#RM%ge0GHXjixV%8A;BqWpzk`ZGx)AHu>b5Ei!Gl0AaODJ3roVAwFRFW zUQ_G4Vq$zgExXLs^j`PsElJcY&f2;5sdm}*n}6_gMV|TUbh)Hs=$tgJrVMVekKXrn z${dNor?#!D93QnFvE9BG$3p#SNx_CqU4P3Bulh1?<<@moeV)U$xT;`Ys=|NC4$rCRhN7<2@x`s}V>8Djn{RonE(lF*Es%t9`!#i6 zJv=qgG<$Ldxct-e!NIOJZNs5WeNT^EJ>e`X>)n)NnEdXoux^#O7y0q5_FB0|#}n7P ztH0;&q88-ilW&hwUcc&JTJ_uX^z6%lLre0C_O3gyyXJ@L<1<4BgRQVzSts9ioLYHb z>b=8bs-b+hb=9C|pu~G#lzX6B>Egp@jDkv+uie>a0fBIaL@v z$k*4`-cx_YxPSOzTWnz4)7ja^N6m+m2l^)`-^A{Q)btG3)Zc0RqkjGA$Zy0qryo3s z>bd1{p`ui@H^05QhrgwG(zUJ9zw2Dr(OWsS-hH75OM7cVL&i294`+{RKfg45Dd)yM a4{yp$5*6>$tCqU|p7N;e((28-5BwJ@OCak2 diff --git a/resources/assets/enderio/textures/blocks/redstoneConduitCoreOn.png b/resources/assets/enderio/textures/blocks/redstoneConduitCoreOn.png index 106d48a3ffa6b893eb903001eeaa90ebe72b8e12..b45cb2b44ea7babc69db83876810015067442271 100644 GIT binary patch literal 869 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 diff --git a/resources/assets/enderio/textures/blocks/redstoneConduitSwitchOn.png b/resources/assets/enderio/textures/blocks/redstoneConduitSwitchOn.png index a91432d46d07865a9db0f539d294225378ed4efe..d3c7987a652a26047abaf61f9247de26b19baa33 100644 GIT binary patch literal 930 zcmV;T16}-yP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!TTEa_MPWg}?T8ck+OaKPqiVPS$--nZsama; zIk4F8_fth^61m0(oFFF#%r~2j5xYHHUtd?d-Odc{c3aM#K9liyEF>ks1vqgI;tNXuO}_FH&h^GA4MFOkd{a(tKC-K{e3I9H#hR>+gD2f;A@b{ zTVR!0U}@Pq>d@7l3{)PebamcW-D8aIcBHL>FJ}aZcY#ms^>y<_dT+hcIU(#oJ*83! z95_?_bl%cAV!mj6qByVZAV*q^V~A-7e(009Uhi3bR44>rfS<+17)yZUFq>*xh3pZv zS>Mq*XWURC$eNJH1SI#vw_?qz@GSwf5vfC=f~Gx*M76huM~1l-72}OK@>v25_HL-& z@Ao#g1p;Cq*E2!=Ag|Na1p(qc5n_q>u>lokPPBysr4`upr%s4(B=EU$sIL<{myO+s zxY3g6m^Rhc8ng)_5}Tc*^gH&P-V^JZM7Dz*p1?`$7Da8OB!x_+(6%MNm>?Ax{n8ou z0#57IO6WLkDx%nJQo^13?RBkCjU*pk<2lIzU)n)_ix_Y8eOjyVP9bZ3CHY=#RM0E5 z+VR`!(_l}tayehx4R2BY*u6e`A?N4k($c2@bo3bje#;0V_(cEW*%fq6o_kGldw2KW zTVyZt)zwwy9~u%ofBZyFPfyc!(d-CPbe;%}4KQ9T7V_iIZ@cRF^ZB)JGK*v*5f7KQ z%Hd?d$sNaYx(3}h~rW%J=?4-y3U^pCFjD3^+aM*etl#>E{Aa|b} z$Nt_%{KLh?Ma94!{NEO@3}FooTpuTLf4<3HNC-jx0i?*SgC2qNivR!s07*qoM6N<$ Eg47tXp8x;= literal 2106 zcmbVNX;f2Z8jc{i0S*YV$Z`z@5y*10kfnsMge4$h6*#Q9NiGs0xiN_(U=ggSMS)J? zpcM<&L1eH3MF%1nup)y?t;LlQP_$5$g9;2w0TJd#!I>YP{+N5t{kHo&&-;Gwa&AF5 zFVJ|c%~}iwW6TZWM4~gGdspkBO&pXhhoiE2(ZcL>Awz^^djXzmCMqC-l@OqoWJncEH4FP*mx-=*#{?|! z9->TVVLvz(7a9)uA#xa?;;A?xkpu!X1|FnR7$E2lkcc3e01^o#1`Y(76dDus0G1vs zYE3RmWkzxWmTaLr7B)?(lraeel}d$Ik@1Lp2LWU-7z84TKqBE#1Wu79RYGc}{;c7JY22SmMLhRMZfQlJbDBHS&3rAjV`g+;&M zMPdf>cO^^B~bhL?MOfK_iowbw0%>(S7Jte=6uhBa=YT zpW;KL_;P4e1{EEs9J22+mn&5$A*m2vwk<|&FL8-~%4Pb=VMvL{qY)%yxeCJ55GA5W zLu7!TAK(%zmWmLSVyiAgA1=&+<>E|O6d*?=!21w0#h)-w6c8Z>8G>+(R2l_GqEHxU z5MTz5C=!7r4+;o@L^^hfFZzE&M?jq-=<4Ku>Sp-}Ek@n)V;7*Ck9`D7(dLn(U6K&@ z*_Rm1$`mfgCtBT`5%Y6NzlYI~eo1Cm)1}$`@BY|Oa>R}H;@DtF@$8BFyrMv}6zPw! zdsWcn|*x=g?AXS!7YjSI%dgYcTE0XXywI#WBc2k=X2kU{P4iwf@w!%AUkb#?q?^jL$Wo=wtL&m#*Q={?RCwV z&+QC}bl5J9w4XZNyp!MUUI5rXS)83hjyna(+Bf``^b55!eEM%A8wAvRw}chN+M$6F z2T9%Yo|)CnWnLb9n*{d&Fmg)a~`%% zn){hk-PG7>lEJyHwcb{)2rduQyVg~1k#fVJ;Hq%{%RL7}1J85JH9Pl*1*?YaW;~&q z5y$=CV1Hoa&i6;G`o-{eurH+yQ{-*@w7}~Yl>2Je!MQ6z9x=rj$IScm1HKh`iT@g| zOlSzMj!Un-@{^JI3Y*i_eghdHeI|TYL6p!^FgIi7Ups7Rc@z`xZR#A6B{jJt){NcB zGJVN@!x3^ftyq;|cPq7z1_aFI)h22NFKAQgs`ye~%J7rHH4!bNMtk0l+rH($N_XZi z9IYjGi{q;`c43RWGvAWKEleKe2H+U;-TX;>gtQT-?fL%4-sCt>8$=kJLMnYTd;hft*}pHkc*aCnX`0qp#DTnZiCGSRgjV+wVEj)2ud}UGfw)K6jj&(T$&+Kq~ z&-lM*ejixcUh_1(qQ5$xT0K6ANyc9V1>BbbTy6#bYK>>+-pXuJvT1SYs(RY%T9;FX zz8eo)+^x*6_io$AzNnx1SlVj&*CR1D6}{r@aAm98P~GX=31mv4T{)STb#grO^6Lr8 zrprL*!B!0|MG9=+SK{sG9#fG?(VLlW|5Y69HS(sS7~5X8qbX1%Sm%k6h(9%UmR?@RM}#YY`M9o zS<=wZu!Y-o*yGh;&PaZS_JnIu-x(XNR_pRl&8C~PHJaXgZR7X<2wR=TX0s=lXJ6Qs zvXU-$QNm~!8=DHXkF0Mf4m3|w`7f~jle}d2Lb1AJhxSxqkLrmEoX7u!IS~`(KN{<_ Qp!=J1{dt^vU;dZ>0h5?e#Q*>R diff --git a/resources/assets/enderio/textures/blocks/redstoneInsulatedConduit.png b/resources/assets/enderio/textures/blocks/redstoneInsulatedConduit.png index bc15f4b3b8a6da5cb94575087e1fbdd0092f964e..36006b9a38f202fac6d0a0db4cd8db83ad95a66b 100644 GIT binary patch delta 490 zcmVpGnMp)JR9Hvlmu+r?FbswhT3QK8wRRuBL8{aZnwR4T?D;e41bdhL{Vfmn@xXpUHHpD zmStjBRV8|irjf^twN~_MwGyrI>JNgh#<}XN*uIt|W9%BZyQjJ%?>bdv$&j5a^ zqhbV`YN(8BG(LKajkwjS4hMXGPv@}B`R zoq}62aAyIie;oJWIr&@=pE3aE&VX?xZhyhwXW)PTGXkuD0d2o5Q*MLy*IoyD*)Z|V g^eXu-7G}VhS6~v>W;8uSNB{r;07*qoM6N<$f^TB!NdN!< literal 1199 zcmbVLTWB0r7@jB%O={Y_i5lza6k|g(_t}}9F`KZN$+la&Y1poI6-sk<=4^II=8~Bc zcd|jK*V6W(mV)%5MNkl=5U656^U#1Ov}!F9vFmo>R zegF4gkB1cnpoua6Y{9dz2R*<}#Tgf+SG#-%U89Y?R2mLCp!w^wf+pi#yci|W+ zB4|%fUPgTs_2i^eD&ultzi#<13lj_*y8&TSRNp`xKx-UfP(fpkm!a>?U!s9yXXrzz z0$&IWRCD$=LUgb(T(TPDmS)of{h%+_i2)a32x51_i}W}{uh`YeKDp*-umZv38G6;J za$y7*euzMdO)(ZP3P9CZAth^q&8L0c#IU)Iz(e7tP$77CB|; z8peUnarJtgtxK#Qj&XvfX&f(dqR0>g6HR*<#*7#3Y+5i;WQ9(E9p3|qMOg8taE2zH zu7=4rbKNAa6?BA)=#d*6qNCDufVd)x{Hf3)^{DP_l1c6! zFO&d@H~N9lAw_``rf*HT$isOvLz6$O?by0ift8A_Dh$;4G@}W!%~Yz;W)v}P^Onpj zsw6e-Y{XZMK}9lTIV&kSK^T&?T*^$#YIacOwJa$}lbiP<3_S}qwH>0p#+4q+)r}BA z?1v@apJ;Z$NX^H7RPzI17+}{S$Fu!<)RR?@>4B zI?hI0yR09tp1)zYw1Jj~i*H|8K6Uo9wzzB0KUa*a+Ai?ct+9I_ZhCloLAo~g-MNJ~ zmf4Tc<;LdMM~-YAy_D;pnfMMzZ1T64w%q-x<-zamMPez{Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D11d>GK~zXfU6xC3 z6G0G$yKN_aiP(k}NbG`wouI@vSK%yh1h@{DKrDGgN+Kb#gTTUzNPgQxedYc~&6HHG z>gwwMukN0yaU6|CMZI1R$Zod_&1Td67-MPo`+Yesio$(a31einT7_Dz=5yf1i;Ih* z+wFQ_u~;}5$yESEz$hTf$qS&^R;%UXhldC94s0ZCw_9I?D2@t9bJbWrN7Y~68^=A(ADA2p|VW7%!Jg2Ua{zCX-^lUVGs9_&A(CeHQxtet?t(QbfSH zunuKzHk*YXzkm5Xum-$1olXk^2!YqbQLu{-_3W~#NLB5*IEzsqpkArz&WgOdy9=Mb zehDhr??O93Aeg=!hF4ct;p4lvq1|qWhQ({90J4v5^7nu;Hj;%E_~!kGaC3bfK7aq_ z1PFLFm~;eQ84GO@>`hB(*-pCVKQhJdn6^!s$MRSc=Z+B8OTn}F;c?R>XYXfcW0o`$ zx$nSyZXuFqmO0dOv!^ZrJD%?#mvS=sIu7!%M``{*YdNO11d5R7>(Ux0Ky&e!CGE_j z8`R=d&ln^5Fi7b`~1;`Xfzi35cFD7P0uq-gtHeT%C4rBsaIW|Mep8$m8+2(1!+s z=Z~L+!C+8s7t4+S#pXm#^8!Z+ r`rD$)Q0B0RY?Vm)JY^~*#u)wq$9$=TL6o~~00000NkvXXu0mjf&o`+~ literal 1916 zcmbVNYg80v7+yrp01;25SjZWN^guGZGkck3R+a^K7hL5gq9A56J2MLl%+9hqw2OtA zT38}!UMNGw(7ce`Ov6Pkc|jBd3~>=9Q-na0jJzdk%_>+wJpE|Snfbo&{hsH&zh^#< zi3%U@@|p{e#~ZJiql)EL!10b7#eE-n-74aiDXcnyUBKvA3vQx#p(LZF01b^NQ?V3I zW@VhAf_OaV41HVzn-CcxBN&>GJ1~4JZRFTIUXa3S#ECSD1+-MM-XI5mtEvS7Jt+s{ zC6REXQAwrf=PWl-3zkR45zEsEj06?IK#*0&DWEA92ds3u!7Q`N!KZp<+}nOG`AP+<50Icp|T zCyP~u4cp>QaxjHujWU72VzKZoB0ghE79bdg31Fc>D1|MxD_&(eMdB?C^KQw z8(BSL02~@|EtAR0LC(`>A<)Li$mfa;=HWzfDHB+6qX6N<0-AQj^%QMpW2t}Kcp=&x zmt~{`v6Pv~G!a}qbiN~GE_eTJ$N}WMkwu&ITv70J6+>jwl!4W#CWZ!{rdXzbfq6`Xh$$ja1fg0Ig|t$!779cWF(iSdC@REZAu82@ z!+i4prcS^)C2;h~zxrlG#5JR1`+N$x!}B?!4BYUTxGCvNDw1-;w@af6jk9*7Z@oOf zE5t*6*NZ50X;@v_36EPnVHG&JqCKL}FPGN5+ZJx_JU6g8HC3E?_m6u;LBYX!UG15j z;z+4f+E~Gs2j0nU4sI4DclOuq@Xx{FAFdf&ikq%4W^L8gZH;z&e(-IPBB1=-IL%vw z64$1*?=CN0wygh2R~Heoxwq+;L+;1U&REw+EY4V`=hH4t9?GdF_ZCF$ZElXvZru`b zW=H6(Tc3Xl4?y)>DOdOM2Z`i5vUm51p`lqf=Z*PBUqB3?8{&kY@$Y^V{Gm|Iw0y+JIH*X$Ds5uoRm-m_dKQvzRZfJ?`m{#v&FIo0&ZFTjO$q5T$ zPP_j2cmewB{)7@XW^Sye=pY+b}zTY_S zUfJXM1#@)}e)a0r>5ssJ8<5c(SIo-U?SBue?A7JA|6H6~zAywm-9FhZ>0q*_SE~EY z**CnaVnFnzEG#hduK;p$fiPfHS)t_Eoh@J1DEb0^S+m%-@z>VqvZJGcqT7bjrEA}u zlpptg&(Hhv_tY1}J{hv(Tv3oIXM-f;@9Km^4-R7ol-&8^?dbfWx-dyey74KX51NrW{+v}&MB{G{30Xce9wBn zsR_QhC4at}=acGnarA}e0jFKooo7QXX74YaaQNX{_J{*+i3eJxd561_Jko8cmXh4O z?nz`(s_Q&|6<9GD!6#G4r+r6Yn+D`x}GdJ(X!vRW!1K8?0$8WBJspMK=}BIt9C{(i&C zyDmqv7TJ#v1Y>lgGug8yVF?Q@yf9XMuvk$VGYz{wu{+M}mmg(&`;71G63gh2&+hNK zd*g^2y|A(wfF3%nZ)jOr^Jv!0wNay1$Q8aHckI2<;=~^H|8tAM+2ZT5e%;}wgY(_@ zEVfz4Ri$n6`%pJ?ZnZ%^GYJ~7eGu48p1L`-C|eT#({}mfDHDWabBptxmiMJ(9oG-G zD41?pn|Hyb-hNNf<>QrWU-I$s*|vdHEx8}WNVauf@|2b!m9@3@5^T^K^u%(2?y3KJ zK>C`ormBkYUYav8m#!~O*NMKDv?@2*D(#2x^T~bg8#lBX%e_vQy&SzGX7EANv0{7e aC^uf|q{req;`{^0|4^fjQkBe3TJ<;Xum{%w diff --git a/resources/assets/enderio/textures/blocks/redstoneInsulatedConduitCoreOn.png b/resources/assets/enderio/textures/blocks/redstoneInsulatedConduitCoreOn.png index 415bb10ad07e859b7fc6f7048fcfcbab2d47ebd0..0e8dc861572b81af46d695e823925d7efe0941d0 100644 GIT binary patch literal 913 zcmV;C18)3@P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D113pCK~zXfU6#vk z6G0F~yKN_aiNuB#NbG`)?I2>CAA=8p&q6GDL`p0nWe0&p7M9|-hdSlHqh?AfS9Nvu zz17__HIAdvsHoTL0om{Oq1kM@A7d=-;czI&MNzmfD`AYR*XvNL)qD=TczJnQbh}*- zESF0MBe@EI2p9!KIe7sT+iJCZyjU#AJF=0q+wFW2qBtrb%~fOh994sbKo*C?VbN$b zJb}qhr&Cshg-DhdB7htiVZ2(c99Z! zhlhvo^Y<^m2iAZWXR}#B03q;hI0|<0p`Kkf6{)HN7iTf*1Jo-u-CL3K`8<67_BE(r zzYFaEfnfG}7~Wi6g~6wfq1|qWhQ({90J4u=@(+MAHjXlQe&%wH(u00!7I4b!m+gpt*R=lJ;iNEoyP9 zXABX(fV~eS0?2jwUaUt=v?T<~JpjU``mrPcfB@Ff)YI6DO6wh1N2GxF4YS+r)_oR9 z{Fsaoa0#A|D!?K_oroWIj4@BzrX6q`#O%kx5Hj6koYq4oU}3qhAgZ89I3|xL6_74n zq(#bOm*mJo6X|>`*si`Z*8r?TeD#auiOp2 zC~tOeFJ6VgU=SMi`Xfzi35cFD7P0um-gtHeT%C4rBsaIW|Mep8$dk#W(1!+smrtLC ze!pLC7t4+S#pXm8uX-IBJZb(>Kk*ci- z0#nB$$N`7NgA0pOmdY|{K`JuBSi~cBp@@noRv4@zi)U^W?ELWb$J}%7{kG?M-uHW# za}Vy2Y+L5!=7hmumWjdyQgkF(Uq>7CJGc62IXbLCgwaR@tVGP90mASVunZ!Iv|u76 zg+N7WayP`oU~H4skgq6r|rbt+oCgAf86AOeHTAjzpTfWYFA0S27|09yz&D&S86s1zE91OQw*iwiIb z3l9;sW>6@(QbFi~Ep!z?R3V6-OQD#}X0q9z3>y+D0Efe&P-zqzjf5gd##9{wT1Yyh z*P?;|GRh5VJ)(wn1gjz_gH1>P5%u)#6|{P>_?@uMxDY5bWE2airvPLsMXR;m>kZn7 zNTEO6crV%*nW~23k{x1oJr@wvfT#@adt8T#?R*fI2y}Xj_fiUf>G;l*Comepk1@FOk1B<+el?Cy!TJ1}|k_;`&Wcm4{a%vV}dG~{dUwl52tea^E~Jo-<4 z`p$d^Ydc@H$!)Hqql1d;JzqREhMaETs>dzQUd4X`dQ3f<7^=Z}J}OEr0R$dQuQV2m zwYs=3G2>UIuIlIO_<-cU##hU4btUuG=N;Sg)mO`r{U$$ege{Of?%LjeVL;3}bqbGL zEpSM=*Ql+nt(`vLS0O6^k?F)4q$|}_UO0$Ts^{DaoHI^*)7#(wVaGPdf1R}5R;|fi zyNQLfkNerCF1tv*%D!;p?HdlGCZL@b_2L|69p-R%$1r}Nz4_J5gYDw66<%A!BVqa< zawdt~X7Cm@<+ozj*Lz;iR5m9t3x-viUg->7{IZuH>$PjUfYb{5a=zXiDE^FhZRqiQ zY;|78L}N>&&dtHC$Oqs$JSp8XcT8rNwf6&pbl-Yd41vbb;aHp z(Y&A}&jiTk>D^B|GFv-lM?yWWtzXmFL1#Sfbb2u&_-DlmJACJhCG!UxCtTdUGLG0h z&lpkFd1r35`6;_7+vOHDwzEI`yRo&!*crKF`G$RW3hVhrp2)fW=iau?1&>`y!RE`H zoA-<1bVA`;jCY0mk1>uKY42cH8n*R}s%$JYvLEN8`LbK4c*u(Xsov{hhXYgGO@W``6KA zPOBlI+6DON@0;86dJZLB81-fFe)Dl_tz@(X2kf%l#kB7q{Q8&i@%>+?5725^EhO4Z{?3c}>u1^J zSF400?V}T$;$kAguY!BW?hQ1R6y;`+gTLtc$L*mZ^O0zwX8c9lfKWMfQdKv|{-LF% zBk*oP{?wlMhC3}g0|zg;VP~6~nlcVIrXTK3>7yK1zRWT{i+8zm&AWAmnKPYp^SmRa ttv9=Q=kkx!#+@&19eQ>5(nKl77ISGhF8I4MjvK81ZIMtSs0mKU`Y&iGLf`-Z diff --git a/resources/assets/enderio/textures/items/itemLiquidConduit.png b/resources/assets/enderio/textures/items/itemLiquidConduit.png index c91656bbb3e6a030f17f02406b187daba809247c..5d7a308eeaf54df5b8b1883a45d8890352e00bb9 100644 GIT binary patch literal 673 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 literal 2149 zcmbVNYgiL!77o`H6bKmc2JH|<;+9+{34{b927(&cc!4Y+DrJ(HKm?MQOdw>zQc97F zY*p+kAcBf6j|g3?LY0e)1_B~>tt_(2C96d(mYYyk5J?9GcYpZw$IkQ2e3yCO^PY3Q zbDl3}=k~33wrgy0IGmke8$T2qf%$idHTG5Obd%Vy8V!m>!xU098B!rQ9;^@}fFKcy zMM4n>PC3wy_~CFC2V|m1G*b8njzp12f#xw3ZK4um<8XfdS|ucjM^HeF#LDDc;%NO1 zA|Qjg#0W1TO{fe+;$+)&DkMy|T_n-POV}{ce-q%RGX8B~x)rL)N($YHWL zpf|Aa5HU3sEaimqw=8I3D=sk(MU@;XH90w%lFXneRIyZ$&1O?+bSj-r#t>w6iX4Ts zWVw3Xq6I#pmZ)S(RHl#v^A;hoLW6RNn5XYTNK^`i?+we<3yH!~M%6+}DoCMG6BFm- zdW%-0p~!#T_#j#>N>L)zP(-cJs3h2VNY^crvE2Q(&^!?HhOB?ZgvBb@ z8K*!M>NtfG2n+;B5i&WfNLFv0KcRO4^AVLS34yn$6p6sw6mw)BkjLWlV$kSPG6b^` zG6FKO_}OAHnN1Um5igh}rL&mC1wQ=$rjCj^MV+sc|EZhBEvy*lr|-J}TfFZhM2RMO^Ccy#b;nS2nH_<`lod-onMDRFI{n4R_X@bI`CRh8*rSi5%Z@aws`{--^L zlLLdM+S=NziMqPFT5n;&crlI5<$itqSZ{A{kC~JH+r~z6X=&-FtBhujBjYaJ{r&w- zrv}wZC15ZZT1SV5f}Q5F+YN?8eq8RqKCa24dRm+%Sn9_!+zRji9{#gJ1VmYU-_en` z+tT6r4hIK^B;03u>r0dhONahvje3j zQ|`s`>6U_!qx2gSJ6xZ6ep0&9BWm_=w_x9?s*6qEFvyys8=uY1jL*#M?|wKiaDs5Y zHFDfA9n<_m-&W=mww!`*sf3xPk12yXy6)ryO{D!pi*zF^$bT0e-;vUFUH0NNa5}A2 z9Z?tWdL^Q6Nnb$3hW*=(8*SR!YApR*Yi1fUuhnXXpY;_vuFEpB$8&lz3-5GQR%<9f zq*kMXNtU$P9L>KLa?y9(aJ;n_qGa2&dg6bwu2RLEd{apXu521(SXFFpEu`7sX9$U}EIc+HUxzK*SPd7fJCGDe$fZ{_x2Kl;MKW(tiV?55{ z^9x`W*M86K&O7N8!ey5)@7Z!+b&ui4LXv4_EnNwR8!N8z^<7KM!spC?$A$wVs)7P+ zpL_h`Hr=Djw>%RnKag?oEK^IqWBzJCKaPQp_dGDhx{Aa1kxo_mY&@;^gO)W0TDYA9 zE(B+6cZVC1BKw$GiiYt0lcAqnY%MJCH#z5!&bu{TcO5sE?;%~ogQIoam1ix@DwTgL zkG)fFmrAzni8^pjyDFUJGn8g$Zqv%(F%D38`1Bw02>}-dk7b`*vLz~gSIpn{obON^!Gnr(HuW(1QA3Y8tC+)Jc7!!14#=jwbF`Bou0A5xl)%O)tIX!Ld*aR z^={5nQ&T@nQLUEL5uUdDa*6;-u5UP;x^ev9QP}MjTQ<;aQ=&BoHsqkQsSCpem~$SNHD&^ zqr*)$;_uEMBUOjIpnOfpc>2|YQO%o!mJeU*4yL8`O_^+HxJ}y2_544^pPs+?1wq^S J)d4XXzXIo3Y%Kr) diff --git a/resources/assets/enderio/textures/items/itemLiquidConduitEnder.png b/resources/assets/enderio/textures/items/itemLiquidConduitEnder.png index de3de255901c7b692c922a1a7166e2a1939efc46..c9e8c82dec8c006f60617c61bcd80e6751cdc16f 100644 GIT binary patch literal 822 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 FV1oQFt=a$p literal 1911 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 diff --git a/resources/assets/enderio/textures/items/itemRedstoneConduit.png b/resources/assets/enderio/textures/items/itemRedstoneConduit.png index d54383950961a5d5cb7050d9511769bfefba9637..b45cb2b44ea7babc69db83876810015067442271 100644 GIT binary patch literal 869 zcmV-r1DgDaP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0{TfrK~zXfWtMAl z+b|4-MOl6{nMuwOJHK+f-lX?T8$Tpl*>BC&Fz(JEAOUazkhGYx-|y$uYSn@3_1bN> zTaQaAi@x1%%Y2?^kD~+T;Cw!Jec#&$UwMCjpP!$fZ8#o}CL{Qf0E8HUBr$CP6uaB) zJpcUsB<`M#plO=C2*i$rD85Hq>!WJ80LjYR+uJ-0g9C6rJv}WIp-B{t4TPX22Fy>V zlZj(5A0Hp{<#MrMv)Oci6tIPq^HAce>^I3ui_dk8ZLDJu-&Ki!zr6SyNCsb@s?Zk3 zlADs8v}KbPjgl`Vgy5gF0^P;TS_ugU>2EuBt-Byj>JF`h+o6gguEza*1-4vrIuGbe8{1K$WO;<-yuz}(3NbnAbd z=S@cF$_ZXyU+v@#ZOH)RR1H`NLi!jFUi9d&#&0t15s)7VK)0lT7|0XT;xRs71#kV~ vaF`h+Apf?cG6WwQL_a1cC(n=p8Nws4 zW(q-}$`_55tw>g*tCEAmB+2m-4np=?26$?@xB)qe!GKntpwMu&Jo0;l;oB~cT=iks1S$4p@K9jjYh!{6wO8j25Tt_js27b zKB|$ZWhzXjQ~;9}VX-n1NSyg{O?Fg;i9@4W!EDlX1OAYp_uC ze{OshtqI$xLaCvsMwzIV;PsH&Pm%H5{k6~}5ch@~qL$%BffM*jNunH8U;%s{8UNyj z$PlhX42#7Gn?->+pgV;FF%XJa3L_L2%^d+H43Nd9)2Hlwj?Z@&fIe&v2%O>uC^Q(Xkf2lAGFVrEZtAGGQ`E^m`M{>F7il=#|(5*w4ZyF)UF4~t$;WV^KLi@@>G(dNFF$*}Lv z#Jx{{N-GQ4ew(*+S!#P-)S=Y}ylitF!VliiKW7hH1wj=YC&;wBI%?>T-ZvxXN=~&9 zZtFDuE)DleHxIby^gnMrx?%szq*23dnm#Wv@zG#~YI8E3clDm?_kk`iSkI6#!_R+;ZVX6$_{ zW5Qs1$0{z}x*pkXIUP{wUF&Uw76)}%9QbyLsKzq~T~fXD z@K;|^mPZ`py=~xZ>=zkGt^Q=z`PPA<#Zu<9%HwgiFA5)IrW1!9c2&1vg$8$L3y*yV)1I~0 z*=_9zF*~?n^uLtjY!{;#bn7BPhuy&1%q^yrQeb;q3oZSmXw}$v4Jan7p1~-OGtOS5 zEPin6@h#Geq3Eu7>uJ3`-i_uZ%})<#vkWfv1`bVe&8IwE;`Hy?&pVupD$$+xG;wc|w3_2#rZqaUiiew>wZrR64n`Mg(( za=X4Y!u0YtgnIiiOtbdpABKh0h5o-tXO|ouIzQ`jUt^n31~TvG5pD^0)5@FQGk>Wy zcwKkib@aaO$0MXAb9n_&Y8{9quN|AwFn|7@dGOD9?_)?Pj?r89vV}_r1J3{`B-j&jQWaP1fVX$D8#1&JQoZnH$dZ)SmIO zO?|Q{I`{2BxCdRc?7lR&Sk<0(HrSk5Kit#n=(FuHLivaNwf-$dZ_b_A>+d;GR~F>4 zh167<^+j{r*=I4wEaIL{+cBXXD3R|uG}CL;e(PoP3cLQDEZYk0aNJujqiKYSklxL@ SHWF#_$00xv%s=Q8o%SbWe~_O5 diff --git a/resources/assets/enderio/textures/items/itemRedstoneInsulatedConduit.png b/resources/assets/enderio/textures/items/itemRedstoneInsulatedConduit.png index 319b4348de8df7105cf97b40480faa509e5ea70a..0e8dc861572b81af46d695e823925d7efe0941d0 100644 GIT binary patch literal 913 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 diff --git a/resources/assets/enderio/textures/items/itemRedstoneSwitch.png b/resources/assets/enderio/textures/items/itemRedstoneSwitch.png index 1fcf7018d3673280bb6a5264a9fbcdb0854f1540..dfac7132721c02f744cf6286b7719b183b9e3faf 100644 GIT binary patch literal 920 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 diff --git a/src/main/java/crazypants/enderio/conduit/power/ItemPowerConduit.java b/src/main/java/crazypants/enderio/conduit/power/ItemPowerConduit.java index 6bafcaa9f2..57684c4a06 100644 --- a/src/main/java/crazypants/enderio/conduit/power/ItemPowerConduit.java +++ b/src/main/java/crazypants/enderio/conduit/power/ItemPowerConduit.java @@ -22,7 +22,9 @@ public class ItemPowerConduit extends AbstractItemConduit { static ItemConduitSubtype[] subtypes = new ItemConduitSubtype[] { new ItemConduitSubtype(ModObject.itemPowerConduit.name(), "enderio:itemPowerConduit"), new ItemConduitSubtype(ModObject.itemPowerConduit.name() + "Enhanced", "enderio:itemPowerConduitEnhanced"), - new ItemConduitSubtype(ModObject.itemPowerConduit.name() + "Ender", "enderio:itemPowerConduitEnder") + new ItemConduitSubtype(ModObject.itemPowerConduit.name() + "Ender", "enderio:itemPowerConduitEnder"), + // new ItemConduitSubtype(ModObject.itemPowerConduit.name() + "Stellar", "enderio:itemPowerConduitStellar") + }; public static ItemPowerConduit create() { @@ -56,7 +58,7 @@ public void addInformation(ItemStack itemStack, EntityPlayer par2EntityPlayer, L ICapacitor cap = PowerConduit.getCapacitors()[itemStack.getItemDamage()]; list.add(PREFIX + PowerDisplayUtil.formatPower(cap.getMaxEnergyExtracted()) + POSTFIX); } - + @Override public boolean shouldHideFacades(ItemStack stack, EntityPlayer player) { return true; diff --git a/src/main/java/crazypants/enderio/conduit/power/PowerConduit.java b/src/main/java/crazypants/enderio/conduit/power/PowerConduit.java index 41ddb226a9..45d7f95546 100644 --- a/src/main/java/crazypants/enderio/conduit/power/PowerConduit.java +++ b/src/main/java/crazypants/enderio/conduit/power/PowerConduit.java @@ -47,22 +47,23 @@ public class PowerConduit extends AbstractConduit implements IPowerConduit { static final Map ICONS = new HashMap(); - + private static ICapacitor[] capacitors; - static final String[] POSTFIX = new String[] { "", "Enhanced", "Ender" }; + static final String[] POSTFIX = new String[] { "", "Enhanced", "Ender", /*"Stellar"*/}; static ICapacitor[] getCapacitors() { if(capacitors == null) { capacitors = new BasicCapacitor[] { new BasicCapacitor(Config.powerConduitTierOneRF, Config.powerConduitTierOneRF), new BasicCapacitor(Config.powerConduitTierTwoRF, Config.powerConduitTierTwoRF), - new BasicCapacitor(Config.powerConduitTierThreeRF, Config.powerConduitTierThreeRF) + new BasicCapacitor(Config.powerConduitTierThreeRF, Config.powerConduitTierThreeRF), + // new BasicCapacitor(Config.powerConduitTierFourRF, Config.powerConduitTierFourRF) }; } return capacitors; } - + static ItemStack createItemStackForSubtype(int subtype) { ItemStack result = new ItemStack(EnderIO.itemPowerConduit, 1, subtype); return result; @@ -199,13 +200,13 @@ public DyeColor getExtractionSignalColor(ForgeDirection dir) { } return res; } - + @Override - protected void readTypeSettings(ForgeDirection dir, NBTTagCompound dataRoot) { + protected void readTypeSettings(ForgeDirection dir, NBTTagCompound dataRoot) { setExtractionSignalColor(dir, DyeColor.values()[dataRoot.getShort("extractionSignalColor")]); setExtractionRedstoneMode(RedstoneControlMode.values()[dataRoot.getShort("extractionRedstoneMode")], dir); } - + @Override protected void writeTypeSettingsToNbt(ForgeDirection dir, NBTTagCompound dataRoot) { dataRoot.setShort("extractionSignalColor", (short)getExtractionSignalColor(dir).ordinal()); @@ -240,9 +241,9 @@ public void readFromNBT(NBTTagCompound nbtRoot, short nbtVersion) { if(nbtRoot.hasKey("energyStored")) { nbtRoot.setInteger("energyStoredRF", (int)(nbtRoot.getFloat("energyStored") * 10)); - + } - setEnergyStored(nbtRoot.getInteger("energyStoredRF")); + setEnergyStored(nbtRoot.getInteger("energyStoredRF")); for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { String key = "pRsMode." + dir.name(); @@ -263,7 +264,7 @@ public void readFromNBT(NBTTagCompound nbtRoot, short nbtVersion) { } @Override - public void onTick() { + public void onTick() { } @Override @@ -273,10 +274,10 @@ public int getEnergyStored() { @Override public void setEnergyStored(int energyStored) { - energyStoredRF = MathHelper.clamp_int(energyStored, 0, getMaxEnergyStored()); + energyStoredRF = MathHelper.clamp_int(energyStored, 0, getMaxEnergyStored()); } - + private boolean isRedstoneEnabled(ForgeDirection dir) { boolean result; RedstoneControlMode mode = getExtractionRedstoneMode(dir); @@ -293,8 +294,8 @@ private boolean isRedstoneEnabled(ForgeDirection dir) { boolean res; if(mode == RedstoneControlMode.OFF) { //if checking for no signal, must be no signal from both - res = mode.isConditionMet(mode, signal) && (col != DyeColor.RED || mode.isConditionMet(mode, exSig)); - } else { + res = mode.isConditionMet(mode, signal) && (col != DyeColor.RED || mode.isConditionMet(mode, exSig)); + } else { //if checking for a signal, either is fine res = mode.isConditionMet(mode, signal) || (col == DyeColor.RED && mode.isConditionMet(mode, exSig)); } @@ -375,7 +376,7 @@ public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) int freeSpace = getMaxEnergyStored() - getEnergyStored(); int result = (int) Math.min(maxReceive, freeSpace); if(!simulate && result > 0) { - setEnergyStored(getEnergyStored() + result); + setEnergyStored(getEnergyStored() + result); if(getBundle() != null) { if(recievedTicks == null) { @@ -422,10 +423,10 @@ public boolean setNetwork(AbstractConduitNetwork network) { @Override public boolean canConnectToExternal(ForgeDirection direction, boolean ignoreDisabled) { IPowerInterface rec = getExternalPowerReceptor(direction); - + return rec != null && rec.canConduitConnect(direction); } - + @Override public boolean canConnectToConduit(ForgeDirection direction, IConduit conduit) { boolean res = super.canConnectToConduit(direction, conduit); @@ -438,7 +439,7 @@ public boolean canConnectToConduit(ForgeDirection direction, IConduit conduit) { if( !(conduit instanceof IPowerConduit)) { return false; } - IPowerConduit pc = (IPowerConduit)conduit; + IPowerConduit pc = (IPowerConduit)conduit; return pc.getMaxEnergyStored() == getMaxEnergyStored(); } diff --git a/src/main/java/crazypants/enderio/config/Config.java b/src/main/java/crazypants/enderio/config/Config.java index 29487dbced..cc0db76756 100644 --- a/src/main/java/crazypants/enderio/config/Config.java +++ b/src/main/java/crazypants/enderio/config/Config.java @@ -442,6 +442,7 @@ public String lc() { public static int powerConduitTierOneRF = 640; public static int powerConduitTierTwoRF = 5120; public static int powerConduitTierThreeRF = 20480; +//public static int powerConduitTierFourRF = 81920; public static boolean powerConduitOutputMJ = true; public static int sliceAndSpliceLevelOnePowerPerTickRF = 80; @@ -521,6 +522,7 @@ public String lc() { public static float inventoryPanelExtractCostPerOperation = 32.0f; + public static void load(FMLPreInitializationEvent event) { PacketHandler.INSTANCE.registerMessage(PacketConfigSync.class, PacketConfigSync.class, PacketHandler.nextID(), Side.CLIENT); diff --git a/src/main/java/crazypants/enderio/item/darksteel/DarkSteelController.java b/src/main/java/crazypants/enderio/item/darksteel/DarkSteelController.java index cabbb75814..f3fe4b55d4 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/DarkSteelController.java +++ b/src/main/java/crazypants/enderio/item/darksteel/DarkSteelController.java @@ -308,7 +308,7 @@ private void updateSpeed(EntityPlayer player) { private void updateStepHeightAndFallDistance(EntityPlayer player) { ItemStack boots = player.getEquipmentInSlot(1); - if(boots != null && !DarkSteelItems.isArmorPart(boots.getItem(), 3) && !player.capabilities.allowFlying) { + if(boots != null && DarkSteelItems.isArmorPart(boots.getItem(), 3) && !player.capabilities.allowFlying) { int costedDistance = (int) player.fallDistance; if(costedDistance > 0) { int energyCost = costedDistance * Config.darkSteelFallDistanceCost; @@ -321,7 +321,7 @@ private void updateStepHeightAndFallDistance(EntityPlayer player) { } JumpUpgrade jumpUpgrade = JumpUpgrade.loadFromItem(boots); - if(jumpUpgrade != null && boots != null && boots.getItem() == DarkSteelItems.itemDarkSteelBoots && isStepAssistActive(player)) { + if(jumpUpgrade != null && boots != null && DarkSteelItems.isArmorPart(boots.getItem(), 3) && isStepAssistActive(player)) { player.stepHeight = 1.0023F; } else if(player.stepHeight == 1.0023F) { player.stepHeight = 0.5001F; diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelArmor.java b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelArmor.java index a9bfc97391..68c59c1c49 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelArmor.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelArmor.java @@ -186,7 +186,7 @@ public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, L if(EnergyUpgrade.itemHasAnyPowerUpgrade(itemstack)) { list.add(EnumChatFormatting.WHITE + EnderIO.lang.localize("item."+name+"_armor.tooltip.line1")); list.add(EnumChatFormatting.WHITE + EnderIO.lang.localize("item."+name+"_armor.tooltip.line2")); - if(itemstack.getItem() == DarkSteelItems.itemDarkSteelBoots) { + if(DarkSteelItems.isArmorPart(itemstack.getItem(), 3)) { list.add(EnumChatFormatting.WHITE + EnderIO.lang.localize("item."+name+"_boots.tooltip.line1")); list.add(EnumChatFormatting.WHITE + EnderIO.lang.localize("item."+name+"_boots.tooltip.line2")); }