From 04861e41a8424b409170ef76a458072c21df3bd1 Mon Sep 17 00:00:00 2001
From: Raoul Van den Berge <raoulvdberge@gmail.com>
Date: Fri, 8 Jul 2016 21:14:36 +0200
Subject: [PATCH] More fixes

---
 .../java/refinedstorage/block/BlockGrid.java  |   5 +++
 .../block/BlockProcessingPatternEncoder.java  |   5 +++
 .../refinedstorage/block/BlockSolderer.java   |  18 ----------
 .../processing_pattern_encoder.json           |  33 ++++++------------
 .../refinedstorage/textures/blocks/cable.png  | Bin 714 -> 658 bytes
 .../textures/blocks/detector_powered.png      | Bin 692 -> 676 bytes
 .../textures/blocks/disk_drive_0.png          | Bin 645 -> 648 bytes
 .../textures/blocks/disk_drive_1.png          | Bin 655 -> 651 bytes
 .../textures/blocks/disk_drive_2.png          | Bin 655 -> 651 bytes
 .../textures/blocks/disk_drive_3.png          | Bin 655 -> 648 bytes
 .../textures/blocks/disk_drive_4.png          | Bin 659 -> 653 bytes
 .../textures/blocks/disk_drive_5.png          | Bin 659 -> 650 bytes
 .../textures/blocks/disk_drive_6.png          | Bin 659 -> 649 bytes
 .../textures/blocks/solderer.png              | Bin 648 -> 0 bytes
 .../textures/blocks/solderer_working.png      | Bin 653 -> 0 bytes
 15 files changed, 20 insertions(+), 41 deletions(-)
 delete mode 100755 src/main/resources/assets/refinedstorage/textures/blocks/solderer.png
 delete mode 100755 src/main/resources/assets/refinedstorage/textures/blocks/solderer_working.png

diff --git a/src/main/java/refinedstorage/block/BlockGrid.java b/src/main/java/refinedstorage/block/BlockGrid.java
index c45c5b0ad..b2a852313 100755
--- a/src/main/java/refinedstorage/block/BlockGrid.java
+++ b/src/main/java/refinedstorage/block/BlockGrid.java
@@ -74,4 +74,9 @@ public class BlockGrid extends BlockNode {
     public boolean hasConnectivityState() {
         return true;
     }
+
+    @Override
+    public EnumPlacementType getPlacementType() {
+        return EnumPlacementType.ANY;
+    }
 }
diff --git a/src/main/java/refinedstorage/block/BlockProcessingPatternEncoder.java b/src/main/java/refinedstorage/block/BlockProcessingPatternEncoder.java
index 7ee8043ee..d9c0199e7 100755
--- a/src/main/java/refinedstorage/block/BlockProcessingPatternEncoder.java
+++ b/src/main/java/refinedstorage/block/BlockProcessingPatternEncoder.java
@@ -35,4 +35,9 @@ public class BlockProcessingPatternEncoder extends BlockBase {
 
         return true;
     }
+
+    @Override
+    public EnumPlacementType getPlacementType() {
+        return null;
+    }
 }
diff --git a/src/main/java/refinedstorage/block/BlockSolderer.java b/src/main/java/refinedstorage/block/BlockSolderer.java
index ed627cbaa..037a38e73 100755
--- a/src/main/java/refinedstorage/block/BlockSolderer.java
+++ b/src/main/java/refinedstorage/block/BlockSolderer.java
@@ -8,17 +8,12 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.EnumHand;
-import net.minecraft.util.EnumParticleTypes;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
 import refinedstorage.RefinedStorage;
 import refinedstorage.RefinedStorageGui;
 import refinedstorage.tile.TileSolderer;
 
