K@iy3
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
Hu0mjf)BO@O
literal 0
HcmV?d00001
diff --git a/resources/assets/enderio/textures/blocks/powerConduitCoreGold.png b/resources/assets/enderio/textures/blocks/powerConduitCoreGold.png
new file mode 100644
index 0000000000000000000000000000000000000000..c1f98482c988ac2b6f8abf3958d48f8164d4b6dd
GIT binary patch
literal 1056
zcmV+*1mF9KP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!TdroB{#bbAcXmD3D)O6iuv$
zWj!d0GR4mKtwv>(9{T~KUCw;_advjOD{pUaFDn!Za(jC#K&4WVEX&06JU&|=oW)}C
znQtBNPp4A}f`HsKO~u>a-_QQ|C6qAq<+}%C4g?WE9|kgB0OVuVU*~`La93utRPNvZ
zOA3}19K~XhWRMIt7%;9O&$SjlXc<@{c9hU;);K)?MBn!*YC`!k0p`!QaU9ENG-a|$
zl8AS3aFEUCa}H>?H|4jBl)|XrthvQ(($vi&81$r8D@nClVH|?VW=lmAt-V{rr8NR{IM0)z%>D@?QTcFtQumwzyFTmR@%QT&{^_JPO
z&z@r0uU1OZsF!KYMumQ$Uazvv>#b&Bi|K#;4OWDG9bYJtb{umbGfY0q5t5ygvS0urZEbw>V}UdA$M#nE{i@d=*3~>Y6dK
zIX#`y;#harY%b5!_i91^a=?47tD)Nym@lPFCAkRi%fp__3kPOlnem~
z#v5(=@+jg5PGpHefNezpWdIO+@xsmE>@1P+=9>Hb=*KO_@d6Xi>!~?Ww9dKAKuJ-2
zyBhTBRjl8{Lict-ztp)rd9y2zf7)g|TXOJ{FZA$Z212XVa3t+l%bcLRI~_=4I%b*9
z&dPFe;kF~{Kb+`Cn#+D&kBbaJ5Nv7yKRNYd4Lr|hwl7}>%LJS-EKwMlEPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!T%@Da6E%rGf`}-JOTi})QA80p;ybtzbms+J`2yljQ1J2wf-fMraG?wLCh;1h
zMop%^N-A?aGt2p*(|xM{`n$Ti(jD~m^;KfAn0$SG3219;lS-u`K@ixtkKvTd%Npo|valgO6CFt+(uk7vZNlQzM%+Jr8BSgTM2AKswc+SUB{{H^He0+S!($bQ|
zJSq&0jg3Zz3t_5j3&h6WRLp>Udj+r$0)`@6inyjZZM
zQb~fr!NJPs=chTO(`h+7J2PSO_xk!OS65dyb|exBiO1t+LvUbVz(mPCn4FxHTrOwh
zrluwdhK7bJY>5amnT(vDpUd3boDux+>6r(<1H_}}vb(!06B841cXwxevQcFyAUTmf
zt5MJ%9v>zD@L(->e=qm?jqUO2N%H!g&FAG_dvJ4eV?A&^TY%L(%IoWE>w{W!Hnx$X
zHjZm4ceJ-#OLlaa9klB=2o8Q&Z*>MOZHujv7!oK1nLrHqk6EFI%HxE-x=-
zc6QeIFNK0}Y0uBkbuHJ6G4U_Bl~f!Z9oat}Cl*^@U#|y2%5=i!*nL#5o+1c10WU>B
z8fIo@WNT~7>YB1$U0s#q<6~RgBc*rou%5Q6C_TdbaSTc-YC7C$Wo5<0scrtLEId6u
zT@|Zw#>U3#LAsvZMc!DotE;O@(s8`C)ySl1czD>-w7tD8J3BjOC;!iSW)y-464kRq
zMi7FN02{}CaByJd$DwX)Y#67Yq6MlAAN7apB^uSUL&gX!a)o`@Y+M_p10YP)8kK#+
z`PN9C3!-|ah=Ilh#^q+0ojM|Bjfk}wS6f*fJqV4^(t+>A#YL49(z6r+-_oPrGaP0n
zm6B938{C#^lvj*N^{7Y^y!ZOXmPM30JXZf@Fv`n^)n
z9r#szdwXklJm6^^9UZlC7~|vPlFepKkD~bTCULh6wWbq;5>00000NkvXXu0mjfLABt(
literal 0
HcmV?d00001
diff --git a/resources/assets/enderio/textures/blocks/powerConduitCoreMelodic.png b/resources/assets/enderio/textures/blocks/powerConduitCoreMelodic.png
new file mode 100644
index 0000000000000000000000000000000000000000..eada7b116f4f9657abbfd675c77b013f84b5de72
GIT binary patch
literal 1026
zcmV+d1pWJoP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!TP<3q|s;y=IFEPuCKq8S)G9-gd2F5k`Tx*G;WzZ6-;|RG-PPYdj#^Z4nH6g!Dz~X+px3?$N
zovJ2Vuh%7*nwkm^4i0oeel#yHFTYe_>Q`=*H5+_GE}4^DJf|@PK{c#OwOLjF;hTrD
zS=v-TnM_K;&j4fP#ZQY$u*0Wi4A>5s6FrwJC$AjZ5!Pln5VT3O8!ij1R4q$ktE9GB
zDN51xiIr;=DY*VdxgbT?g0%ZHboJ=yN}Vhzm#*H)PJQ(pI)1wUh-8ms)N<*p#=&TE
zR9j!Ky8}B+Gp0bW$@~rv4yh<-w0v$^R?e^J7#z674W{?k4l2!x66|sYjx_AD92!XL
zgnMW1$+UaX*wN_2|d+_;z@~hu#%Eb!%
zg|3$A#TfV(EJ`UJoqeQFI+IxJ@%rO#5|qph=-5_cOJhC~{19X!lK?*Wwf{@z-p;8%
z*f%KGXRhmmv^cXU8TZFMr%ZqaOx)LV))uAp7jZ0Uxc)$DK>B<8W#QC!K0e#{`8=sD3QIX~^P2CElVC7;S`nVzpdmlt1OXq@_Q{n*xvVA)6Y
z^pFvRU|Rzm5pm9d>$mWJL6*NPE2ri}Yd?2%mx#lKgGKf9kO>0K+(G-D7&X56?xy+(
zleNoA`*4~hWPOLIo+=W+>;*<9OhinLjGZahS<6kdBwU8NYvyKR?nc4!^t434w)Cy}
zO%HQ?WK70#N9Fj~F*$y8T>WwPw$=FXsN`LLti#E>mTY;;M)iW}>FJR7HUr0;*!_$5
zB^%G`dj&$VUhKY#xj}FN9Ih(D_Bve_5eMeO
z>0SVD+y`-{wCMuH$G*EeLOI;od5s;07*qoM6N<$f|=9m7XSbN
literal 0
HcmV?d00001
diff --git a/resources/assets/enderio/textures/blocks/powerConduitCoreSilver.png b/resources/assets/enderio/textures/blocks/powerConduitCoreSilver.png
new file mode 100644
index 0000000000000000000000000000000000000000..ce46f4baa21a351487ed5e447050add04b542540
GIT binary patch
literal 968
zcmV;(12_DMP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!TYqgq$#>U1P?|$w|Z*Q;6OkU7Hh=4W*nF)YDX6+#V%kFPEIXRJq
z=_v_YRyZP&h>{^0EEpKq;B)PZ4=sb1NE?nYm`LdI0K~4YE)_K)zf8dV{`dI!SW3mB
zCR?pmB{V)h-Z(uy)qqqwEjvGcsW9~`m&=+BZ9^;;lm7mG^&tolrS@QLVNP<{thT$m
zyCvdhfH5;9V4KgEF<>hoCb%z)8=D;~!kP>RoEF44>$1T1_xB}VD5&M~c`3L)zJr4U
z$-90wmy?3~0xK_Q>(SAfT3J#qoxPQvwzcKZYIBqa1_smy<8k!^`oPy~ufR6bj1UMG
z%x~P)9})Iw{ry+j`0!1~;K0RiFuijtI668~f*sC~BgI{oY%BpQTW@4_`=hROb$&);
zg7Edie%64KV}q0;<}xOmr6(`cI5C{8^_$m}Un-T9iya;wwzW(z%)q~3UP|%!?PvX`
z6U1bj%Zu$KwC*iIRv*-h@Pm^;f&gs;WdMxbezv76xc72fC*+*lI1`w-uji~O%GaO7
zv83X}ENFT2wf-kKibeNNr9_Wz%<6cf#bJ_jdi*1guV0ntcW)_&gHYzQ5#!?F!oh-i
zy2&_!X6~T^3oz-2SCE+sE
zRTJCSDygrhB?7i2?in^S?e-#>OiCt`k<7@5w$tvmRsZm?q+CDQ;@G~~pV8L~O-xKQ
zxVIS?ablc#yK5kDV(cpB1i=Mx*mQ*LI%nlem!~DWx2JlHcf84op&?x+gNOrb!)YG?
zZ`=odeH+{Xu(Gw^WH5heQUf6Z+8AUe0REV@gM54A=cX?HeUowguQwUkyWH_6Gsr}M
qHZ?`mg#0oA^ZQ@+i@4^ST$MjO#fF9ag7k0z0000Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!TuH7?|(k*yn1#D$s|{{Txj
zzCw&k9;GeiB@#+Yd!6shJ#{QD^-E4??m6H2=G-&G9juOy4%_8&(ca!30oB#jWZO1b
zmc`F92d7jj{o$(w{5v~4{sTmC@t_+#;SRLL}lRuh+)`5Z!J!i;9rh
zCP4h=xVxL9bb5n}&FAxEb#-;wg+hT7T3f^P?)^Cy=KiUq@0lY?w2tEdV({zu2E`&@
zoCwjkRGbFRUZ91AG(UU2Uhaw_-b#@JEjnR=R`04HoN
z+0EnPQkpH5UZrFz%eJ(o(qA$LA- &x0RX9Z3M@
z0hGRF!pHMEBqoIcr6!iY2aOk5G*QZ9rO+95=6r;I_V$s^hb~$Ne{4T!*K4fU)
z;N>AY)BB3!w!^_9`}FW51_IH#CaJlcQ-nMF-KR)hnF-eN>GNQ4+0Dptl^WhIp;MW_n7
z9mo}!dfX!5_bch!ttA?wXrz(aS|ilf(!}$Y=CJlR1*us*M;%VH8ui<|^}>dp6_3Yl
ze76y3Z;#N((Rg{X!Fpwyxf7xv8gTlIG`AtXEZ4r7s+;j;f>4
zfN~z-AjAQggCmQXaTD<4!pUa0%5CF28Fwh~ukK{I002ovPDHLkV1gx-+VTJZ
literal 0
HcmV?d00001
diff --git a/resources/assets/enderio/textures/blocks/powerConduitCrude.png b/resources/assets/enderio/textures/blocks/powerConduitCrude.png
new file mode 100644
index 0000000000000000000000000000000000000000..6ea83a873e3c21b6ef762ddd3b4d6bffa0d20383
GIT binary patch
literal 702
zcmV;v0zv(WP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!TXC
z6HydCnM@`VFz;7k2mx7pE&Lr;b~bieh=MF4Dp)93$rg*1poN7Z7XAqf_XjKp2?4`C
zlsqBthxhv?XNeLqh3ibQA6(A4=bTCI_uV@uH=%Soy%2+VJPspK*Y#{PN_*O{mex0%
zEnw{#h&ql$A`#93%d%v#Sa86f&*u^fg*b;rY&M(G$3R}8c>wj3$%MYv23LXY+c(Lo
zc)l!-nRkvF5)Oyy!=_RxsaC5}C=^aut4asof6z{+QyC72V!lI4l?zlAvD`UVn$0Ht
z;41L+(S3RI?jvLW@(gHBYlEpk%#7zx9?Gk?@8w&gK?YbY7}&N=wz}tt<4hoiIeg%E
zrWk-ehXMGmz}f|1b&lmR20ERNwA*dT=W>!UCpw$S(B`sP##*hGbh}-$2UFByUdZP;
zP@haBB$Z6^8RUAs9_xKqz+T#40Onw#3Mg(|yDAC81p7U;UG@TJK9=jZ?l7EAYoo`0T+wdHvy&933C?
zR09{cwrE#-0Q_pL#yIvHF}yXvCiTHpV0Y(*?CidjgTq7bv@U-GU|08A&j@l_r)*bQ
z!{>W%@_6>7o=^LTzbXJ=rK^kpWdK&n5YSrn5l0?lom#y9n0Z2)awduWHx&QzG07*qoM6N<$f*MCRxBvhE
literal 0
HcmV?d00001
diff --git a/resources/assets/enderio/textures/blocks/powerConduitCrystalline.png b/resources/assets/enderio/textures/blocks/powerConduitCrystalline.png
new file mode 100644
index 0000000000000000000000000000000000000000..f42442ccb6ae8dbb84db7abcde4fab099e386d56
GIT binary patch
literal 649
zcmV;40(Sk0P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!Tf{ztDi@XR4
zF%R!=%v`RbkVfwX{ljGDoSAc&|C~8D_eLDY>5Gd@CWDexI{m0qDb;U{=s*XC&jeoV
zfiEK?l1L|U=Ykw`?xXy&@zuG$EGgZTmR=Cj!FR$yg+U$gCWI;vx_
znB;OfjR7!*Q8Jm7Mx!C^cKb=yU}qKjklz>4TTnPVlbyvy`G0Yt
z*@E3-@yQv(_M5AJ&ClzcyO(Mz0)~kXXAgis1J-tjf!%jlP2b;3-hKM{LC@ef3=<#T
z9#}s-l;3M>a(jKPT@Aj^&8g-*?M#us=jS?~b)Wf+xiw&z`0!R>lxmtl7-_s{E-+wh$bZ~`I^1Big1-{7?B00000NkvXXu0mjfS=BQ(
literal 0
HcmV?d00001
diff --git a/resources/assets/enderio/textures/blocks/powerConduitCrystallinePinkSlime.png b/resources/assets/enderio/textures/blocks/powerConduitCrystallinePinkSlime.png
new file mode 100644
index 0000000000000000000000000000000000000000..99d6c972cf3a51b001fcb1f235ab4cd26bbc08d8
GIT binary patch
literal 676
zcmV;V0$crwP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!Te##2--5l^a*HnZ=+3Zd|+Z55&iI#EpZGB$$T0
z#Awp#o}7vmGNO=;c7q-$>fT#*n>yz{x;vImrvr46N~P#vjg0iXWr=@l#Gia<_$=VX
zJ@9389En6i`b0b)M-T*JZ2P{CSS%)edX9BE9cj}TS7@AIzQ!~+x(b~9K0&+PhH088
zl}i1JJVNa&aWuLK`+_deWZWT_Y?KXe6Ny$Sa>_p$tQ8P~-d+113i*{^tLJs@c&<&^08{&RjNaoe_~&r?GT
zlOJ6Lj(3i+u)cuHn=7fBdx0$I2iIEnh%(eT+v@dBk#paTb8bIhW`~GZ6*$^H!s5oF
zjIq)|MuajTD`iM%uC_Tos1CtCjs55Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!TPLBn%l$&P#?mL-~)&)RPzQ3>La-EA>8-|wTf=K6%~bw3)`J-+9n|h
z
v=3Hjx%-nl!ESJlL;^6x}Oj7CeAD&7n|JR5g^M&Ce
zfHQj_>t7Pj^Hc}%cwE9TR6?FkrxJ_BREM)RnM_oMup7({@Hd{etb9H%-qMmx+@4CMqH9!xXCx8{
zDHIA3uE4hs>$3LvtFE2D9=LkNm-nyl%99uS@@sETGayW3faokz(CKuf-EPZDke9%9c3~w@84k5tE$McL1-Hc=PIxJbzh{{c>5O1wXb*+7ClF_tyE1MnmqEw$$#PrJRa@dHkc<1Hiro
zL~f{7t5UDm_00(J_Om_#$Yg1l$3OZ#aCmg2T@7yEx~ZHAfo#5i?(FJ%)_oVynHn&U
ze{?JG`R%Gae7Y^=g9DA4ULXtj>{(lnScYatHjWKh=ib@bd*ZLV7l^-B;M3*>RtKO%=+Ujf$Bp|MCI1JU8MhPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!Trz>kBCw01AjffJ42`)w&&7touTVdLc=c&)b1QJ|{&Olh
zL(g@{u(XUvZO;(bfeL1l6>~Nz>nzJDPWEYLEd_y3=leZ6ySfU>M}kMW5c%_w8+AfNa6Q7$a=KL@VHVp3Gqk8~Bqc
z1kmdsxNq$hI5q)fmlpGN2d2|0O(qi>4u>>cTcZ&)%V;zb8IQ*l$FZ;nQ^aBn--Y#c
zi60CGBDfB|BuON;_6nFv{{}Gc_rjwJC^m0ClD>eoLmx=_{99i8==N3d>pClziEri}
z0J}ufR
z#)fD-3viyXhL9+VWWL+&${42xSSG%?6}WQu8GZfmigtE)C2OoFSU@kXweAsRsD9Y0
zwfmt@z^|PYc5^Fm{oxDx{O+a9fyE*tKpBITG6XbMZOkuL2f(=b6}WWc0l)ij2g~@E
zA8_2|$*ouz!{SxKPe+kl*pius;uZ4_IpR8&;>Y
p(%=f5?6+dkr{9ME2{k7`^a}*!j|}riY61WN002ovPDHLkV1mtvLp1;Z
literal 0
HcmV?d00001
diff --git a/resources/assets/enderio/textures/blocks/powerConduitGold.png b/resources/assets/enderio/textures/blocks/powerConduitGold.png
new file mode 100644
index 0000000000000000000000000000000000000000..ad721730a0ace17714b6ab50e0d6adfca0698803
GIT binary patch
literal 689
zcmV;i0#5yjP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!T7gHhK!P*;2i%~gJWv?c)HsV+turV%~~1z`%UcZY~a)9ufl-Yk^y^yY{^7dz_Ki{anCjJCsPWc&ryiA
zSK!hFm>oM>XE_>;FdPoCeY+uYXS=!3lqiZ2$FZ;{Q^s;n-@UtS(H*}g!gKVE$76}l
z?-cZU4RpI64i5X0E%E-{1I5r(b9}z&{J~(1$4>_0SHC5i6(LrM&u0%1e9;I!!$c57
z>cxwcj^%X>!&B8KbEg7(hAcH!iO+uz936j`t|lHmyf2!wOwsfG;p2hWUDuU8r-oQ1
zKED-s-L2qR&&T1HZ;~~8fh?$(?^^eWW~lvKYfT^5GWW{Qvx|5+y+-`C0*6z=m|ftN2zl4Y^zD4odHQ5a5O`)&2I@jiLC89JSs
z#MyRP&Zp@Vvy&59_xq7zX{bAA`zV
XfCi7~M{!=^00000NkvXXu0mjfU4KH;
literal 0
HcmV?d00001
diff --git a/resources/assets/enderio/textures/blocks/powerConduitIron.png b/resources/assets/enderio/textures/blocks/powerConduitIron.png
new file mode 100644
index 0000000000000000000000000000000000000000..5d72f34986536215a4515b315f86e62e59dc564a
GIT binary patch
literal 636
zcmV-?0)zdDP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!TK~z{r?U&7J
zVo?mo<99bo?X0v~htA4{bY4h&g!%&R-1rP4f-fU(ryHFzovu_=@Dl_-+h5wqZE3+x
zdoQ$q2uV(IO8z-Hw?|(*9^cC&qR}WyA}1$LIucR+(eOWO*YI7yn==qUJ(W->q(1Qb
z{j%ThRj_xvo%nn{_0g~6w*=$yl
z$)qe63yH;IvRbWVG#W{#)6vc?mrMOyi9|xe;jr%McDuSpH}C_2fTU6>4|kx^Xh^wS
z*0rxU13%8rq}gmrp-_;&x3|iGYGJ@kz!oOf0nU>(d~EQVDFSRC0$lIFn*~^Prl-@X
zOePb_TwJL9%w!H48IQ*@o6VFxOv%M3_UrOeb?W?Fg?+^4^SS1`-htq=eu38=FqBFq
zod@o{P5y8=lnky=T&2DK)c;mAMgsYGq-MGr_*VDHF^6MeC=1U>hIr%p9Gf+5P1Mw
Whm$h|E}%RB0000Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!TcAL(&)XQe;DS>oH=3UKj)l#5=bVKZRx;q9F)ZR`noz6Q~l8hK55VJoxq!WV6Zs5DW&T-EONeZnatx2n5td<7+mXI!2f`*gPQK<}B8~4D8JBNWET{a5yYyf6tyX
zZZsO|n{+0nQmIHHk&s%gCYS#&wK|xqR;&73>4CIFqfuRRQa({1Y+#2%A;}D8e9XY^
z!mcdtEvoP9?SZ5-B#4vVOQOS2x#M0ohUk{ij+gaWn9`GQ`aa0&E?^I?ow+GXd)r
z8Wf8~DHIBl8Xi>{8%aHDgt=0w)UBu^*!g^3=O$9)sz-hdtFVsPa=EOmc+NohNxuM<
za|aj$hPA0Rt&nq%rpLK|Ir(+|Tj#CMhF;?Rxd(uK3&`AXS~-=A>V@8n2)Cb`CB{@~
z=q28B2Hw31SEg5F<7h)}AMSKlgKRpZniGQ9`941H-t&AHusJoLmw5j&usydeOZ!Xm
z=l({sW-m|$+TCm0BgEiG6Q}*{%(-p8fcRKzzvW*Bwr00v`CwUnRN<}=SWl_SDg+j5
zWBe9tY+?JKfz6+rnkD}a=ovR7=a{VRMZ-L=8gx7!*Y(6<171Pab7PBfb||Z_CV!uT
lul*`k{r%tYli+azB9A8kl@v|HrO*HX002ovPDHLkV1jO@CZGTS
literal 0
HcmV?d00001
diff --git a/resources/assets/enderio/textures/blocks/powerConduitSilver.png b/resources/assets/enderio/textures/blocks/powerConduitSilver.png
new file mode 100644
index 0000000000000000000000000000000000000000..0cade692b883592447f828172f661032da989420
GIT binary patch
literal 663
zcmV;I0%-k-P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!T_*REPs$Ux3JM9?W6L_)*
z;&XEn2n5syUawci?XbR-swNw3$FTCJw+s9d+()!#}a5)upsbxpBY)H$kw?eqC0l}fp|
z0tY8&vi0?g&b_@Jm|s|s^@E@CE4Ly4&(DI30_-Pq*o?trrU`nM%_fU?uH|6U3TDuy2TwYc^nqk(sUe#WNlPSJBe@w4_mUROJaXDhJ#`>*7`uj(9`
zPBQ|=09M8jSgehipRNwTMzGymf&9^lX375p_Kcg6b4=FuqQTGoj*dhkx}G>}z$?i1
x+^WSmolfhk$=#>mZNG|DzyCLUB{-ab$PJ3vnk^d8Tp$1d002ovPDHLkV1nmWHx&Q?
literal 0
HcmV?d00001
diff --git a/resources/assets/enderio/textures/blocks/powerConduitStellar.png b/resources/assets/enderio/textures/blocks/powerConduitStellar.png
new file mode 100644
index 0000000000000000000000000000000000000000..742b0514e620c396c1ed0538b0dc5f7c05f0462c
GIT binary patch
literal 577
zcmV-H0>1r;P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!T!;$Io&R5z(?`(YmO0^cO-RTJ$4yRc0R)MYK@IAX+%noMSg0
zgNd7RA`e{8yZ7BE_uO}9P%D*6dEz6HNPr~X*Vp8Doczz
zwrz{&c{HqD*A>gM=z|e!G#XsPu&>a40QtJ7x#8_V{(PUlsRnp?og+gH02P3$Ob?XE
z8uxXQpPU(T5aI5?dTx)g|2G38!-H~od@4H|t8!VoqXJY51<`1fYN5pJKu{UX>?zNl0Kdqpp*RYcHrdvK-O}*Qoep*)%vyr
zn|G}SXIDc0fd000%HLO|~ns#GDMxw=MNbG2LW|3(J@*K_5$
zp5@wvDjrK-lWnW1MSuBd7tGE8>W}IiDkk^-8~zfyT!6?2aF#(#`WAU0
P00000NkvXXu0mjf#SZ~&
literal 0
HcmV?d00001
diff --git a/resources/assets/enderio/textures/items/crystallineCapacitor.png b/resources/assets/enderio/textures/items/crystallineCapacitor.png
new file mode 100644
index 0000000000000000000000000000000000000000..ca0971af3ec246a43979aeef2d73968dadc4a625
GIT binary patch
literal 372
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b
z3=DjSK$uZf!>a)(C|TkfQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXJq(MA#*BF(ML}g
z#}Etur4wxVnj8e&o(stx73SEu@r#IeW@V)j;hSaP;mFu^dl4RO`bS3XB3X8n3b5o+pOAib;-{MJAqs65jnqsyexG&X`fR%>
zL}3DxA;!lvI6;>1s;*b
z3=Dh+L6~vJ#O${~L5ULAh?3y^w370~qEv>0#LT=By}Z;C1rt3(J;P+JIo=EmjBK7R
zjv*HQ$pU}RANcV9fBh!IHpX@9))mN1nfYJ7ZQ@bK84DN{eB1MF8H+izd&;8$@bW(>+TwJ^@^z<`>HF0*|?LA~-b^VwdX8qTXw-H`4G4X6yWdifX
ztBnRgL5UoO0OiANrrna?-ri!F;uOk$D1w*aVeag(fA@Fh>K?u~R~jgD??}O~AC3zQ
jmRZeV6KMZ$%)l_^UDUfbB5HZSP-F0P^>bP0l+XkKKeL|!
literal 0
HcmV?d00001
diff --git a/resources/assets/enderio/textures/items/endergisedCapacitor.png b/resources/assets/enderio/textures/items/endergisedCapacitor.png
new file mode 100644
index 0000000000000000000000000000000000000000..e1e539091664848ec3053463ab0346ca28317852
GIT binary patch
literal 406
zcmV;H0crk;P)N2bZe?^J
zG%hhNF=Hy6O8@`?6iGxuR5(wakY`Ixg?xZeP{to0Qpj@{km>VzC0azU774na7
z(kB9#H#NDL!>L|yUaCqk_=UuP>}3%b(@$B!9KYk*>Lvr6<;~3t{(d1gfE7Rj^L8Kh
z9t61Edm6bGoKAz3QZ(o_>7m~O&%@qGfDWT?*EvW-r!By+j}-~f5`YfU)6k~Hi>Hrv
zeXN53*2Hr$n~Z2ad#1&!N8eu`dc5z81jG~Q7mxB?*)|gPF#rGn07*qoM6N<$f?f8b
A>i_@%
literal 0
HcmV?d00001
diff --git a/resources/assets/enderio/textures/items/itemPowerConduitAluminum.png b/resources/assets/enderio/textures/items/itemPowerConduitAluminum.png
new file mode 100644
index 0000000000000000000000000000000000000000..fea5c7084323ff8180b166f1722d6e9b2f8f7fce
GIT binary patch
literal 1005
zcmVPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!TMVkv$K=kptrZT5{t!TYimnDYip}iDisNW
zz`osvQ!bZx_@cnSy1FV&O-;t#-rkm=udlE2{n~^yH#f`PoA+%ZM1W0$%mN@h=600-
z^TrifUtgD@JChRgsBpyNaU(-=_+;Q*N0{q9KC~Q`A~TebNu_Li0AfQ!gNeFOI8DI)
z;eKsxO^T(G1-r4aAwhqCe`RxX(GeU#q|3&tlK
zRfYnR5p@#%oJK)gEEZ*YSVJ2Wi(y*K}ydMg!Sq>@Wb@R6bL?<-*iihiE>77&W*_Q`C~Q)2QGex
z>+RY>Nh<(&aRy3CYm`a-pDctrN7u-uKUY{Mde>#&`Y~t-~JqS{!12)F)qk3_Ea59le
z0NX(t0Ar6v_S+67#}3+p)VYtdfQyIqv{gmv!;2_OO0|jtPmT}Se}YmhYMGLv6VGOB
zyi((^$Sys8yg|rjvsIGX35^iEzc?zHOva+VJo7`Ye)(m7@?X#$Q3xJLRL>3>K?uGz
zz!Bl+47C1aZ1RI#c=y#f%PP9eg~lA650?_9MfL2EaRQ56Vc#_$IUapHZ8pM0tx?%G
zoNWT~Z$(tk6mih}0<+6bCn9Ezh_xA4TUjT15E`NFnz=3dM>I}I&r$?@OL@IpILz+$
zcFAhqd-P0t^b*AG*4x(n>9lm|cecjq(w=C!Wutm_n{sb6ut&wHd7e$~6$n&}U&T}q
zTmXkdN7%1(c7FKo3z^I1Opoy$Z*qHEn{AUp#DUvz>ID!Q4+B5{ladyIr>*`bg9Epp
z+C+!|n+BN$KzPjUDBs`s!CMdizR5WL*P9IdUEc8~Gsr>!o17x*Lg6$4_lJAVi+R;I
bc|-mHbD4`aybM)o00000NkvXXu0mjfs>RdO
literal 0
HcmV?d00001
diff --git a/resources/assets/enderio/textures/items/itemPowerConduitCopper.png b/resources/assets/enderio/textures/items/itemPowerConduitCopper.png
new file mode 100644
index 0000000000000000000000000000000000000000..e64d907ef47a7ab52f758642ee3d12791b35d9fb
GIT binary patch
literal 1005
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
Hu0mjf)BO@O
literal 0
HcmV?d00001
diff --git a/resources/assets/enderio/textures/items/itemPowerConduitGold.png b/resources/assets/enderio/textures/items/itemPowerConduitGold.png
new file mode 100644
index 0000000000000000000000000000000000000000..c1f98482c988ac2b6f8abf3958d48f8164d4b6dd
GIT binary patch
literal 1056
zcmV+*1mF9KP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!TdroB{#bbAcXmD3D)O6iuv$
zWj!d0GR4mKtwv>(9{T~KUCw;_advjOD{pUaFDn!Za(jC#K&4WVEX&06JU&|=oW)}C
znQtBNPp4A}f`HsKO~u>a-_QQ|C6qAq<+}%C4g?WE9|kgB0OVuVU*~`La93utRPNvZ
zOA3}19K~XhWRMIt7%;9O&$SjlXc<@{c9hU;);K)?MBn!*YC`!k0p`!QaU9ENG-a|$
zl8AS3aFEUCa}H>?H|4jBl)|XrthvQ(($vi&81$r8D@nClVH|?VW=lmAt-V{rr8NR{IM0)z%>D@?QTcFtQumwzyFTmR@%QT&{^_JPO
z&z@r0uU1OZsF!KYMumQ$Uazvv>#b&Bi|K#;4OWDG9bYJtb{umbGfY0q5t5ygvS0urZEbw>V}UdA$M#nE{i@d=*3~>Y6dK
zIX#`y;#harY%b5!_i91^a=?47tD)Nym@lPFCAkRi%fp__3kPOlnem~
z#v5(=@+jg5PGpHefNezpWdIO+@xsmE>@1P+=9>Hb=*KO_@d6Xi>!~?Ww9dKAKuJ-2
zyBhTBRjl8{Lict-ztp)rd9y2zf7)g|TXOJ{FZA$Z212XVa3t+l%bcLRI~_=4I%b*9
z&dPFe;kF~{Kb+`Cn#+D&kBbaJ5Nv7yKRNYd4Lr|hwl7}>%LJS-EKwMlEPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!T%@Da6E%rGf`}-JOTi})QA80p;ybtzbms+J`2yljQ1J2wf-fMraG?wLCh;1h
zMop%^N-A?aGt2p*(|xM{`n$Ti(jD~m^;KfAn0$SG3219;lS-u`K@ixtkKvTd%Npo|valgO6CFt+(uk7vZNlQzM%+Jr8BSgTM2AKswc+SUB{{H^He0+S!($bQ|
zJSq&0jg3Zz3t_5j3&h6WRLp>Udj+r$0)`@6inyjZZM
zQb~fr!NJPs=chTO(`h+7J2PSO_xk!OS65dyb|exBiO1t+LvUbVz(mPCn4FxHTrOwh
zrluwdhK7bJY>5amnT(vDpUd3boDux+>6r(<1H_}}vb(!06B841cXwxevQcFyAUTmf
zt5MJ%9v>zD@L(->e=qm?jqUO2N%H!g&FAG_dvJ4eV?A&^TY%L(%IoWE>w{W!Hnx$X
zHjZm4ceJ-#OLlaa9klB=2o8Q&Z*>MOZHujv7!oK1nLrHqk6EFI%HxE-x=-
zc6QeIFNK0}Y0uBkbuHJ6G4U_Bl~f!Z9oat}Cl*^@U#|y2%5=i!*nL#5o+1c10WU>B
z8fIo@WNT~7>YB1$U0s#q<6~RgBc*rou%5Q6C_TdbaSTc-YC7C$Wo5<0scrtLEId6u
zT@|Zw#>U3#LAsvZMc!DotE;O@(s8`C)ySl1czD>-w7tD8J3BjOC;!iSW)y-464kRq
zMi7FN02{}CaByJd$DwX)Y#67Yq6MlAAN7apB^uSUL&gX!a)o`@Y+M_p10YP)8kK#+
z`PN9C3!-|ah=Ilh#^q+0ojM|Bjfk}wS6f*fJqV4^(t+>A#YL49(z6r+-_oPrGaP0n
zm6B938{C#^lvj*N^{7Y^y!ZOXmPM30JXZf@Fv`n^)n
z9r#szdwXklJm6^^9UZlC7~|vPlFepKkD~bTCULh6wWbq;5>00000NkvXXu0mjfLABt(
literal 0
HcmV?d00001
diff --git a/resources/assets/enderio/textures/items/itemPowerConduitMelodic.png b/resources/assets/enderio/textures/items/itemPowerConduitMelodic.png
new file mode 100644
index 0000000000000000000000000000000000000000..eada7b116f4f9657abbfd675c77b013f84b5de72
GIT binary patch
literal 1026
zcmV+d1pWJoP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!TP<3q|s;y=IFEPuCKq8S)G9-gd2F5k`Tx*G;WzZ6-;|RG-PPYdj#^Z4nH6g!Dz~X+px3?$N
zovJ2Vuh%7*nwkm^4i0oeel#yHFTYe_>Q`=*H5+_GE}4^DJf|@PK{c#OwOLjF;hTrD
zS=v-TnM_K;&j4fP#ZQY$u*0Wi4A>5s6FrwJC$AjZ5!Pln5VT3O8!ij1R4q$ktE9GB
zDN51xiIr;=DY*VdxgbT?g0%ZHboJ=yN}Vhzm#*H)PJQ(pI)1wUh-8ms)N<*p#=&TE
zR9j!Ky8}B+Gp0bW$@~rv4yh<-w0v$^R?e^J7#z674W{?k4l2!x66|sYjx_AD92!XL
zgnMW1$+UaX*wN_2|d+_;z@~hu#%Eb!%
zg|3$A#TfV(EJ`UJoqeQFI+IxJ@%rO#5|qph=-5_cOJhC~{19X!lK?*Wwf{@z-p;8%
z*f%KGXRhmmv^cXU8TZFMr%ZqaOx)LV))uAp7jZ0Uxc)$DK>B<8W#QC!K0e#{`8=sD3QIX~^P2CElVC7;S`nVzpdmlt1OXq@_Q{n*xvVA)6Y
z^pFvRU|Rzm5pm9d>$mWJL6*NPE2ri}Yd?2%mx#lKgGKf9kO>0K+(G-D7&X56?xy+(
zleNoA`*4~hWPOLIo+=W+>;*<9OhinLjGZahS<6kdBwU8NYvyKR?nc4!^t434w)Cy}
zO%HQ?WK70#N9Fj~F*$y8T>WwPw$=FXsN`LLti#E>mTY;;M)iW}>FJR7HUr0;*!_$5
zB^%G`dj&$VUhKY#xj}FN9Ih(D_Bve_5eMeO
z>0SVD+y`-{wCMuH$G*EeLOI;od5s;07*qoM6N<$f|=9m7XSbN
literal 0
HcmV?d00001
diff --git a/resources/assets/enderio/textures/items/itemPowerConduitSilver.png b/resources/assets/enderio/textures/items/itemPowerConduitSilver.png
new file mode 100644
index 0000000000000000000000000000000000000000..ce46f4baa21a351487ed5e447050add04b542540
GIT binary patch
literal 968
zcmV;(12_DMP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!TYqgq$#>U1P?|$w|Z*Q;6OkU7Hh=4W*nF)YDX6+#V%kFPEIXRJq
z=_v_YRyZP&h>{^0EEpKq;B)PZ4=sb1NE?nYm`LdI0K~4YE)_K)zf8dV{`dI!SW3mB
zCR?pmB{V)h-Z(uy)qqqwEjvGcsW9~`m&=+BZ9^;;lm7mG^&tolrS@QLVNP<{thT$m
zyCvdhfH5;9V4KgEF<>hoCb%z)8=D;~!kP>RoEF44>$1T1_xB}VD5&M~c`3L)zJr4U
z$-90wmy?3~0xK_Q>(SAfT3J#qoxPQvwzcKZYIBqa1_smy<8k!^`oPy~ufR6bj1UMG
z%x~P)9})Iw{ry+j`0!1~;K0RiFuijtI668~f*sC~BgI{oY%BpQTW@4_`=hROb$&);
zg7Edie%64KV}q0;<}xOmr6(`cI5C{8^_$m}Un-T9iya;wwzW(z%)q~3UP|%!?PvX`
z6U1bj%Zu$KwC*iIRv*-h@Pm^;f&gs;WdMxbezv76xc72fC*+*lI1`w-uji~O%GaO7
zv83X}ENFT2wf-kKibeNNr9_Wz%<6cf#bJ_jdi*1guV0ntcW)_&gHYzQ5#!?F!oh-i
zy2&_!X6~T^3oz-2SCE+sE
zRTJCSDygrhB?7i2?in^S?e-#>OiCt`k<7@5w$tvmRsZm?q+CDQ;@G~~pV8L~O-xKQ
zxVIS?ablc#yK5kDV(cpB1i=Mx*mQ*LI%nlem!~DWx2JlHcf84op&?x+gNOrb!)YG?
zZ`=odeH+{Xu(Gw^WH5heQUf6Z+8AUe0REV@gM54A=cX?HeUowguQwUkyWH_6Gsr}M
qHZ?`mg#0oA^ZQ@+i@4^ST$MjO#fF9ag7k0z0000Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!TuH7?|(k*yn1#D$s|{{Txj
zzCw&k9;GeiB@#+Yd!6shJ#{QD^-E4??m6H2=G-&G9juOy4%_8&(ca!30oB#jWZO1b
zmc`F92d7jj{o$(w{5v~4{sTmC@t_+#;SRLL}lRuh+)`5Z!J!i;9rh
zCP4h=xVxL9bb5n}&FAxEb#-;wg+hT7T3f^P?)^Cy=KiUq@0lY?w2tEdV({zu2E`&@
zoCwjkRGbFRUZ91AG(UU2Uhaw_-b#@JEjnR=R`04HoN
z+0EnPQkpH5UZrFz%eJ(o(qA$LA- &x0RX9Z3M@
z0hGRF!pHMEBqoIcr6!iY2aOk5G*QZ9rO+95=6r;I_V$s^hb~$Ne{4T!*K4fU)
z;N>AY)BB3!w!^_9`}FW51_IH#CaJlcQ-nMF-KR)hnF-eN>GNQ4+0Dptl^WhIp;MW_n7
z9mo}!dfX!5_bch!ttA?wXrz(aS|ilf(!}$Y=CJlR1*us*M;%VH8ui<|^}>dp6_3Yl
ze76y3Z;#N((Rg{X!Fpwyxf7xv8gTlIG`AtXEZ4r7s+;j;f>4
zfN~z-AjAQggCmQXaTD<4!pUa0%5CF28Fwh~ukK{I002ovPDHLkV1gx-+VTJZ
literal 0
HcmV?d00001
diff --git a/resources/assets/enderio/textures/items/silverCapacitor.png b/resources/assets/enderio/textures/items/silverCapacitor.png
new file mode 100644
index 0000000000000000000000000000000000000000..7fee71ed36456ecd1deaa00dcc9fc5dddfe21eee
GIT binary patch
literal 367
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b
z3=DjSK$uZf!>a)(C|TkfQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXJq(MA#*BF(Hl<}
z#}Etuxf5);4mk+8Jr}yCv9qDKRs4dRW6%xGCZ&kTU$d2tsYp2nb7-+0Idn)mqH=Pf
z`UdY!o<7$e8K!)y&7a=N#ia1){t}j5>$q2)H7j~ly(qw8>G9vn6IAV4Mdb8!3$3Of
zRc&qhccq7`MvJ>*=S69b&PfL({99U!lvI6;>1s;*b
z3=DjSK$uZf!>a)(C|TkfQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXJq(MA#*BF(Fac#
z#}Etur4#P*9drqG4WO6ul)=zyP*kikV+S+wWdi#9NznOW{
zSD4|SQ}(~6YayP?f}Fmjw_KYNaKnDCV7QQBMx@clXCJ0%ule5I?!Myp#De2`2Me_&
z&f6?hd!2FV(WbffM{_RnPIcj8VBYcUf_%u&-S
K=%__4!xhus^F8C7a)O_moCOsb)o|E@k?=Ldl&)zAWn#k><^3S9T
P=ywKBS3j3^P6XMus01GN%F+ZSZt)46*P}Uck+9{`^1wLjii33X2q;|KDG)
z{@=dtTSJMngVewO_Fw;Bz5V=u{GPhM_N({xR4`vKwXgm7$bR#bJN0aehL3m{B^%cK
zd^lO1!?}Z1!P()4z3tEcPqVN8leaBo%Hi;gW6X@(QT)1o_JoH2v$y5_-CuZG>=Co@
zlAnK`X8!*hq;ya!L66B>h)Ln>{kpfU*=n2%ZuN2bZe?^J
zG%heMGBNQWX_Wu~0b5B#K~y+TrIAfb0#Ou(=g0X299&e3h$0Bes8Q^jiil!}7J|#5
zZOE7~Ws4S(2yHUcM$1tLC!P8Ou3Wv%IdO-EF-u%Lvv}`&9`2bd0T_#c;V29YM}a@t
zY*x~Bok^Uk5Dd#`#wQ@C@a{NxER}rag}rUOnkMcG1KWHqmOg
z{}$NYE}qKefWWeCmc&nvhYK2(g^KYI5ICPE%7%gH;XX2%j9(yjB|+z-j$ZEq^E(@m
zW!V$-`O=cc@FbC!ipiO7Z?@=SfT{
z%Pfe+Vp2MtX2IlY)P02mz5oCK07*qoM6N<$f~usz0{{R3
literal 0
HcmV?d00001
diff --git a/resources/assets/enderio/textures/items/stellar_chestplate.png b/resources/assets/enderio/textures/items/stellar_chestplate.png
new file mode 100644
index 0000000000000000000000000000000000000000..d5ffd2bbc45875909c49cbcfdce58a1fb375f272
GIT binary patch
literal 556
zcmV+{0@MA8P)N2bZe?^J
zG%heMGBNQWX_Wu~0jWtuK~y+TrIK4q0#Ou&{ePnWBM5tlFp8oqlIU*aLr)PzA($Xk
zbd#B~vXQdUu{1Abib2p1@Ws_x8)izT9;$~moU_kf-`RW5@c{Ujz776H@<}F>j)F^b
z7+RQx*Xwn~DWA{h#Cia>(X=cSOC?DT27?}o@kXnKX1gu%;pKS&Ie?MKA~MD)V(~a~
z`8@8+Wr5iMnkw}=o|{d)zP+JRyAzND;HJ~rg;}^%kPQJ)QialEttNn{hJ|{gAh|BU
z*~NicQpd8c)=iYFRVm#z0-A^y^#C|928Y<>rkH33(n=aim0ML!PRxl!
z;&TQZ2zw5#N5OgI%rx@Wl|X=fxses|ET!uL=o#YIUzO7LWXfY}E4a?4U_BTZk48in
znG+1og~jam``v(n@RZu#z{u)2zdRBU#r^(aT%DO<4gqZ21qjT9q|8nyjczw9M(zAm
zrQA7Y<`BSq7l60%Ef6xgx}=T_rJS_G8Ex(CNDF)$-vTJkVLKKR5R+{q#j`*lAVdEV
uK*=pCxo>g|{nHZyVT^s->H+*+@O%J)?Zu|9V<_?f0000N2bZe?^J
zG%heMGBNQWX_Wu~0WL{IK~y+TWBC97KSda;ASoEDASoDyvuV>NFfQ-!{*MjA}a6k&K-Msn#&i(uUA3nYV6gmvV2f%EY
zA=%CKKruW9oIG>p|K)4f{@=cL4JdQ~jBnq)M!W&L_w55}zV|<+rsDsUmGl13TE7I$
ze)jU^|BF|y5H{f0$&+9WM)tP+zn--vSZvjrrT7hKpED6i9r!N2bZe?^J
zG%heMGBNQWX_Wu~0j^0zK~y+TrIJlcLQxQg?~hYlh;G~lQA9*h7NwS$rDdU(-(+MW
z6toamLSWIxK%%6S1VdAc$`6dzE?m6b8A$Gd5~Rh;%$&LNoHH|50`M>WdN_)NAe~N2
z7QYwPkPoYYJ=Tv;=gZz*7z_rXMhKSNF4+{&>b&CSHjAxT6!R_zijQ}Ad8?q`&vUG-
z5dd^Uv;88wC0TX$2?jjLD&xIb9}bvx+R^NE@cGq3tx-m=cf%sT-TlCGqXGIxSt9_b
z*Kx}-DzzF)uIc|5mn6_Jo187hrdgjEM32L=k(r7f&%%+Xc><1x+C~E|O
zY2S_f!vhbG04kMA(rUHR+|~xnJ`dhoEq;}<<@l5@7ewru|boF2-ij>}6A91%B?$)rT`#6!qtgPgPa
zoU;7`KwCIHi{s)d!^1KfjSQe4EEWrKj#^XJ2mtz#&NCSV!eQ=Juh(-6G~DZ44)?|4
z@EOpmXz#Rvv6V&Wbh^P1X%jy=WsLwBU68&3NaWfZv(}#A00000NkvXXu0mjf$Mf%r
literal 0
HcmV?d00001
diff --git a/resources/assets/enderio/textures/items/stellar_pickaxe.png b/resources/assets/enderio/textures/items/stellar_pickaxe.png
new file mode 100644
index 0000000000000000000000000000000000000000..46b17dc791c53697952ad16ae244ac49a53f0b82
GIT binary patch
literal 373
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`3dtTpz6=aistgPb%?u1b{{!il
z3=E|P3=FRl7#OT(FffScPl`Y422{&g;1OBOz`!jC!i@DP@e_f9k|nMYCBgY=CFO}l
zsSE{)nRz98d8s7|CVB>XMus01GN%F+UGsEt46*P}me`|UWB=RUs?AG~ZKG=C|M~l?
zSdXv2XY=F#|Nkrhp9w1ZFWGYBU$*s)M`k=LgnAs?6mIhwv$RP5sN|4lICSEGz3tEc
zSF@M@+h4U+^pQ{u!)!){v#znZ|8t#~{>fW!eE$FDX5$Wi;R(-Lt+zLsHvdrQy5XP>7p|NGs$vqhUN)285uK_aumto?s)buW@+age&cCcghZLypN2bZe?^J
zG%heMGBNQWX_Wu~0qjXcK~y+Tm6G2}Q(+j#U+ALS-EOdRA#7uRMPdGeDGO>p+%Fe1
z<8T@xQ(Cmm1r-+UDi~9AYAC{jUC3nHjd+trh!94IB!x7J8g=c3d_B)IeDTZ%b@AbS
zd7tz7KF@j25dbb>wOScfRYfwH6s1zhz|)0UOy!=#H?CclF9xJiDUr=)4RUUE89$rH
zI5{a}cp~08!0B`vy1!gm!pzbq&&A?M)OZYFKyxTmyawLi$y^g#M<62o-NM7X0wTOIxS^-XW%`K8;2|p
zjz*Es=lPPQtUaDadFQRZg$M;)qFSwrS8vwjh0*xuW0P1Y6pR5cR$gN=H-nL>1Rgz9
z`BSyVu3-D!Cd(wWBLn;sg}1$42>DEqT_C=n49{bN6s-)c-|X_udB4Uidd4&H&4QV00HKQQ-gp002ov
JPDHLkV1fxM4^037
literal 0
HcmV?d00001
diff --git a/resources/assets/enderio/textures/items/totemicCapacitor.png b/resources/assets/enderio/textures/items/totemicCapacitor.png
new file mode 100644
index 0000000000000000000000000000000000000000..400a3582e3ceb27dbf2b0ccf770504361a6a6167
GIT binary patch
literal 418
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCij$3p^r=85sBugD~Uq{1qucLCF%=h?3y^w370~qEv>0#LT=By}Z;C1rt33
zJtM=93Yk-ZrV4qwIEGmGC;#~W-`-VXwF1xozklET?=Sa0_~Y2TE&pfMz4~uH)oSqy
z$A=3Z%jT>7+5h$Nvw8vB%~wV94qTj@RbZ+ib;0m(-uD0D_s{*}Uo?@oqQZFg!^^LI
zI;2W`PgETIc;x?XKGpy17hmXE?77RfhRs=+r}@v{S7qE1&42h0Ih>Vv*szGR&9RaF
zGS6X!vp0ASu9RFRFt;~{!^5_X@rBd{Q^nKGS00-(Sju#mF{m&edeO
z``cSN^Q=4aGnKfOJ>0) {
+ addShaped(new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 4), "b#b", "ccc", "b#b", 'c', lastTier, 'b', binder, '#', "ingotCopper");
+ lastTier = new ItemStack(EnderIO.itemPowerConduitEndergy, 1, 4);
+ }
+
+ addShaped(new ItemStack(EnderIO.itemPowerConduit, numConduits, 0), "b#b", "ccc", "b#b", 'c', lastTier, 'b', binder, '#', conductiveIron);
+ lastTier = new ItemStack(EnderIO.itemPowerConduit, 1, 0);
+
+ if(OreDictionary.doesOreNameExist("ingotSilver")) {
+ addShaped(new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 5), "b#b", "ccc", "b#b", 'c', lastTier, 'b', binder, '#', "ingotSilver");
+ lastTier = new ItemStack(EnderIO.itemPowerConduitEndergy, 1, 5);
+ }
+
+ if(OreDictionary.doesOreNameExist("ingotElectrum")) {
+ addShaped(new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 6), "b#b", "ccc", "b#b", 'c', lastTier, 'b', binder, '#', "ingotElectrum");
+ lastTier = new ItemStack(EnderIO.itemPowerConduitEndergy, 1, 6);
+ }
+
+ addShaped(new ItemStack(EnderIO.itemPowerConduit, numConduits, 1), "b#b", "ccc", "b#b", 'c', lastTier, 'b', binder, '#', energeticGold);
+ lastTier = new ItemStack(EnderIO.itemPowerConduit, 1, 1);
+
+ if(OreDictionary.doesOreNameExist("ingotSilver")) {
+ addShaped(new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 7), "b#b", "ccc", "b#b", 'c', lastTier, 'b', binder, '#', energeticSilver);
+ lastTier = new ItemStack(EnderIO.itemPowerConduitEndergy, 1, 7);
+ }
+
+ addShaped(new ItemStack(EnderIO.itemPowerConduit, numConduits, 2), "b#b", "ccc", "b#b", 'c', lastTier, 'b', binder, '#', phasedGold);
+ lastTier = new ItemStack(EnderIO.itemPowerConduit, 1, 2);
+
+ addShaped(new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 8), "b#b", "ccc", "b#b", 'c', lastTier, 'b', binder, '#', crystallineAlloy);
+ lastTier = new ItemStack(EnderIO.itemPowerConduitEndergy, 1, 8);
+
+ if(OreDictionary.doesOreNameExist("slimeballPink")) {
+ addShaped(new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 9), "b#b", "ccc", "b#b", 'c', lastTier, 'b', binder, '#', crystallinePinkSlime);
+ lastTier = new ItemStack(EnderIO.itemPowerConduitEndergy, 1, 9);
+ }
+
+ addShaped(new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 10), "b#b", "ccc", "b#b", 'c', lastTier, 'b', binder, '#', melodicAlloy);
+ lastTier = new ItemStack(EnderIO.itemPowerConduitEndergy, 1, 10);
+
+ addShaped(new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 11), "b#b", "ccc", "b#b", 'c', lastTier, 'b', binder, '#', stellarAlloy);
+
+ }
+
+ else {
+ addShaped(new ItemStack(EnderIO.itemPowerConduit, numConduits, 0), "bbb", "###", "bbb", 'b', binder, '#', conductiveIron);
+ addShaped(new ItemStack(EnderIO.itemPowerConduit, numConduits, 1), "bbb", "###", "bbb", 'b', binder, '#', energeticGold);
+ addShaped(new ItemStack(EnderIO.itemPowerConduit, numConduits, 2), "bbb", "###", "bbb", 'b', binder, '#', phasedGold);
+
+ addShaped(new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 0), "bbb", "###", "bbb", 'b', binder, '#', crudeSteel);
+ addShaped(new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 1), "bbb", "###", "bbb", 'b', binder, '#', "ingotIron");
+ addShaped(new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 2), "bbb", "###", "bbb", 'b', binder, '#', "ingotAluminum");
+ addShaped(new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 3), "bbb", "###", "bbb", 'b', binder, '#', "ingotGold");
+ addShaped(new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 4), "bbb", "###", "bbb", 'b', binder, '#', "ingotCopper");
+ addShaped(new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 5), "bbb", "###", "bbb", 'b', binder, '#', "ingotSilver");
+ addShaped(new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 6), "bbb", "###", "bbb", 'b', binder, '#', "ingotElectrum");
+ addShaped(new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 7), "bbb", "###", "bbb", 'b', binder, '#', energeticSilver);
+ addShaped(new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 8), "bbb", "###", "bbb", 'b', binder, '#', crystallineAlloy);
+ addShaped(new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 9), "bbb", "###", "bbb", 'b', binder, '#', crystallinePinkSlime);
+ addShaped(new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 10), "bbb", "###", "bbb", 'b', binder, '#', melodicAlloy);
+ addShaped(new ItemStack(EnderIO.itemPowerConduitEndergy, numConduits, 11), "bbb", "###", "bbb", 'b', binder, '#', stellarAlloy);
+
+ }
if (GasUtil.isGasConduitEnabled()) {
addShaped(new ItemStack(EnderIO.itemGasConduit, numConduits, 0), "bbb", "#g#", "bbb", 'b', binder, '#', electricalSteel, 'g', fusedGlass);
}
diff --git a/src/main/java/crazypants/enderio/conduit/gui/ExternalConnectionContainer.java b/src/main/java/crazypants/enderio/conduit/gui/ExternalConnectionContainer.java
index 31a70db4..f7556f12 100644
--- a/src/main/java/crazypants/enderio/conduit/gui/ExternalConnectionContainer.java
+++ b/src/main/java/crazypants/enderio/conduit/gui/ExternalConnectionContainer.java
@@ -66,8 +66,8 @@ public class ExternalConnectionContainer extends ContainerEnder fuzzyB;
+
+ final boolean isAdvanced;
+ final boolean isStickyModeAvailable;
+
+ private final IItemFilterContainer filterContainer;
+ private final ItemFilter filter;
+
+ private int buttonIdOffset;
+ private int xOffset;
+ private int yOffset;
+
+ public BigItemFilterGui(GuiContainerBaseEIO gui, IItemFilterContainer filterContainer, boolean isStickyModeAvailable) {
+ this(gui, filterContainer, isStickyModeAvailable, 32, 48, 0);
+ }
+
+ public BigItemFilterGui(GuiContainerBaseEIO gui, IItemFilterContainer filterContainer, boolean isStickyModeAvailable,
+ int xOffset, int yOffset,
+ int buttonIdOffset) {
+ this.gui = gui;
+ this.isStickyModeAvailable = isStickyModeAvailable;
+ this.filterContainer = filterContainer;
+ this.xOffset = xOffset;
+ this.yOffset = yOffset;
+ this.buttonIdOffset = buttonIdOffset;
+
+ filter = filterContainer.getItemFilter();
+
+ isAdvanced = filter.isAdvanced();
+
+ int butLeft = xOffset + 92+ 54;
+ int x = butLeft;
+ int y = yOffset + 40;
+ whiteListB = new IconButton(gui, ID_WHITELIST + buttonIdOffset, x, y, IconEIO.FILTER_WHITELIST);
+ whiteListB.setToolTip(EnderIO.lang.localize("gui.conduit.item.whitelist"));
+
+ y -= 20;
+ useMetaB = new ToggleButton(gui, ID_META + buttonIdOffset, x, y, IconEIO.FILTER_META_OFF, IconEIO.FILTER_META);
+ useMetaB.setSelectedToolTip(EnderIO.lang.localize("gui.conduit.item.matchMetaData"));
+ useMetaB.setUnselectedToolTip(EnderIO.lang.localize("gui.conduit.item.ignoreMetaData"));
+ useMetaB.setPaintSelectedBorder(false);
+
+ stickyB = new ToggleButton(gui, ID_STICKY + buttonIdOffset, x, y, IconEIO.FILTER_STICKY_OFF, IconEIO.FILTER_STICKY);
+ stickyB.setSelectedToolTip(EnderIO.lang.localizeList("gui.conduit.item.stickyEnabled"));
+ stickyB.setUnselectedToolTip(EnderIO.lang.localize("gui.conduit.item.stickyDisbaled"));
+ stickyB.setPaintSelectedBorder(false);
+
+ y -= 20;
+ useOreDictB = new ToggleButton(gui, ID_ORE_DICT + buttonIdOffset, x, y, IconEIO.FILTER_ORE_DICT_OFF, IconEIO.FILTER_ORE_DICT);
+ useOreDictB.setSelectedToolTip(EnderIO.lang.localize("gui.conduit.item.oreDicEnabled"));
+ useOreDictB.setUnselectedToolTip(EnderIO.lang.localize("gui.conduit.item.oreDicDisabled"));
+ useOreDictB.setPaintSelectedBorder(false);
+
+ y -= 20;
+ useNbtB = new ToggleButton(gui, ID_NBT + buttonIdOffset, x, y, IconEIO.FILTER_NBT_OFF, IconEIO.FILTER_NBT);
+ useNbtB.setSelectedToolTip(EnderIO.lang.localize("gui.conduit.item.matchNBT"));
+ useNbtB.setUnselectedToolTip(EnderIO.lang.localize("gui.conduit.item.ignoreNBT"));
+ useNbtB.setPaintSelectedBorder(false);
+
+ y -= 20;
+ fuzzyB = new CycleButton(gui, ID_FUZZY + buttonIdOffset, x, y, FuzzyMode.class);
+ }
+
+ public void createFilterSlots() {
+ filter.createGhostSlots(gui.getGhostSlots(), xOffset+1, yOffset+1, new Runnable() {
+ @Override
+ public void run() {
+ sendFilterChange();
+ }
+ });
+ }
+
+ @Override
+ public void mouseClicked(int x, int y, int par3) {
+ }
+
+ @Override
+ public void updateButtons() {
+ ItemFilter activeFilter = filter;
+
+ if(isAdvanced) {
+ useNbtB.onGuiInit();
+ useNbtB.setSelected(activeFilter.isMatchNBT());
+
+ useOreDictB.onGuiInit();
+ useOreDictB.setSelected(activeFilter.isUseOreDict());
+
+ if(isStickyModeAvailable) {
+ stickyB.onGuiInit();
+ stickyB.setSelected(activeFilter.isSticky());
+ }
+
+ fuzzyB.onGuiInit();
+ fuzzyB.setMode(activeFilter.getFuzzyMode());
+ }
+
+ useMetaB.onGuiInit();
+ useMetaB.setSelected(activeFilter.isMatchMeta());
+
+ whiteListB.onGuiInit();
+ if(activeFilter.isBlacklist()) {
+ whiteListB.setIcon(IconEIO.FILTER_BLACKLIST);
+ whiteListB.setToolTip(EnderIO.lang.localize("gui.conduit.item.blacklist"));
+ } else {
+ whiteListB.setIcon(IconEIO.FILTER_WHITELIST);
+ whiteListB.setToolTip(EnderIO.lang.localize("gui.conduit.item.whitelist"));
+ }
+ }
+
+
+ @Override
+ public void actionPerformed(GuiButton guiButton) {
+
+ if(guiButton.id == ID_META + buttonIdOffset) {
+ filter.setMatchMeta(useMetaB.isSelected());
+ sendFilterChange();
+ } else if(guiButton.id == ID_NBT + buttonIdOffset) {
+ filter.setMatchNBT(useNbtB.isSelected());
+ sendFilterChange();
+ } else if(guiButton.id == ID_STICKY + buttonIdOffset) {
+ filter.setSticky(stickyB.isSelected());
+ sendFilterChange();
+ } else if(guiButton.id == ID_ORE_DICT + buttonIdOffset) {
+ filter.setUseOreDict(useOreDictB.isSelected());
+ sendFilterChange();
+ } else if(guiButton.id == ID_FUZZY + buttonIdOffset) {
+ filter.setFuzzyMode(fuzzyB.getMode());
+ sendFilterChange();
+ } else if(guiButton.id == ID_WHITELIST + buttonIdOffset) {
+ filter.setBlacklist(!filter.isBlacklist());
+ sendFilterChange();
+ }
+ }
+
+ private void sendFilterChange() {
+ updateButtons();
+ filterContainer.onFilterChanged();
+ }
+
+ @Override
+ public void deactivate() {
+ useNbtB.detach();
+ useMetaB.detach();
+ useOreDictB.detach();
+ whiteListB.detach();
+ stickyB.detach();
+ fuzzyB.detach();
+ }
+
+ @Override
+ public void renderCustomOptions(int top, float par1, int par2, int par3) {
+ GL11.glColor3f(1, 1, 1);
+ gui.bindGuiTexture(1);
+
+ gui.drawTexturedModalRect(gui.getGuiLeft() + xOffset + 54, gui.getGuiTop() + yOffset, 0, 238, 18 * 5, 18);
+ gui.drawTexturedModalRect(gui.getGuiLeft() + xOffset, gui.getGuiTop() + yOffset, 0, 238, 18 * 5, 18);
+ gui.drawTexturedModalRect(gui.getGuiLeft() + xOffset + 54, gui.getGuiTop() + yOffset + 20, 0, 238, 18 * 5, 18);
+ gui.drawTexturedModalRect(gui.getGuiLeft() + xOffset, gui.getGuiTop() + yOffset + 20, 0, 238, 18 * 5, 18);
+ gui.drawTexturedModalRect(gui.getGuiLeft() + xOffset + 54, gui.getGuiTop() + yOffset + 40, 0, 238, 18 * 5, 18);
+ gui.drawTexturedModalRect(gui.getGuiLeft() + xOffset, gui.getGuiTop() + yOffset + 40, 0, 238, 18 * 5, 18);
+ }
+
+}
diff --git a/src/main/java/crazypants/enderio/conduit/gui/item/ItemSettings.java b/src/main/java/crazypants/enderio/conduit/gui/item/ItemSettings.java
index 748401ff..a2a5e44f 100644
--- a/src/main/java/crazypants/enderio/conduit/gui/item/ItemSettings.java
+++ b/src/main/java/crazypants/enderio/conduit/gui/item/ItemSettings.java
@@ -69,7 +69,7 @@ public class ItemSettings extends BaseSettingsPanel {
private final RedstoneModeButton rsB;
private final ColorButton colorB;
-
+
private ColorButton channelB;
boolean inOutShowIn = false;
@@ -98,18 +98,18 @@ public class ItemSettings extends BaseSettingsPanel {
nextFilterB = MultiIconButton.createRightArrowButton(gui, NEXT_FILTER_ID, x, y);
- x = 66;
+ x = 66;
channelB = new ColorButton(gui, ID_CHANNEL, x, y);
channelB.setColorIndex(0);
channelB.setToolTipHeading(EnderIO.lang.localize("gui.conduit.item.channel"));
-
+
filterUpgradeTooltip = new GuiToolTip(new Rectangle(x - 21 - 18 * 2, customTop + 3 + 16, 18, 18), EnderIO.lang.localize("gui.conduit.item.filterupgrade")) {
@Override
public boolean shouldDraw() {
return !gui.getContainer().hasFilterUpgrades(isInputVisible()) && super.shouldDraw();
}
};
- speedUpgradeTooltip = new GuiToolTip(new Rectangle(x - 21 - 18, customTop + 3 + 16, 18, 18), EnderIO.lang.localize("gui.conduit.item.speedupgrade"), EnderIO.lang.localize("gui.conduit.item.speedupgrade2")) {
+ speedUpgradeTooltip = new GuiToolTip(new Rectangle(x - 21 - 18*2, customTop + 3 + 16 + 36, 18, 18), EnderIO.lang.localize("gui.conduit.item.speedupgrade"), EnderIO.lang.localize("gui.conduit.item.speedupgrade2")) {
@Override
public boolean shouldDraw() {
return !gui.getContainer().hasSpeedUpgrades() && super.shouldDraw();
@@ -130,7 +130,7 @@ public class ItemSettings extends BaseSettingsPanel {
x += channelB.getWidth() + 4;
priLeft = x - 8;
-
+
rsB = new RedstoneModeButton(gui, ID_REDSTONE_BUTTON, x, y, new IRedstoneModeControlable() {
@Override
@@ -167,8 +167,8 @@ public class ItemSettings extends BaseSettingsPanel {
loopB.setPaintSelectedBorder(false);
priorityTooltip = new GuiToolTip(new Rectangle(priLeft + 9, y, priWidth, 16), EnderIO.lang.localize("gui.conduit.item.priority"));
-
- x = priLeft + priWidth + 9;
+
+ x = priLeft + priWidth + 9;
priUpB = MultiIconButton.createAddButton(gui, ID_PRIORITY_UP, x, y);
priDownB = MultiIconButton.createMinusButton(gui, ID_PRIORITY_DOWN, x, y+8);
@@ -212,7 +212,7 @@ public class ItemSettings extends BaseSettingsPanel {
ConnectionMode mode = con.getConnectionMode(gui.getDir());
if(mode == ConnectionMode.INPUT) {
- showInput = true;
+ showInput = true;
} else if(mode == ConnectionMode.OUTPUT) {
showOutput = true;
} else if(mode == ConnectionMode.IN_OUT) {
@@ -257,7 +257,7 @@ public class ItemSettings extends BaseSettingsPanel {
return;
}
boolean outputActive = (mode == ConnectionMode.IN_OUT && !inOutShowIn) || (mode == ConnectionMode.OUTPUT);
-
+
if(!outputActive) {
rsB.onGuiInit();
@@ -286,12 +286,12 @@ public class ItemSettings extends BaseSettingsPanel {
priDownB.onGuiInit();
gui.addToolTip(priorityTooltip);
}
-
+
int chanCol;
if(!outputActive) {
- chanCol = itemConduit.getInputColor(gui.getDir()).ordinal();
- } else {
- chanCol = itemConduit.getOutputColor(gui.getDir()).ordinal();
+ chanCol = itemConduit.getInputColor(gui.getDir()).ordinal();
+ } else {
+ chanCol = itemConduit.getOutputColor(gui.getDir()).ordinal();
}
channelB.onGuiInit();
channelB.setColorIndex(chanCol);
@@ -324,12 +324,12 @@ public class ItemSettings extends BaseSettingsPanel {
sendFilterChange();
} else if(guiButton.id == ID_CHANNEL) {
- DyeColor col = DyeColor.values()[channelB.getColorIndex()];
+ DyeColor col = DyeColor.values()[channelB.getColorIndex()];
if(isInputVisible()) {
itemConduit.setInputColor(gui.getDir(), col);
} else {
itemConduit.setOutputColor(gui.getDir(), col);
- }
+ }
sendFilterChange();
}
@@ -343,7 +343,7 @@ public class ItemSettings extends BaseSettingsPanel {
}
@Override
- public void mouseClicked(int x, int y, int par3) {
+ public void mouseClicked(int x, int y, int par3) {
super.mouseClicked(x, y, par3);
if(filterGui != null) {
filterGui.mouseClicked(x, y, par3);
@@ -351,7 +351,7 @@ public class ItemSettings extends BaseSettingsPanel {
}
private boolean isInputVisible() {
- ConnectionMode mode = con.getConnectionMode(gui.getDir());
+ ConnectionMode mode = con.getConnectionMode(gui.getDir());
return (mode == ConnectionMode.IN_OUT && inOutShowIn) || (mode == ConnectionMode.INPUT);
}
@@ -388,9 +388,9 @@ public class ItemSettings extends BaseSettingsPanel {
//draw speed upgrade slot
GL11.glColor3f(1, 1, 1);
gui.bindGuiTexture(1);
- gui.drawTexturedModalRect(gui.getGuiLeft() + 9 + 18, gui.getGuiTop() + 46, 94, 238, 18, 18);
+ gui.drawTexturedModalRect(gui.getGuiLeft() + 9, gui.getGuiTop() + 46 +18 +18, 94, 238, 18, 18);
}
-
+
//filter upgrade slot
GL11.glColor3f(1, 1, 1);
gui.bindGuiTexture(1);
diff --git a/src/main/java/crazypants/enderio/conduit/item/filter/ItemBigItemFilter.java b/src/main/java/crazypants/enderio/conduit/item/filter/ItemBigItemFilter.java
index 02c9bd00..cbcacb7d 100644
--- a/src/main/java/crazypants/enderio/conduit/item/filter/ItemBigItemFilter.java
+++ b/src/main/java/crazypants/enderio/conduit/item/filter/ItemBigItemFilter.java
@@ -38,9 +38,9 @@ public class ItemBigItemFilter extends ItemBasicItemFilter {
int damage = MathHelper.clamp_int(stack.getItemDamage(), 0, 1);
ItemFilter filter;
if(damage == 0) {
- filter = new ItemFilter(30,false);
+ filter = new ItemFilterBig(24, false);
} else {
- filter = new ItemFilter(30,true);
+ filter = new ItemFilterBig(24, true);
}
if(stack.stackTagCompound != null && stack.stackTagCompound.hasKey("filter")) {
filter.readFromNBT(stack.stackTagCompound.getCompoundTag("filter"));
diff --git a/src/main/java/crazypants/enderio/conduit/item/filter/ItemFilterBig.java b/src/main/java/crazypants/enderio/conduit/item/filter/ItemFilterBig.java
new file mode 100644
index 00000000..9138f1ca
--- /dev/null
+++ b/src/main/java/crazypants/enderio/conduit/item/filter/ItemFilterBig.java
@@ -0,0 +1,69 @@
+package crazypants.enderio.conduit.item.filter;
+
+import java.util.List;
+
+import com.enderio.core.client.gui.widget.GhostSlot;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import crazypants.enderio.conduit.gui.GuiExternalConnection;
+import crazypants.enderio.conduit.gui.item.BasicItemFilterGui;
+import crazypants.enderio.conduit.gui.item.BigItemFilterGui;
+import crazypants.enderio.conduit.gui.item.IItemFilterGui;
+import crazypants.enderio.conduit.gui.item.ItemConduitFilterContainer;
+import crazypants.enderio.conduit.item.IItemConduit;
+
+public class ItemFilterBig extends ItemFilter {
+
+ public ItemFilterBig() {
+ this(24,false);
+ }
+
+ public ItemFilterBig(int numItems, boolean isAdvanced) {
+ super(numItems, isAdvanced);
+ }
+
+ @Override
+ public String getInventoryName() {
+ return "Big Item Filter";
+ }
+
+ @Override
+ @SideOnly(Side.CLIENT)
+ public IItemFilterGui getGui(GuiExternalConnection gui, IItemConduit itemConduit, boolean isInput) {
+ ItemConduitFilterContainer cont = new ItemConduitFilterContainer(itemConduit, gui.getDir(), isInput);
+ BigItemFilterGui bigItemFilterGui = new BigItemFilterGui(gui, cont, !isInput);
+ bigItemFilterGui.createFilterSlots();
+ return bigItemFilterGui;
+ }
+
+ @Override
+ public void createGhostSlots(List slots, int xOffset, int yOffset, Runnable cb) {
+ int topY = yOffset;
+ int leftX = xOffset;
+ int index = 0;
+ int numRows = (int) Math.ceil(items.length/8);
+ for (int row = 0; row < numRows; ++row) {
+ for (int col = 0; col < 8; ++col) {
+ int x = leftX + col * 18;
+ int y = topY + row * 20;
+ slots.add(new ItemFilterGhostSlot(index, x, y, cb));
+ index++;
+ }
+ }
+ }
+
+ @Override
+ public int getSlotCount() {
+ return getSizeInventory();
+ }
+
+
+ @Override
+ public String toString() {
+// return "ItemFilter [isBlacklist=" + isBlacklist + ", matchMeta=" + matchMeta + ", matchNBT=" + matchNBT + ", useOreDict=" + useOreDict + ", sticky="
+// + sticky + ", items=" + Arrays.toString(items) + ", oreIds=" + Arrays.toString(oreIds) + ", isAdvanced=" + isAdvanced + "]";
+ return "Big"+super.toString();
+ }
+
+}
diff --git a/src/main/java/crazypants/enderio/conduit/power/ItemPowerConduit.java b/src/main/java/crazypants/enderio/conduit/power/ItemPowerConduit.java
index 57684c4a..30245f4d 100644
--- a/src/main/java/crazypants/enderio/conduit/power/ItemPowerConduit.java
+++ b/src/main/java/crazypants/enderio/conduit/power/ItemPowerConduit.java
@@ -23,8 +23,6 @@ public class ItemPowerConduit extends AbstractItemConduit {
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() + "Stellar", "enderio:itemPowerConduitStellar")
-
};
public static ItemPowerConduit create() {
@@ -37,6 +35,10 @@ public class ItemPowerConduit extends AbstractItemConduit {
super(ModObject.itemPowerConduit, subtypes);
}
+ protected ItemPowerConduit(ModObject modObject, ItemConduitSubtype[] subtypes) {
+ super(modObject, subtypes);
+ }
+
@Override
public Class extends IConduit> getBaseConduitType() {
return IPowerConduit.class;
diff --git a/src/main/java/crazypants/enderio/conduit/power/PowerConduit.java b/src/main/java/crazypants/enderio/conduit/power/PowerConduit.java
index 45d7f955..1729d5c3 100644
--- a/src/main/java/crazypants/enderio/conduit/power/PowerConduit.java
+++ b/src/main/java/crazypants/enderio/conduit/power/PowerConduit.java
@@ -50,7 +50,7 @@ public class PowerConduit extends AbstractConduit implements IPowerConduit {
private static ICapacitor[] capacitors;
- static final String[] POSTFIX = new String[] { "", "Enhanced", "Ender", /*"Stellar"*/};
+ static final String[] POSTFIX = new String[] { "", "Enhanced", "Ender"};
static ICapacitor[] getCapacitors() {
if(capacitors == null) {
@@ -58,7 +58,6 @@ public class PowerConduit extends AbstractConduit implements IPowerConduit {
new BasicCapacitor(Config.powerConduitTierOneRF, Config.powerConduitTierOneRF),
new BasicCapacitor(Config.powerConduitTierTwoRF, Config.powerConduitTierTwoRF),
new BasicCapacitor(Config.powerConduitTierThreeRF, Config.powerConduitTierThreeRF),
- // new BasicCapacitor(Config.powerConduitTierFourRF, Config.powerConduitTierFourRF)
};
}
return capacitors;
@@ -76,8 +75,8 @@ public class PowerConduit extends AbstractConduit implements IPowerConduit {
public void registerIcons(IIconRegister register) {
for (String pf : POSTFIX) {
ICONS.put(ICON_KEY + pf, register.registerIcon(ICON_KEY + pf));
- ICONS.put(ICON_KEY_INPUT + pf, register.registerIcon(ICON_KEY_INPUT + pf));
- ICONS.put(ICON_KEY_OUTPUT + pf, register.registerIcon(ICON_KEY_OUTPUT + pf));
+ ICONS.put(ICON_KEY_INPUT + pf, register.registerIcon(ICON_KEY_INPUT));
+ ICONS.put(ICON_KEY_OUTPUT + pf, register.registerIcon(ICON_KEY_OUTPUT));
ICONS.put(ICON_CORE_KEY + pf, register.registerIcon(ICON_CORE_KEY + pf));
}
ICONS.put(ICON_TRANSMISSION_KEY, register.registerIcon(ICON_TRANSMISSION_KEY));
@@ -503,12 +502,12 @@ public class PowerConduit extends AbstractConduit implements IPowerConduit {
@Override
public IIcon getTextureForInputMode() {
- return ICONS.get(ICON_KEY_INPUT + POSTFIX[subtype]);
+ return ICONS.get(ICON_KEY_INPUT);
}
@Override
public IIcon getTextureForOutputMode() {
- return ICONS.get(ICON_KEY_OUTPUT + POSTFIX[subtype]);
+ return ICONS.get(ICON_KEY_OUTPUT);
}
@Override
diff --git a/src/main/java/crazypants/enderio/conduit/power/PowerConduitNetwork.java b/src/main/java/crazypants/enderio/conduit/power/PowerConduitNetwork.java
index 9b592007..1c73ba98 100644
--- a/src/main/java/crazypants/enderio/conduit/power/PowerConduitNetwork.java
+++ b/src/main/java/crazypants/enderio/conduit/power/PowerConduitNetwork.java
@@ -21,7 +21,7 @@ public class PowerConduitNetwork extends AbstractConduitNetwork powerReceptors = new HashMap();
diff --git a/src/main/java/crazypants/enderio/conduit/power/endergy/ItemPowerConduitEndergy.java b/src/main/java/crazypants/enderio/conduit/power/endergy/ItemPowerConduitEndergy.java
new file mode 100644
index 00000000..c8e30d36
--- /dev/null
+++ b/src/main/java/crazypants/enderio/conduit/power/endergy/ItemPowerConduitEndergy.java
@@ -0,0 +1,75 @@
+package crazypants.enderio.conduit.power.endergy;
+
+import java.util.List;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import crazypants.enderio.EnderIO;
+import crazypants.enderio.ModObject;
+import crazypants.enderio.conduit.AbstractItemConduit;
+import crazypants.enderio.conduit.IConduit;
+import crazypants.enderio.conduit.ItemConduitSubtype;
+import crazypants.enderio.conduit.power.IPowerConduit;
+import crazypants.enderio.conduit.power.ItemPowerConduit;
+import crazypants.enderio.machine.power.PowerDisplayUtil;
+import crazypants.enderio.power.ICapacitor;
+
+public class ItemPowerConduitEndergy extends ItemPowerConduit {
+
+ private static String PREFIX;
+ private static String POSTFIX;
+
+ static ItemConduitSubtype[] subtypes = new ItemConduitSubtype[] {
+ new ItemConduitSubtype(ModObject.itemPowerConduitEndergy.name() + "Crude", "enderio:itemPowerConduitCrude"),
+ new ItemConduitSubtype(ModObject.itemPowerConduitEndergy.name() + "Iron", "enderio:itemPowerConduitIron"),
+ new ItemConduitSubtype(ModObject.itemPowerConduitEndergy.name() + "Aluminum", "enderio:itemPowerConduitAluminum"),
+ new ItemConduitSubtype(ModObject.itemPowerConduitEndergy.name() + "Gold", "enderio:itemPowerConduitGold"),
+ new ItemConduitSubtype(ModObject.itemPowerConduitEndergy.name() + "Copper", "enderio:itemPowerConduitCopper"),
+ new ItemConduitSubtype(ModObject.itemPowerConduitEndergy.name() + "Silver", "enderio:itemPowerConduitSilver"),
+ new ItemConduitSubtype(ModObject.itemPowerConduitEndergy.name() + "Electrum", "enderio:itemPowerConduitElectrum"),
+ new ItemConduitSubtype(ModObject.itemPowerConduitEndergy.name() + "EnergeticSilver", "enderio:itemPowerConduitEnergeticSilver"),
+ new ItemConduitSubtype(ModObject.itemPowerConduitEndergy.name() + "Crystalline", "enderio:itemPowerConduitCrystalline"),
+ new ItemConduitSubtype(ModObject.itemPowerConduitEndergy.name() + "CrystallinePinkSlime", "enderio:itemPowerConduitCrystallinePinkSlime"),
+ new ItemConduitSubtype(ModObject.itemPowerConduitEndergy.name() + "Melodic", "enderio:itemPowerConduitMelodic"),
+ new ItemConduitSubtype(ModObject.itemPowerConduitEndergy.name() + "Stellar", "enderio:itemPowerConduitStellar"),
+
+ };
+
+ public static ItemPowerConduitEndergy create() {
+ ItemPowerConduitEndergy result = new ItemPowerConduitEndergy();
+ result.init();
+ return result;
+ }
+
+ protected ItemPowerConduitEndergy() {
+ super(ModObject.itemPowerConduitEndergy, subtypes);
+ }
+
+ @Override
+ public Class extends IConduit> getBaseConduitType() {
+ return IPowerConduit.class;
+ }
+
+ @Override
+ public IConduit createConduit(ItemStack stack, EntityPlayer player) {
+ return new PowerConduitEndergy(stack.getItemDamage());
+ }
+
+ @Override
+ @SideOnly(Side.CLIENT)
+ public void addInformation(ItemStack itemStack, EntityPlayer par2EntityPlayer, List list, boolean par4) {
+ if(PREFIX == null) {
+ POSTFIX = " " + PowerDisplayUtil.abrevation() + PowerDisplayUtil.perTickStr();
+ PREFIX = EnderIO.lang.localize("power.maxOutput") + " ";
+ }
+ ICapacitor cap = PowerConduitEndergy.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/endergy/PowerConduitEndergy.java b/src/main/java/crazypants/enderio/conduit/power/endergy/PowerConduitEndergy.java
new file mode 100644
index 00000000..c7c5a67a
--- /dev/null
+++ b/src/main/java/crazypants/enderio/conduit/power/endergy/PowerConduitEndergy.java
@@ -0,0 +1,559 @@
+package crazypants.enderio.conduit.power.endergy;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.EnumMap;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import net.minecraft.block.Block;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.IIcon;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.World;
+import net.minecraftforge.common.util.ForgeDirection;
+
+import com.enderio.core.client.render.BoundingBox;
+import com.enderio.core.client.render.IconUtil;
+import com.enderio.core.common.util.DyeColor;
+import com.enderio.core.common.vecmath.Vector3d;
+
+import crazypants.enderio.EnderIO;
+import crazypants.enderio.conduit.AbstractConduit;
+import crazypants.enderio.conduit.AbstractConduitNetwork;
+import crazypants.enderio.conduit.ConduitUtil;
+import crazypants.enderio.conduit.ConnectionMode;
+import crazypants.enderio.conduit.IConduit;
+import crazypants.enderio.conduit.IConduitBundle;
+import crazypants.enderio.conduit.RaytraceResult;
+import crazypants.enderio.conduit.geom.CollidableCache.CacheKey;
+import crazypants.enderio.conduit.geom.CollidableComponent;
+import crazypants.enderio.conduit.geom.ConduitGeometryUtil;
+import crazypants.enderio.conduit.power.IPowerConduit;
+import crazypants.enderio.conduit.power.PowerConduit;
+import crazypants.enderio.conduit.power.PowerConduitNetwork;
+import crazypants.enderio.config.Config;
+import crazypants.enderio.item.PacketConduitProbe;
+import crazypants.enderio.machine.RedstoneControlMode;
+import crazypants.enderio.power.BasicCapacitor;
+import crazypants.enderio.power.ICapacitor;
+import crazypants.enderio.power.IPowerInterface;
+import crazypants.enderio.power.PowerHandlerUtil;
+import crazypants.enderio.tool.ToolUtil;
+
+import static crazypants.enderio.config.Config.powerConduitEndergyTiers;
+
+public class PowerConduitEndergy extends PowerConduit {
+
+ static final Map ICONS = new HashMap