From 41bdbad10d422829de27733279ea66fc7db5df28 Mon Sep 17 00:00:00 2001
From: Raoul Van den Berge <raoulvdberge@gmail.com>
Date: Wed, 21 Sep 2016 17:42:27 +0200
Subject: [PATCH] Add disk manipulator texture

---
 .../block/BlockDiskManipulator.java           |   5 +++
 .../blockstates/disk_manipulator.json         |  35 ++++++------------
 .../textures/blocks/disk_manipulator.png      | Bin 605 -> 801 bytes
 3 files changed, 16 insertions(+), 24 deletions(-)
 mode change 100644 => 100755 src/main/resources/assets/refinedstorage/textures/blocks/disk_manipulator.png

diff --git a/src/main/java/refinedstorage/block/BlockDiskManipulator.java b/src/main/java/refinedstorage/block/BlockDiskManipulator.java
index 86997191d..e8f1d5933 100755
--- a/src/main/java/refinedstorage/block/BlockDiskManipulator.java
+++ b/src/main/java/refinedstorage/block/BlockDiskManipulator.java
@@ -39,4 +39,9 @@ public class BlockDiskManipulator extends BlockNode {
 
         super.breakBlock(world, pos, state);
     }
+
+    @Override
+    public EnumPlacementType getPlacementType() {
+        return null;
+    }
 }
diff --git a/src/main/resources/assets/refinedstorage/blockstates/disk_manipulator.json b/src/main/resources/assets/refinedstorage/blockstates/disk_manipulator.json
index 2cc8c51b1..692c33f7b 100755
--- a/src/main/resources/assets/refinedstorage/blockstates/disk_manipulator.json
+++ b/src/main/resources/assets/refinedstorage/blockstates/disk_manipulator.json
@@ -1,38 +1,25 @@
 {
   "forge_marker": 1,
   "defaults": {
-    "model": "orientable",
+    "model": "cube",
     "textures": {
-      "side": "refinedstorage:blocks/side",
-      "top": "refinedstorage:blocks/side",
-      "front": "refinedstorage:blocks/disk_manipulator"
+      "particle": "refinedstorage:blocks/disk_manipulator",
+      "down": "refinedstorage:blocks/side",
+      "up": "refinedstorage:blocks/side",
+      "north": "refinedstorage:blocks/disk_manipulator",
+      "east": "refinedstorage:blocks/disk_manipulator",
+      "south": "refinedstorage:blocks/disk_manipulator",
+      "west": "refinedstorage:blocks/disk_manipulator"
     }
   },
   "variants": {
     "inventory": [
       {
-        "y": 0
+        "transform": "forge:default-block"
       }
     ],
-    "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/disk_manipulator.png b/src/main/resources/assets/refinedstorage/textures/blocks/disk_manipulator.png
old mode 100644
new mode 100755
index a4016ce34ffdcb3d44988c199e6ff1ede9821bcf..b8601345b1ecf71bf28f05749ee8249556f03f67
GIT binary patch
delta 725
zcmV;`0xJF81fd3yJPN@801m+cxRGn^kwzeYFs%v-zyJUOo=HSOR5(u^lG{((a1_UX
z+53`Z$zJy2%k~1LS4vBvr4_k}LMuZkq*H1EqpagHq9Sh0Y|$mljLAR^mr;>yMi>9Z
z9hZFCoZq>Af9*lZWF{6#$KzTep{=fFHLb9|zLCvtq|$kKtE!${&LopsETP3>>1Z^6
zg;rMHd}w|?I5_EaPe1m)_j*4L4^O*?r+e)$-R`$e=VX8XYrWoWwLUfKN8v~kLF1jB
zcB63wKp-SX<xotPV~dN+p->czcKf)|I%>6!ZF?^qP9jB#@9ypg0ty(i9EXC*uRpWd
z!_>K-PHz<@A<NNVaEar@QmH0M5fq7kth8D^$eTHL*Vp$qHxG_;2h3)Fr_<l_n+I?@
z&aEge)$EQah7ruIR-1w#D+<U+K;>vWpN!|wel(hcM^>Ve6y|x^G;3053BhAo?@jX^
z0EW*O6aq5T^L*$LPTbnE0n@ZgrCqPrk6=or(yVSbVNSVR2P%~Y0ET7RWeYriwq-&=
z4e$p-NDvg$s##^*c)QK>l9vr|KGDYo0Y5MOpCgs4bx5$xS^x?d)}PI7<nty$vb;|e
z24jliBA4U%V93z^%*B{x0|f4czgg5P5JGS^jBQZKFv6=V$2FP57o;yI++a*Ie0VgA
z4IPkPELL@WlVNy7lD=GSQ`b#@it;_{4_^#MB*iZDhp#UuG|l6K5i=M;$bf>Ph2vgC
z5MEfAwY4IKQRw{Q$$1~c=%?p{=RdCqf_-_`UpVW#F-leQ>2%KHp%KU`6fDE2G7QHs
ze&|Y2EOhaBydI2pyGclbJHR5sRY{V2l%%NzSkgx_1x?jeO;^=ICSw3Vpccqx4e+N@
zIcR}gF4E;9K##}6U>FGl0qBb33;?4r9Q+jKqFfl^cH{p5)m#JC`rC6T00000NkvXX
Hu0mjfZa!4>

delta 527
zcmV+q0`UEz2HgaZJPN-601m$aI0aKAkwzeYGD8Gw>;M1(+DSw~R5(wKQfq74U>JRW
zPwp{S4JzWiEmjk<)Fnl%5@axOuI*^6agA6_=Cr@a8}pCtw9v7SKAb!}oV?FD=Y^M;
zrc)_3t5v&Jvo9`O+x9OnJFeSlG(V$TmS=u+Ow+E^>`J9sE;mTM{^{;!_V^f&!{ldw
zw2q>e$s`FU$^DP#F#I(h#}5yS(I~vVefmC{7E309a1eac^&FsS+5e%chNfaLRK-w~
z%y4*LESjWHsP_9es%9*g%gtt!B+2jhdU-35>-8E3y4^u8S0bfSy%!94UYX5i$K!E6
zpC1l~)9JL|@6o|*x7#R+I8GW2$JuOuk>vAbx79hvq1PMa@*fDkGab6!ud<vba5>*0
zZRANNQ-H%c3qfySU_nySa5yK@mDd+VjVOxIZht|K;~4VLgZ5&vz$QFbs})H65=Gtf
zt|dt)f}plq*Mgwn#BR4khc<>kZ-p5JGKGb!fa7Gs^D-U`!-!!RPN&m<9WfAka`Ij@
z%{QAZmQ4}F^8Fx{(j`fgq%;OzRG`ALGRvfBTEHQmlW_-JRS>k-NVetUk-oz5ZOgN4
z&$4{SX#+?LxNaMKqtSu{p(uf(ctm1ZiD3j70#Jn{04s(AFEW%!F+5Fke*x?OG_#dC
R{Ja1F002ovPDHLkV1jd&_{snP