-import java.util.Random;
-
 public class BlockSolderer extends BlockNode {
     public static final PropertyBool WORKING = PropertyBool.create("working");
 
@@ -40,7 +35,6 @@ public class BlockSolderer extends BlockNode {
         return true;
     }
 
-
     @Override
     protected BlockStateContainer createBlockState() {
         return super.createBlockStateBuilder()
@@ -48,18 +42,6 @@ public class BlockSolderer extends BlockNode {
             .build();
     }
 
-    @SideOnly(Side.CLIENT)
-    public void randomDisplayTick(IBlockState state, World world, BlockPos pos, Random rand) {
-        double d0 = (double) pos.getX() + 0.5D;
-        double d1 = (double) pos.getY() + rand.nextDouble() * 6.0D / 16.0D;
-        double d2 = (double) pos.getZ() + 0.5D;
-        double d4 = rand.nextDouble() * 0.6D - 0.3D;
-
-        if (state.getValue(WORKING)) {
-            world.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, d0 - 0.52D, d1, d2 + d4, 0.0D, 0.0D, 0.0D, new int[0]);
-        }
-    }
-
     @Override
     public boolean isOpaqueCube(IBlockState state) {
         return false;
diff --git a/src/main/resources/assets/refinedstorage/blockstates/processing_pattern_encoder.json b/src/main/resources/assets/refinedstorage/blockstates/processing_pattern_encoder.json
index 706d18e00..fc867cefa 100755
--- a/src/main/resources/assets/refinedstorage/blockstates/processing_pattern_encoder.json
+++ b/src/main/resources/assets/refinedstorage/blockstates/processing_pattern_encoder.json
@@ -1,11 +1,15 @@
 {
   "forge_marker": 1,
   "defaults": {
-    "model": "orientable",
+    "model": "cube",
     "textures": {
-      "side": "refinedstorage:blocks/side",
-      "top": "refinedstorage:blocks/processing_pattern_encoder",
-      "front": "refinedstorage:blocks/side"
+      "particle": "refinedstorage:blocks/processing_pattern_encoder",
+      "down": "refinedstorage:blocks/side",
+      "up": "refinedstorage:blocks/processing_pattern_encoder",
+      "north": "refinedstorage:blocks/side",
+      "east": "refinedstorage:blocks/side",
+      "south": "refinedstorage:blocks/side",
+      "west": "refinedstorage:blocks/side"
     }
   },
   "variants": {
@@ -15,25 +19,8 @@
         "y": 0
       }
     ],
-    "direction": {
-      "north": {
-        "y": 0
-      },
-      "east": {
-        "y": 90
-      },
-      "south": {
-        "y": 180
-      },
-      "west": {
-        "y": 270
-      },
-      "up": {
-        "x": 270
-      },
-      "down": {
-        "x": 90
-      }
+    "normal": {
+      "model": "cube"
     }
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/cable.png b/src/main/resources/assets/refinedstorage/textures/blocks/cable.png
index 114937eb77c37b09b611661cab7d6397db9440ca..4688d64fd2b2fb26a0bacb1bdc234378b758245d 100644
GIT binary patch
delta 574
zcmV-E0>S;t1(F4jJPN%401mwYNBfYikwzzf5J^NqR5(vPP6>CSKp309-d6=Vq{w}U
zKt&K3%8jKDYis+%HsikC%rNB3Bmr{iFW2Sz`Sp4GxqbhB1Iw~}F4yaP{ki|#@Aup7
zHqUe4_tQ8H-9TtbhhZ3}5t!bm_Yby!>+&_vi~!JKAID2mQ&QJ;+qNj^y1vCRb<^d4
zGSAC2e+=V@E}-q&xB3kziZf}N26KnAY3in}+1#L^>AJRU#(o%w5wxx=7NC?AMNz$B
z(MLsH(yAznsw^>3TJ$JuQBNt&%d$FU89AMBW_gaeL^#W{yv!@KRMq)>rch~_<!PFp
zk|d3yhy{`)IUbK74C$$W9Y1?MXK7Y{WO!xF{s3$w2!be%*al+uih)<Q8IK+`io+m;
z6CgnpgmLKl{viy*INl#Zn4;GRJH=;{41aP=UgLzx5dxZ}*^X^Fw(B^)<2ttEdEVjR
zyPh4QBnbEZ-g7(`SB|rHe4_4D(=-jkunfz!m>U<CW$3zQTBhfF{(kRzJ_-$g-PARe
zD2k$Knht2XX_%I6LEr6mOfhwgHuAP@nwFuNDgu%uZMWN(|4<cKQJ`psW|#(&5AlJQ
z9j=HV2(m11x8Teu%aR~UOjOXKq7Gb=nB^}gq9~$IRTcHoC2wV3<avI>al&RT@EkZV
ziJ~mYqKK$KxE05(IbhANIext<UaeN_;WnGizmEfwDDbQ2=clKqKS=c83+>5kvH$=8
M07*qoM6N<$f<;an<^TWy

delta 630
zcmV-+0*U>S1<D1GJPN)501mzZ>O!%=kwzzfNJ&INR5(vPPib?aKop$+{})mfLsTwV
zHOPJF649&#iE^l1qEbOOB(Y*@zwaBjYMaN*JG%P;DvPpyt3S>k=kN37&*kgutFG(!
zx4J&o-<R*p<?{LYSyk0`yFKg=MP8sV2#ccFANGLqwX9Cn@%4B*o!;y75#JclFEF8h
zOyU)a<2cJQFv#<52FE@>lx0=@F012izu#Sv<=H0Q0DOOek|cpTOOiB6;v|isP7`oQ
z^E^$H-L}{jyDUrNc#Q>Nh<x8)t>K9_YrrN5BR}w?Ab@cc1$heVvo)m94kFj{kn6(f
zEtktM3_<KIyk)SAz-6^sEEZ7+{}_0Gi@EDQJC1AHHWoOJGn>txuW;wC4|Lyud3o{X
z-qM51o6kYu!W3x8vMhUI;{Z%Brhq3LIG^BjYEQ=27?=QL*_J)Eb<=ztkL~I7=i?Yi
zlcx!U3u~P@e96rDHJyRVwn4y4yrL?ys_2?#YPzOshGAINP&d@aA=r*b!;ztX89IzK
zZK#>3*Y8P^B#NRWNV=k#rU?UC7J2?bk|lF!4o4&1FjYkp2I7G4BaY*Eo*xVb`~xov
zqO8b*B=q}z=s*IcqN=i@NRlk@V(+1cXqxVHIzRrS%ds2>9bVuC5i7fZ-WA<Gj1WnZ
zEX#H}kYggl&~1`xx7#cSE?ux;0|HGm48#7*5k*np*X?q>s~5vEO|sc+wg{rtBHH)F
zJrp!WF*HL_ASDseAc#8xqe&3=cXy3O1HV9T!5(l1JC>!%cC&GNdvkO17a^BTk!aO}
QoB#j-07*qoM6N<$g0&VhF#rGn

diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/detector_powered.png b/src/main/resources/assets/refinedstorage/textures/blocks/detector_powered.png
index 7625d198969521b151a68ec811afab2b84a379a4..8d38c9153193f922492973d124825630d02f944b 100755
GIT binary patch
delta 592
zcmV-W0<ZnF1*8R#JPN)501mzZ>O!%=kwzzfB1uF+R5(vPQbB9tKop+;<w=l2kA<Zr
z^iagq9wHk>ECeZ@ytuVhbJ&B2kV6h32M>FYJ%q*6Vk3k=gA5YFG9+P(m8L}PalcG<
z_nUd)&3oT_^YY%1Z@>&P&t*QhZM)HE#Bm&kA(Za`tn-{Qo6RiCA`lj`S0H^&_vwCr
zzwh;W$HU=}9s2!#nx^msLBJRbgHShgVw$GsdB_Lkj)dKH@3JgA9zVL>Zo&~FB}*vv
zbzLVA@BkhV(ts*mCCd(P@9&DD6fU2`bzM!<2!v7^gaP$^C{Ww&_IA77?RK}f?Sv&f
z5zWIW9goLERaM7vP!)23?s~3C$oA!b1p!cC@qEv5emai3SS-}9DmnXf)@(LEb3g&f
zCS)?1j7B3UIKo%}gwxX#vRbXsfhdmt<KZ8M!(kku!%@T{aDb=P6Im{oI3fVGq9MN+
zdl=>md-V92B)?&d69giRtq@Q-sa#dBYJga)i(*mI{r#80U{I7K)<kUh>telsQmGI$
z8zaO(`LyTwGmy}e&1M4yM;qI=;l!XpCbBGJ*oeuW2>;?juu&nh;#dH=;FIMR>2x}V
zVPM{Xg=HFoaJgQuH^HV_trm9Eg53lSWYTK2aNxQBULsry2=M*2a3Nr<;PFIxzD`HU
zOVTyG4-P}uHSPT3{Q22Oj35X*s1`tW*r(H}EXm~h`Ua3B3H9NN_fsyHe{hsaCEO23
e4k=%fbn^!)lle@44dNpJ0000<MNUMnLSTaUM;mtl

delta 608
zcmV-m0-yb)1+)c_JPN-601m$aI0aKAkwzzfGD$>1R5(vPQqODRKooxefcgh{5~R>$
zVQC3H6fw06k;WhjL5e3YZf*T>*n@|VLk_`%hdsz1Wbw4v2qDlQK|)xDBy6#=Dben6
zzr@}BW+u$M_kC|(-W&P?OtEIkn$70(d9_*%g23}UY`y}p&JxOWI-N`=gvC7e3Pi7e
z(LUPm_w9E3{ct$Mhfb#xMG-u%>oUeX*Hbl>bX~VB3-N%&5wg41T^z^n@4s8ER+z#=
zNESMdt*R<vfd`}l&v6~OCCBmM*V~&c%SV@;!Zb}qQ3%U%9M^Ll+r|dldcD5gZg;y~
zvsn*Wm<DnZnd1xw0~(D+hG8Hp!~orYv`mt++m{yzsFsDrvMs~-ZW!ibu^4?G(b<Qy
zTCH}Q0vo!`QZqLk4*UH+)p8`|U_1hZ)6)}LtyZXjANc?A@DIISFYr-e-)BBJz|-o9
zmdhoM5Fl3+<OgF9y<}kaA0NZ;CyYS|A!KX?LGh$`Rk|tze7VB&RL&5exxfE^)a`bu
zlA(_ozRY97U*RjoVv$g6v=9wVyFJ67frpxGHXDd>oMX=CaH7#5lPHR4HZ;i-Nx!%d
zY-EV2I39sm@QI>CjYdP$H1r#oVCWjhU9Q*bjk_t8N=Lgsfn5g;WRfHahcx!zOSnr8
z0^4457aZCOUK%Kg*J#K|N~(fO_mM(VRYf_!IDdY&q2V|V*#d|T`*=JS1(B|=Zva6M
ukRQHyKZQc!TZ()>kNe?BAS6Q&ZvFsFdiJ?K=dhgs0000<MNUMnLSTY%%o{xb

diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_0.png b/src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_0.png
index 157bbd049160799cfdbb0201888c4b2430a6e106..9fdb281a570bcad01fd57ea172a3062e9352001d 100644
GIT binary patch
delta 568
zcmV-80>}M@1&9TZB#|)~3c>&Y4#EKyC`y2lQzm}`21!IgR5(vHl0U2BKorI2vn>0G
zb}K=VppPJt{DBw@;o&atvGQ1CS1c?nB(N!5ixd{&6)92#3k$JGks_o>VIdYN?Dsdx
z+cWoGCU?%cGnqT$075*H9z}5+9~(sP5%C?6jU*)u!~K3Q@T#otpuX3S`tf+&Znryr
zy)l2U>zb9KD5|O|i_#B#vD@t~mrL0|E?ngR6o4dW*K0}1>YC@7@B0FW2VB>kPF-i}
zxSsp`{LS^eCL>|nc9v!5^Le}73OvvAqAVQS{wqXlfBxI1vFX&IVwUI2<x;FxtJCSk
zsVF0U3DYt$+p-+TF-?<*K-b5o(>Y0!)p~y=)|)kZq0x060Wr(jKcmFud_np9lR(*W
z=JOY^SS*mH$5hia@lz1nYXxbVj<qoYZKS~gZ;LlEpU;z23I@X=0(CSx@&WmnQd8GW
z1Y><HGfA>QFngJWhmhV3h64n{!H`}hNle3%I2nybuU}+R_VhiT&1S;$JX#1zQIvnr
zKLiX_RhjquePy7u0x~=U8Vy+(hC#E@w1ThSKg@PN3;|0Kg2TZuEHRl(f*_#Z-EOzX
z=yp0C>3yXSkEBGe2LT#nVObU*?9jeJCV^ZEd>;>JEA#zs4~H<BxbjH;miN&B8kEMR
z2x<eWliO@IhGvMTCw@ug`Z*tw_X8lP(t`b2kkI7NH1!`ivcKz3XJgv{0000<MNUMn
GLSTY)+6v<U

delta 563
zcmV-30?hr01%(BWBnkm@Qb$4nuFf3kks%uj!vFvd!vV){sAQ2wCVv6;Nkl<ZI8P;#
zJ+HDr5QX<|nrIBs8$vLABuFIW#y7czxrN1zg@uKopfDB`7KDOg3u0kmC@3fh1%-vN
zps;_R#k0;ZJ9FkNGAk}1!BS;un&<g-K$@la43JF~B}tO=`7E%m?OvdN_3!@uem|ej
z7xs7(_kB;LX_~I<+JB~v;z*oMr?M>D0jls&3m^bVMUO{|WcR4+DvBb3!2>}MtX6@)
z@`Et={{9z);gC`AJg=&%`~7}A9tBp{b<;M!=MfN614CSK8Yiz-K8mFN{{F;nx4YeL
zycIG~9M|FJxvuZ~j^p6Vs<f=d?RJ+^?)E#eKkPY+9?P-_@PAdUPC%l(mvoY(^TXL}
ze#CaWrM0*grfC+1@}JKN*e=WkPt!2rfZy$}*laekPz|&B91Yztu52J*3p6duA-S*?
zDkJ5VhV{=nxg^YHHlO8LHlNLzm6U|3%%x!%S*nt1rdhsTuSFP!j1ZEhY3U_}q3b&F
zbUM{$8rxh-GJjkH1`S!*w#~5VfrK9}3Qu(=U<*E4)NI=o%jGhTW9B^`k0-40Xf#qb
z)u!-BDoiF2pg|U{>#`ZN2l*t4RVj`lEM~04=hGPuZn+H9D@8}{#{g(h22)K?2cS;w
za5&heExx|^OFEyQ_rr6404g7FJ_Q9+Ez{Kh11Wm#au87HvRD8B002ovPDHLkV1f}{
B3w!_o

diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_1.png b/src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_1.png
index 8282a19ec4a163373af122dff2efa83e03dbf7e4..90119f5b99feaf81be03323683d95fb6d318cff8 100644
GIT binary patch
delta 570
zcmV-A0>%B01&alcB#|)~3c>&Y4#EKyC`y2lQzw53Nkl<ZI8QB-Kda(E6vYSjn=J1W
z?N)*!K_3z#`2#T+!oywOvhrADS1c?nB(N#OB85e;ut*UsEW{#3ijX3Og;=Dp-u+GD
znR_pjJLlY)%pI`<As$JOqQl{EtP$-a;vSHVBqa>P?RG2hvMBGMx>t|t@p#;Bw>y5l
zF|U8Bij_Ri%d#x;!Vi40*=#PCOHo5ET;%{1fFx(vYeC8Knq{f)`vQjtT-P0sU1#jL
zp8NLp&Go!GBVpTinx^OTdA(i>Jj=4Y$Q|4M_enhMMf?@gR<(`C4i(cZo6qNBu~?i=
zCr(8f@mrXdiP@IrIF4zWL<G7%Je|&Q94~*C3$a`+*$a)X>j;Qx#{MZKF6Rr%Kc5B4
zhBKYMi`i_3G&v@kriovI*jy_}l4Ph25ooFg2Yk#v#B@516DjER`v?ZAdgKH0F`=fe
zn+S&bP-fzIhG6nO33nmA>GgXE`n^8AisJ(fix07?sz1KSr0nVbFquq*=XtaclA?bo
zFFys0!C=6=+wCenr4f+f8PI6R!Y~Y)jiwQN{r)uDeHsFmA_TjgVOU}`8U;Z>zuWD0
zhtY1eTGG2p7amE8P6q-s$ilKLKG>mogG>Us6!<<K&{pQ#%@z(}G;-yU{59{R1~e$O
zOA*u>R42Dutqjc&udn>lfa~XcMBX9~ph^SwXF)=fL(>NT0iRsKa;5Kf-T(jq07*qo
IM6N<$g2*@x=>Px#

delta 572
zcmV-C0>k}_1&;-gBnkm@Qb$4nuFf3kks%uj!vFvd!vV){sAQ2wCw~A*L_t(IPc4!^
ztLi`y#TVXJd0$FUB<LlCNd7<!hH&x0E#wv!Vqsw+DN=|<3X6~;#TLQBLQ<qi5iC+z
z$SqP>zxUht&SoaNvuDn1GAqs?!BS;un&<hYN1CPh3=mBfB}tOg=_IiB-u{5@r+am;
z*X#Lw{$P(M^RDaIX@8ogZQFZukK#xikH@ks?>*GULk)lcBsF_H?nt(ex~`%q5*R!X
z1i@kv_zOP>gU`=DK^XQC1<&)Us=D27hr>Z&bzL|2#`nCxzr_FNw;+fl)u_B!_$XF&
zz1eKUcDub^ubc`QD30s!c&_XFzT-IfvMMcWcD>%Dl-u1_?0@z<YLR1E7886`Q@=u@
zyp?1UB=gN#t-i#1y(YD|6sBnwh4Sy;3Rup}8E?}t;ehY;w^*%KvQP<==@bp!FfJ@0
zUkWrW%ON<kW-21(nuO)oGC3#oW-^`RSvH+a>6MgBQ<+P{FtStyRZp{gxm=1c3~3=G
zP1DkI3Paa*=6~bySes}pb18{%4QMoEVcRy%CI=F}zbL#_O~4Yowb-+5SIp=0IF9M}
za5x+>hJ(RC*;pIHBd9PML4XEXxUS2h*Y4$$BvxB-6k#!KWqvxI;Na%-KpiPMa6fuL
zgVLKyg4zRhV*CBxHf{0o!6)hbe$I#I{s2_opgtQ4rWqQhss97`m*<0C?o$*10000<
KMNUMnLSTab%M?ri

diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_2.png b/src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_2.png
index bb95653c42bdedc4165280a48cfd2e1a16a579b4..5f55368bd018f5d4fbd15e21ed7eb6ed1ba75205 100644
GIT binary patch
delta 570
zcmV-A0>%B01&alcB#|)~3c>&Y4#EKyC`y2lQzw53Nkl<ZI8QZ_Kda(E6vYSjn=J1W
z?G}rmNYF<Jk^F%e4D#?TZ&`UPvMUxA7Lp=`SfsEBuSk(1SXhWfiWDJ53JbAFVZHks
z<DR+qGP!fkoypu0I}qZL^eBqscz;Lq5fMKC*+^2tFx+mp0<X&I3hHZpt8cg4<#M^=
z=L>)Hx~^F%ilVBjvMBw)7n{xIbUKxH$c3{UfC7-@?0haMS)KDd^L=07@POxeqmk#1
zTyN~Xyu5nj@jWBqI8K&j$K!FmUJE?W^P((V$NBq7JnZSeeUmmCxm3*Zd_JFx#bR+d
z95@wa#BX8Q7UtNt>$;X@5fK>1;BYu5NwR-fF2r)RWG^&^VIUx8Is0dnI2}(Y|9loG
z8_sn4CT6o4(sZBdx-NbRVsot^P1AusK%i?n9PmDS7t`r9Nu{9I?;}t(ZO;efeM(Kk
zun-K4fy^Yy48i1W67E8J)9d#T^m~1Jl_W6@OX5V+v>#t&Qug#Co=hfUJRZ|RNQ!@=
zJpB|fR8?i(?RJ%((g?`#3}`fDVVWk*M$-tset($bJq!U$5rW;$G;J{)4uc?|-|cq0
z!)Ui!E$LmQ3y-8krvm{RWMSJjAMDV)K_-D*3Va_AXe;yWW($Wf9D4Fd{+jo32Q(;m
zmm;WlP@UXrwK8>6JU{bGD%a2Xh`b^nK$QmU&w_+5hpwyt0B8lop?THKQvd(}07*qo
IM6N<$f=hS`g#Z8m

delta 572
zcmV-C0>k}_1&;-gBnkm@Qb$4nuFf3kks%uj!vFvd!vV){sAQ2wCw~A*L_t(IPc@Q1
zi|RlW#RuM3dEe<FC=zrD63HKk!4MW7Y$01%h=qlPq(~taDJ(*Y6jKBX3$aL%BBV%R
zAzP%d-u+E{@66nrJ9o}KljM##ff!4aB}tZL=MG7l;8Q?0QIt52kH@3Hn!5P{?N|G3
zpU>yx@%X~-58}3M*?+03s%e_Ks>3K0hr{7^yVV`k#$64703;RN?=_Omy)26`3<U-c
z_`W}%``+C11ONT~uO9?mM!|L6qA0G{>wdo%SXq`;U3sqi{Y(6tzyHraYR=~#ibYwj
z*K4uaY%Z4zZ-oq%wqrA0$MHPRwrxBGra8S_u2Ra)b|bdCEq`ZGW11!bz9>1rK;m}2
zQTe?VRK7UN<%d|UR+Q%F+%SwhSN`=|0n4c|<!MX|IN)>jDVEEn%vHf?JVryGOwKGI
zpK~-#(<V7Jrz#`mih{+*B0k0RW;7mUX*wQ_>6Mg(iOl3=GD#DaR6R|z#bP0XAfSbi
zG)+rR2@GA=iGPQ~p*GT3W>S*j8qjFS!m=!yO${V`cTsq%GXYER(qhlD95I{Cq9~%@
z{eFMI==XX(WkYQUkEFt200A0g;W!S9PP>zj<4A2qVTeVvmH2o#!okgEzIvr_&;95C
z4N7OK2x<q^$?bMK%do`T8=s`}`*}Y+_XnWz0_U@#U>T@k82S%rI^Y+J^Z!u*0000<
KMNUMnLSTX$7!ch6

diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_3.png b/src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_3.png
index 4766d0b5be6f49d5c52f4b8a0135348dc42e9514..818bdea14b90ee005a856f280098128dd1ffb24b 100644
GIT binary patch
delta 567
zcmV-70?7T31&9TZB#|)~3c>&Y4#EKyC`y2lQzw50Nkl<ZI8QZ_Kda(E6vYSjtGsWt
z#UdyY^bsVIKM;c<Jly5MlgA>9SXfv{iWFjz!Xj9tND(Yjh((GNlET75EK*o5Z-0}x
zXYRdB?woUHGIzudgm@%9isCpv)QI*GaSzBwk`jjDcDoh$rM%ohb*~=P<MFuNZg>28
zV_tt%6)WfS`Et3G=h6>+vDs`+r&C!&E?ngR6o4dW*K0}1%e5$S-}eO$54f&79=p!i
zaXt6#?WgN`bw<Lr?L5zq$K!gv7I;w<=kn~>_SZM@w3q+(L)v)kP%$rx`Ft)Gi$#`Y
zoQg8yk1#D0vn|VU9Md$32y}gzWyd5*7R!HySgw}rg+|wP1jM{x|C|!1;|b;0T%c??
z)9JgI&1Oi`L#k<-_$`RdwSqKFhuRQ<HqhXJ&)KJ#PNzvK1-*VBfjSr*_<(#!sj2HG
zf}uW?nIxGZn7mKIT}W?w{T_mTuTQU%B&K0WoD2qoznM(Rp6=txWFkDzqlJ(ZMR|Yu
z5HM6#W!~*}m7dZF$nXqkG-P2I2F*s(2)_S%n(aOf0ZS2r-Oey9F&d46AfVsvcDuu9
zw^}XfU8M_;q(r9!0UBgsSr#Ac(7Zt=fm{lF9}j3N^X+B}hcFts@<{%g_fZ2Hl-i{T
zY7MHBTdh`xW{B5Ueo5u}IUkYt1E?R;fc;sJ(B#lG^&e^E$`QjRvv&Xh002ovPDHLk
FV1mDD4$A-l

delta 572
zcmV-C0>k}?1&;-gBnkm@Qb$4nuFf3kks%uj!vFvd!vV){sAQ2wCw~A*L_t(IPc@Q1
zi|RlW#RvAQyzjIKiUeIkh~y8%U<iv3wva6>#KOWtQlt=z6c)iEMT%gNLM&3G2q{un
zh(!v^$G+dh_s-0{-nnzmoiTUB5ky!lEsm2UId_OpG5!R|#*z|6(cy3qSW`C-&_3E{
z`+Pp{_xl68-HF?_Wq+rts-|h`st&?H?DzZY^;&n38#g%s1t7`jcB?7b+{&^Df<R#K
zfaiI$ndi=2&-Xq*e|x^)Wh5NODT?B9x$Jg3ft6)h)s^cwKX2mS{Plmn%Q>65R4mGJ
zwOWbwdY$Jvx1tP6%eI(~ZM&{(Sr#6FVNCM;lBVf;vlg4}hJUlr7=}TBFG|iYC~>`9
zQU0t1$`@y`_!7(I5@~kMbY0If>0h4}u$<@<1iGff0pH7Su~;n9ObSNhF*Q_8JF|d%
z&Zub^7J`W}k(o4IBA9>8qhmyGM&nU(I*mtTdX=Vxahjx>rv1qUN!im=GM~?d@B6e6
zlA<W_F@~Y4Du3~CI8;W;OF)KaK%*fG(==%|8c6u=q3|ou1S}D}YO!aUwwO+*VHncy
ze!o9p^n1OYw4pMDM^a)ifB+4$ux*<~SGy}8MWNgZg8&O@EAe4}fP<S(J$a>I$NT62
z4N7NH1hoUz$!)h=Q#ZxO2Y*TB^K(Bu?*~xj1<q$fLK&As*VVt|v)x*0HjzO90000<
KMNUMnLSTYWUlF_j

diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_4.png b/src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_4.png
index 4e6c95b513caf4b6d9ec1b2b0f03204336ecbb2c..f9a6ab451dedaac6ea77301bbbe113ae425861ce 100644
GIT binary patch
delta 572
zcmV-C0>k~21&sxeB#|)~3c>&Y4#EKyC`y2lQzw55Nkl<ZI8QZ_zl-8P6vqedU)lfY
zieo{Mpi2mm{D2q?vUtbB%5umd78VwgB86C_um~0wDS|}`u}G03SfsEJi@;f2ad@9e
z_P+DpWAf(veKVOiVhch%k{(6-{r*rR+C{`2AR9?a7>1k8M&RYSyn*Ug-K+cke!X6A
z_~n1fys9czilQjX@?4z#z!&TF`gA&-YsiI*9Do9l<m_@eQ?k6|dFK1Rz~KSU^M*su
z9lGAgdwu=xjYf4w!f~7|%Z|t6YPAx0p6A86a2@CIMSR-RfBPnFICQC)<@szj6Z82z
zO;b)q8SzV4wuL#i?YgdISwsYe(NEK39LIn2#at|w3-&@|7zP4jma~6GiPQ0f@-Y)A
z8_s0%CZ^LV(&Uinx-NbSVsot^Ns_+aN1$su9Plyy5R=IyPNbmQ>mg7z?Z5}*Lqbi%
zun_c(zRbk&6v6my9BxB;)9rN;^twHI6~}uT7Vl$C)BdJ1DSNuxkH=#%8jWZnBt?Hw
zp56rvRaKdHIvu5}Gy*a_0~!rkn5Idy(KLduKct-=;`g6VL%>pmV7oO<TMPz+APDGp
ztJP{VTF=kV(mP5A9!ZII8v-=Q!nSQb*r9oYOai$S_&y%cR_2@a1`c5`@Z^#F74M@4
zG$^%85!4z~C%0TKP2ChPFZ`0q^>ZXXBJT%Kr2+f1Afd~l>*_zwm(C3l;`A5*0000<
KMNUMnLSTZW#uOd^

delta 576
zcmV-G0>Ax@1(OAkBnkm@Qb$4nuFf3kks%uj!vFvd!vV){sAQ2wCw~M<L_t(IPc@Q1
ztKvWu#RvAQ>~~rOMS?y;h~y8%U<eNvULmir5DN<nNs&S<Qdk6w6e)s53Q3V7g`}{s
z5R1TCykc>G6W^Yhd%1JxoI8`;5ql6}v9vf&lH}MTKE(I~AR9|c6h*t;PGFb%atF=5
zc{Gp5<955<vFnYvX@44a&gb*xa;eXC5C&qq-4;brw~!lGIRFJ9$>@5mDS5e8RT%_<
zz~BMT^ClC|ow%Owy}$qVe80^|IF3`6<>_?VY&HU`s_I;yUB`L;5a09X|M^SK$;72%
zSyhY0LM)fdJkPlmWl&nS#dK`jbzRG{@CXcJl;@{3O_!^sSbwcooQ1|P3<7*vaehgO
z;#8n~E(FRKXEyr~^Z6WUcFc5L&ob#>zZI|?=_3TXro#cB^G`9G&C*N?2E!pWR82dw
zfPBoTX&4rQkuj2)G@T=ueoUi%L~jPeL2@_@2Sa+5ri5{tq?)Gv%>_x>(?c?yPKEFL
zv=EY_DDggqp?|6>alhYJ2Fgo7hG#&dAq&$qX*L>2`1YYh#Z&zG`kn}0wb(OFTa3r!
zFbwH;x7+P8x}8o(T3_kIBPr4AL4XEX*tX50t=*Q7qEK#yL4bv{m3X(^!NHBkp1e}9
z;eE7#2BkGAg4%-W<ksu8shi^MjZaef{oD`F`vFvWfgSVNkkIAOb@d-Fw%magWk@*y
O0000<MNUMnLSTYxJQhj-

diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_5.png b/src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_5.png
index 4a54a9a957677ce9ccf1babd9ce9468df8dc98c6..9a8a900aa8e8bbff413c3569f9be4b278802cd31 100644
GIT binary patch
delta 569
zcmV-90>=H51&RfbB#|)~3c>&Y4#EKyC`y2lQzw52Nkl<ZI8QZ_v5VqB6vhYcU)lfZ
z5L_ha5<(;~purFp4;D_ALk_X9kV8_W5Q`KR!6HS9V39&nq(~ttQdo#ZU@fjVyx+v#
zZ{B-M-hAJi$-EIe5a6NoFpQ$;&>-B0#62JzN=gs}+wE51Rasp@eXVcx?RL9dE?4|~
zVP1dNH7lpnsj8~-RC>NAHk(bBWn}}oaFzp50Fs=Y&m|?Rb5Z1;=LsAha2#hmcI>h3
zxX$bA565+zjKpv_%=7$sJg(Pkffq$_Do^%sc>g9o?di+DOB;`ED&|EopU=f&u}IUD
zQ&C3z76WU54K2&I?ZIF`L|_>GG(E;~yjXuO#B#M{FEoZ>ARy)i`{$I%jv31PT%de#
zrqeeuo6V3WheX$P@k<aN*9wv(>Fa$2x~9Vc@3VI?olfIK3c9@>0#(xvd_X=V)HI9%
zg1*t0nK+&yn7mDbT|jTTy)J@Yw@0tyIHF;36l<FHFO^Bz(|t6VOoZ#Yv=EY_C{KSs
z1q@YHnRhxJrK>yyWOxQN8nQ4=lV+oV^ye<JFZ=lWX$V*f5$txRX^GKj<oiDTZnxXd
zjCQNllHO4|@JLELKSO{9Sy-0E2Rl68AQN9M`JRXSw3YdGvxP$#jU0I-Z_WE?01Zmx
zQUtXD)yb_^D^oYc%L~7xa{Zi-$onAyRC$2?S&-1>&~^1cXoJxAcv3p_00000NkvXX
Hu0mjfuv-cO

delta 576
zcmV-G0>Ax=1(OAkBnkm@Qb$4nuFf3kks%uj!vFvd!vV){sAQ2wCw~M<L_t(IPc@Ri
zi{d~O#|Q3Tx&P@96bZV75XldS!61tVTgVm`VqqbNq(~taDJ+6TiWFjzLQ<qi5mKbE
zkS&C@xZ?0Wlk9$H-s8=i@Au6lZ^QwFSR^fq;y6Axh>j8d2*^f~5{BV^zZY0t)gR#g
zaev$&kH_tH`@pU@;(z=7&Q4jDbzN6w<p;jl?RHs~RSo3ERSrM_NHV%!D@xYaqR4&U
z7Z^O?dER8=xf9o$datj)z3H^cNH~s@=lSJw*>1N2D~h75O4o6oKg8Gk`8|KhIhnXr
z%!^{VT#D6dm8L1Tq6|vQwwR7>yRK_l79N3NjMDUyB*|*M5`XK>nzPUthCzVO3(n6e
zkzF#B&!s@wa^~|lu~;mSp3Wy-*H0(u+usUUj`R@%UDM%!_r<%I&*#ZW3I@X=HB?PI
zvw(a)QPVIi1S4Z4GfA>QFngPYhmhV3hJ*Nc91e!`DoF^VBu+F<`<DumvZu#*Hk*m*
zbV>^$DT)#uB7YdFsuK76ePy7u0x~=U8Vy;Prb)BWK>G6(+4ubX`!x}?wRjz-X^ZiA
z90URV?smI9Mz_=HNb4(ocqAoyJqXYs3){9?a6<bA2?Dtl_&yfUR^t6`4+l3Md-6*D
zmiN&B8kEMQ2x<eWliO@Irf!Ot7d}bl_j5ly?*~w&1s&(JA)(8m>*{||%G-wG(LxCT
O0000<MNUMnLSTY^ZW4q5

diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_6.png b/src/main/resources/assets/refinedstorage/textures/blocks/disk_drive_6.png
index 69c4e0ebeee05ccc59daa4351c1f793e511d4187..9e63d02ef6cfe810b84661c3229ac327d9cd2740 100644
GIT binary patch
delta 568
zcmV-80>}N61&IZaB#|)~3c>&Y4#EKyC`y2lQzw51Nkl<ZI8QZ_Kda(E6vYSjtL%4L
z1Vys?2olL3&|nA;7hWNcMHaEJkVR6Y5DN>7V38t4ut*^(QltneEG)z#uohb^?r)O!
z&fI&M+&SmYWbTLq*yDlpAPB?oR3kVB#3LXZNXmY{-|cn+zm%6dsP5IHdORMt+wG2D
zZ_IzIs$!)mip%9v7NzHVV!Pd@X<F8h3s*S+1t7`U^;%N$a?SJ1^E`pW1CHZNCXPL^
z9oKn%{o%N7osk%gMp>4f&*#l%Bk(-Wi?Xmsqvsd#VP8M(o3zQqrec=oi^W1Lm&+tc
zI2C2YFJW3HHnJ?+woTI{BGC0=lANO`TCRVVVzpke7aCpH5fHPS{WD6W=M?30Ay77)
z+3Zcs=X0d-Db_Si{1n9IT0tDgLv4sa8)$IA`}|$ZX0s@kf?mJ>{VCMJ;KT>yQ%p@=
zHxUf=q0B_l9KrN$x<BmcO|RcW(C_u>RTPCZEDEE+VDK-IN!in5IGs*~>$<cMlA?bo
zzn=nzs;bPp-LBG88UY!e0gZ+%48x$=Xc|HKX@CBH7y_081c!rRSYkXL`@T=V+wFFT
z(QdU`(z{9*9!ZH#2Ld$6!m=zr*r9oYOnkZIdmir7R_43y4h~^FcI1(~4ez4{G$^%8
z5!4z~C%0a&4b2cQFZ`0q^>aQV?*|}Ir2+f1Afd^jY3hH$pVO7FSb$Xk0000<MNUMn
GLSTX(ClKra

delta 576
zcmV-G0>Ax<1(OAkBnkm@Qb$4nuFf3kks%uj!vFvd!vV){sAQ2wCw~M<L_t(IPc@Q1
ztKvWu#RvAQ>~~rOAClEakVyVO42JM<;T7@<3$d_}MN*^?ixd{YB1MW|kwQ|WNFgaw
zScpYnEw)(P-^BOM%)Q*XbIzSf?ub1Iu}E4J#c_OW5gj7@0g#O(B@DyeZYQw1s&AmV
zHTULzzhAG{8+N%8H-AmT&iQ<<>$*Bue&CDkcAMvU)k1Du<Ny?aB%{lvqGWw3%fk14
zfx!c=>rN)FGjUwceS7=mdS086ux-02iqq+|*=z(>mgTuRJGTA!CO+r)ulYmH$;6>z
zQI?CvLM)fdEX%kRWl)-y$+RuYaU9b$@d$K%lx3$RNtUanSbwcooP|c$bpm`*a(+RH
z{FI}7ECk9YXEu8m^Z6WUdQ3G<OH=8ezZI|?X(I&MP=f<L<{x4<n<c3f^aq2V51|f+
zM;4HeDK&N7L@?4vGLs~81k?9vxDV+~f6zxT=nv>slEgGDiId@Q_%D-5+0#Qjolb@4
zd9)CcqA0%~0)K|8s>HosPw6X90U4eFjfN}?!=Tw{o`U>q{`vbk5wH~@*zXO)665hW
z2m<=u?RH-n-A<<?t*7+hk(79OfdCD%uq=xOCp_OEK_IsR-^T*lO1#_d;NZq%S6<2A
z@IG2VgVLH5L2W^Ga_jZl&<yeV$|tG(e(s0o{Q#;w!5#T*NN93sn))9;#Mv`;Mf!CB
O0000<MNUMnLSTX%1{C!G

diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/solderer.png b/src/main/resources/assets/refinedstorage/textures/blocks/solderer.png
deleted file mode 100755
index db73a620689a10c2b8e9f017793e2809b7e9b472..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 648
zcmV;30(bq1P)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM00004XF*Lt006O%
z3;baP00009a7bBm000ic000ic0Tn1pfB*mh7<5HgbW?9;ba!ELWdLwtX>N2bZe?^J
zG%heMIczh2P5=M`21!IgR5(vXQh#fsKoH&U)W#^1M1ze#E`*3gL{@?r#2}(bNRWJ;
z(knemqSZ#k!1bHmTl2@gWrlI~y_u0&;sOqgGNW|6-R=fZkHUKZvXoIA$FXgj!163V
z0mZ2}7w7Z&cs!n9ha=*mC~%XeX`bg<nwgeKHk-|Uzt0A+ivv3V3V_6-!y!Y-{E#HE
zX_^EE9-wKOs%i^$q3N1o{L*xN$S^31631~AMeFsNz>*|Mvvi>-_xrt0(!TGjI3D8o
z=kL#VmZ|Cj72_n)b)6W75r!eALYX>Ax~{wKqrU4NG4p*V%TgFdzV91LgDh7|^nyl~
zWiT#b*xy+P#AURH@)||+`TW6AlsUnOkOsS8Hk*A0!R>bY-0lARfce>U1`hC|z7R~}
z2TUM}V%xSKzCW;;@*0M1%X&((1VZ5ZDg@G8a$E<yf#AdQzN)Wx&ug0c-J?z2{PBHc
zaK(1&Z6!$})9Dl|#6kr@sLBeAx~|_`_j0+sQMYLt^qfp4cm`NB$b{#4EE^gKULB__
z%U9O{`!}UkRY8dit|$bq%ku(3JIk`LZ;s=}INWG7V#W(Rct|pg#~^?PGC>v}=<s-h
z2rPDGnI_D_S`phD8yq-MoUoD1HQvVn&_EfCi9j8I>d38DE1u)Y)6+A6wwMnd{|BJT
i18k~C#IeJ1&;J03%`Y07DoDNn0000<MNUMnLSTaKG9h;W

diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/solderer_working.png b/src/main/resources/assets/refinedstorage/textures/blocks/solderer_working.png
deleted file mode 100755
index f088b9cc2d175cf0a4accedba5eaa257819c5de6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 653
zcmV;80&@L{P)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM00004XF*Lt006O%
z3;baP00009a7bBm000ic000ic0Tn1pfB*mh7<5HgbW?9;ba!ELWdLwtX>N2bZe?^J
zG%heMIczh2P5=M`3rR#lR5(vXQtfJ^P!PTE)W#?wQG<;i4Iv^4B8rGX3?hn1g5+IF
z8)!?rOS7>`L=0@-Y|k}6_FQHd=bke&GM89@3A3r$w(Gi^9=2n{I{>marI@C<Uatu(
zOS3&t?2AKjI2?An-5!?j5En&(n<PoHEK8GAH*~UEt+v~3+Jj!?^Z+OT5{>daMae9W
z<4D(a0s{|F6h)SmnLJZeMbjP?RqZnrk|ae@6o%n)xg@YSj*~Q*Nz(OtjlYtv>!ROL
zA4flbf6_mxEYDCeiept(iKb~m5MU~liNE5uZNpz-*S5Eq`mPm4AqYax^R&4}=8HLc
zK_iMH7{N!-U1<lz+s`eO;b%CVPH!AZni7l%slV}gp7-DU%jL3p-~9J))bkS_9N<BI
zAehASsbDl3HBIBbdSLkPR2hB*O+$MMq5y*Lc`^jTR4^?QyMe$xI^X5Db9Cyua*lRg
z)!wUz46f)-9aj(pGMP-ULM)Wyxbj?rQB{@oY@JRg>&2?;8a>D3F`fYy4KiU_7R!bP
z0`ti{pU>vA3AX)Wmt_ehGPtrKuq>A42-+EjfqgR!GsIyAg8?;`W5Gj`VmJf=G>{3h
z_&|r-8$@8xD?`^|2G)vry;_3<HyVxUNcs}*qX%f9^hQOX_CR&y7K;VTu;lLU9za{n
n2ao>)P~`?X)h%M^VVL`WRA4SvdQ84z00000NkvXXu0mjfoE;EV