From 3e6d8ca02a5ba87beea513a2663960710f82c107 Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Sun, 10 Jul 2016 22:28:33 +0200 Subject: [PATCH] Fix models. 0.8.9 done --- CHANGELOG.md | 5 +- .../blockstates/constructor.json | 4 +- .../blockstates/destructor.json | 4 +- .../models/block/constructor_destructor.json | 26 +++++----- .../block/constructor_destructor_down.json | 48 +++++++++--------- .../block/constructor_destructor_east.json | 26 +++++----- .../block/constructor_destructor_north.json | 26 +++++----- .../block/constructor_destructor_south.json | 26 +++++----- .../block/constructor_destructor_up.json | 24 ++++----- .../block/constructor_destructor_west.json | 28 +++++----- .../textures/blocks/constructor.png | Bin 752 -> 811 bytes .../textures/blocks/destructor.png | Bin 757 -> 712 bytes .../importer_exporter_external_storage.png | Bin 512 -> 202 bytes 13 files changed, 111 insertions(+), 106 deletions(-) mode change 100644 => 100755 src/main/resources/assets/refinedstorage/textures/blocks/importer_exporter_external_storage.png diff --git a/CHANGELOG.md b/CHANGELOG.md index 5d20981ae..432e3bd56 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,14 +2,15 @@ ### 0.8.9 **Bugfixes** -- Fixed bug where Grid doesn't handle remainder sometimes +- Fixed bug where Grid crafting doesn't handle remainder sometimes - Fixed caching issues with External Storage +- Fixed possible crash with Disk Drives **Features** - Added a model for the Constructor - Added a model for the Destructor - Wireless Transmitters next to each other without any cable or without being connected to a machine won't work anymore, they need to be explictly connected to a cable or other machine -- Several models / texture tweaks +- Some models / texture tweaks ### 0.8.8 **Bugfixes** diff --git a/src/main/resources/assets/refinedstorage/blockstates/constructor.json b/src/main/resources/assets/refinedstorage/blockstates/constructor.json index ccfce356d..147bb6734 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/constructor.json +++ b/src/main/resources/assets/refinedstorage/blockstates/constructor.json @@ -3,7 +3,9 @@ "defaults": { "textures": { "all": "refinedstorage:blocks/cable", - "particle": "refinedstorage:blocks/cable" + "particle": "refinedstorage:blocks/cable", + "front": "refinedstorage:blocks/constructor", + "line": "refinedstorage:blocks/importer_exporter_external_storage" }, "model": "refinedstorage:cable_core", "uvlock": true diff --git a/src/main/resources/assets/refinedstorage/blockstates/destructor.json b/src/main/resources/assets/refinedstorage/blockstates/destructor.json index ccfce356d..b8f2b82f7 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/destructor.json +++ b/src/main/resources/assets/refinedstorage/blockstates/destructor.json @@ -3,7 +3,9 @@ "defaults": { "textures": { "all": "refinedstorage:blocks/cable", - "particle": "refinedstorage:blocks/cable" + "particle": "refinedstorage:blocks/cable", + "front": "refinedstorage:blocks/destructor", + "line": "refinedstorage:blocks/importer_exporter_external_storage" }, "model": "refinedstorage:cable_core", "uvlock": true diff --git a/src/main/resources/assets/refinedstorage/models/block/constructor_destructor.json b/src/main/resources/assets/refinedstorage/models/block/constructor_destructor.json index c41a535fc..ebf21ce0b 100755 --- a/src/main/resources/assets/refinedstorage/models/block/constructor_destructor.json +++ b/src/main/resources/assets/refinedstorage/models/block/constructor_destructor.json @@ -84,12 +84,12 @@ ], "faces": { "north": { - "texture": "#line", + "texture": "#front", "uv": [ 0.0, 0.0, - 10.0, - 10.0 + 16.0, + 16.0 ] }, "east": { @@ -97,8 +97,8 @@ "uv": [ 0.0, 0.0, - 2.0, - 10.0 + 16.0, + 16.0 ] }, "south": { @@ -106,8 +106,8 @@ "uv": [ 0.0, 0.0, - 10.0, - 10.0 + 16.0, + 16.0 ] }, "west": { @@ -115,8 +115,8 @@ "uv": [ 0.0, 0.0, - 2.0, - 10.0 + 16.0, + 16.0 ] }, "up": { @@ -124,8 +124,8 @@ "uv": [ 0.0, 0.0, - 10.0, - 2.0 + 16.0, + 16.0 ] }, "down": { @@ -133,8 +133,8 @@ "uv": [ 0.0, 0.0, - 10.0, - 2.0 + 16.0, + 16.0 ] } } diff --git a/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_down.json b/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_down.json index 41daa4c43..9f035e4b6 100755 --- a/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_down.json +++ b/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_down.json @@ -17,7 +17,7 @@ ], "faces": { "north": { - "texture": "#ine", + "texture": "#line", "uv": [ 0.0, 0.0, @@ -26,7 +26,7 @@ ] }, "east": { - "texture": "#ine", + "texture": "#line", "uv": [ 0.0, 0.0, @@ -35,7 +35,7 @@ ] }, "south": { - "texture": "#ine", + "texture": "#line", "uv": [ 0.0, 0.0, @@ -44,7 +44,7 @@ ] }, "west": { - "texture": "#ine", + "texture": "#line", "uv": [ 0.0, 0.0, @@ -53,7 +53,7 @@ ] }, "up": { - "texture": "#ine", + "texture": "#line", "uv": [ 0.0, 0.0, @@ -62,7 +62,7 @@ ] }, "down": { - "texture": "#ine", + "texture": "#line", "uv": [ 0.0, 0.0, @@ -86,57 +86,57 @@ ], "faces": { "north": { - "texture": "#ine", + "texture": "#line", "uv": [ 0.0, 0.0, - 10.0, - 10.0 + 16.0, + 16.0 ] }, "east": { - "texture": "#ine", + "texture": "#line", "uv": [ 0.0, 0.0, - 2.0, - 10.0 + 16.0, + 16.0 ] }, "south": { - "texture": "#ine", + "texture": "#line", "uv": [ 0.0, 0.0, - 10.0, - 10.0 + 16.0, + 16.0 ] }, "west": { - "texture": "#ine", + "texture": "#line", "uv": [ 0.0, 0.0, - 2.0, - 10.0 + 16.0, + 16.0 ] }, "up": { - "texture": "#ine", + "texture": "#line", "uv": [ 0.0, 0.0, - 10.0, - 2.0 + 16.0, + 16.0 ] }, "down": { - "texture": "#ine", + "texture": "#front", "uv": [ 0.0, 0.0, - 10.0, - 2.0 + 16.0, + 16.0 ] } } diff --git a/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_east.json b/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_east.json index c4cdcbdf6..40b6af3cd 100755 --- a/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_east.json +++ b/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_east.json @@ -90,17 +90,17 @@ "uv": [ 0.0, 0.0, - 10.0, - 10.0 + 16.0, + 16.0 ] }, "east": { - "texture": "#line", + "texture": "#front", "uv": [ 0.0, 0.0, - 2.0, - 10.0 + 16.0, + 16.0 ] }, "south": { @@ -108,8 +108,8 @@ "uv": [ 0.0, 0.0, - 10.0, - 10.0 + 16.0, + 16.0 ] }, "west": { @@ -117,8 +117,8 @@ "uv": [ 0.0, 0.0, - 2.0, - 10.0 + 16.0, + 16.0 ] }, "up": { @@ -126,8 +126,8 @@ "uv": [ 0.0, 0.0, - 10.0, - 2.0 + 16.0, + 16.0 ] }, "down": { @@ -135,8 +135,8 @@ "uv": [ 0.0, 0.0, - 10.0, - 2.0 + 16.0, + 16.0 ] } } diff --git a/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_north.json b/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_north.json index a2a496038..6d505f45e 100755 --- a/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_north.json +++ b/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_north.json @@ -86,12 +86,12 @@ ], "faces": { "north": { - "texture": "#line", + "texture": "#front", "uv": [ 0.0, 0.0, - 10.0, - 10.0 + 16.0, + 16.0 ] }, "east": { @@ -99,8 +99,8 @@ "uv": [ 0.0, 0.0, - 2.0, - 10.0 + 16.0, + 16.0 ] }, "south": { @@ -108,8 +108,8 @@ "uv": [ 0.0, 0.0, - 10.0, - 10.0 + 16.0, + 16.0 ] }, "west": { @@ -117,8 +117,8 @@ "uv": [ 0.0, 0.0, - 2.0, - 10.0 + 16.0, + 16.0 ] }, "up": { @@ -126,8 +126,8 @@ "uv": [ 0.0, 0.0, - 10.0, - 2.0 + 16.0, + 16.0 ] }, "down": { @@ -135,8 +135,8 @@ "uv": [ 0.0, 0.0, - 10.0, - 2.0 + 16.0, + 16.0 ] } } diff --git a/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_south.json b/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_south.json index 50a8aecc0..3f803eb7f 100755 --- a/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_south.json +++ b/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_south.json @@ -90,8 +90,8 @@ "uv": [ 0.0, 0.0, - 10.0, - 10.0 + 16.0, + 16.0 ] }, "east": { @@ -99,17 +99,17 @@ "uv": [ 0.0, 0.0, - 2.0, - 10.0 + 16.0, + 16.0 ] }, "south": { - "texture": "#line", + "texture": "#front", "uv": [ 0.0, 0.0, - 10.0, - 10.0 + 16.0, + 16.0 ] }, "west": { @@ -117,8 +117,8 @@ "uv": [ 0.0, 0.0, - 2.0, - 10.0 + 16.0, + 16.0 ] }, "up": { @@ -126,8 +126,8 @@ "uv": [ 0.0, 0.0, - 10.0, - 2.0 + 16.0, + 16.0 ] }, "down": { @@ -135,8 +135,8 @@ "uv": [ 0.0, 0.0, - 10.0, - 2.0 + 16.0, + 16.0 ] } } diff --git a/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_up.json b/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_up.json index d29ae0f4b..0fcd3795d 100755 --- a/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_up.json +++ b/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_up.json @@ -90,8 +90,8 @@ "uv": [ 0.0, 0.0, - 10.0, - 10.0 + 16.0, + 16.0 ] }, "east": { @@ -99,8 +99,8 @@ "uv": [ 0.0, 0.0, - 2.0, - 10.0 + 16.0, + 16.0 ] }, "south": { @@ -108,8 +108,8 @@ "uv": [ 0.0, 0.0, - 10.0, - 10.0 + 16.0, + 16.0 ] }, "west": { @@ -117,17 +117,17 @@ "uv": [ 0.0, 0.0, - 2.0, + 16.0, 10.0 ] }, "up": { - "texture": "#line", + "texture": "#front", "uv": [ 0.0, 0.0, - 10.0, - 2.0 + 16.0, + 16.0 ] }, "down": { @@ -135,8 +135,8 @@ "uv": [ 0.0, 0.0, - 10.0, - 2.0 + 16.0, + 16.0 ] } } diff --git a/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_west.json b/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_west.json index b9aefd922..7efd3ab7b 100755 --- a/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_west.json +++ b/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_west.json @@ -80,7 +80,7 @@ 0.0 ], "to": [ - 2.0, + 0.0, 16.0, 16.0 ], @@ -90,8 +90,8 @@ "uv": [ 0.0, 0.0, - 10.0, - 10.0 + 16.0, + 16.0 ] }, "east": { @@ -99,8 +99,8 @@ "uv": [ 0.0, 0.0, - 2.0, - 10.0 + 16.0, + 16.0 ] }, "south": { @@ -108,17 +108,17 @@ "uv": [ 0.0, 0.0, - 10.0, - 10.0 + 16.0, + 16.0 ] }, "west": { - "texture": "#line", + "texture": "#front", "uv": [ 0.0, 0.0, - 2.0, - 10.0 + 16.0, + 16.0 ] }, "up": { @@ -126,8 +126,8 @@ "uv": [ 0.0, 0.0, - 10.0, - 2.0 + 16.0, + 16.0 ] }, "down": { @@ -135,8 +135,8 @@ "uv": [ 0.0, 0.0, - 10.0, - 2.0 + 16.0, + 16.0 ] } } diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/constructor.png b/src/main/resources/assets/refinedstorage/textures/blocks/constructor.png index 1f97a561758ff37c00b2596ac74e1818f251e991..44719621a7f73d985cfd81029cd5e49543bb30a3 100755 GIT binary patch delta 740 zcmV!XP&8NWr9y-sly^P$SU31}E%fMU)`l6#Rd}U^q%Qa+YXHTDc zFr&{rZQ4<$jy7}6MX1d^*eEkwx;OYl;}V5`=}X(&6{J!*083{X*>fKftVLwZJ$>FW zpM3Sff)MDVK3dA7BhAdMtuj(7?J9S+I&rkAt3PyM#wtJ3 znSr=ndXK=8Mus@lg`p-SIzQ0li6z~c;;kW!bUsnofx-@DW+2mjp;%l;AVnTq@|`Jv z-J0S^2a!0|g|W_$RBotnLzPQpwhw9%u)bMBHa2#IL<1?)lcie&{NTus6mF!5&}6J} zV}%{dOd>LUVG{-ltLsF-ks%MDW08skGUn-Po`_hgD-to+4rtt?aF1*UY(Bq+tgdb{ z*D`z@d!ukYSpdtCO2I(Pkv)zbN>pEeBzt@-Vw(Y3D7-^*xwk~Xk|77iM97jcN5o7! zWXLWDXh#g7716+WNM|xdB%3Yb7Ku9)?)+y0b4bh~ngP`e=qs~zX*Mq{VEmhbrPC`2 z)FLA&EkJL&CsJLZ6*5hq##{=s2^eTNZLC8y+;+oj=W=VWm2jKHUO`}RYqc9ocIyh* zAwUXm#XV5JCVbT!X>9*Z9o6|GTg6`?@+5{ifvL@cdR6p?7HZQXV^ZQ^Eo3B9CE`eV}{%_e&%JJ#$b z4<~cZnR#cJIS9+PC{mzl>G)VWIZ-94b9!p2s>KU!SVd81nHI}R)UiZSLbJ&u9H-2t zU#_ozpO&lVyY=_=`iJBAtDEO}{I%b|S}va!i*J+3DvIvI$!(ov5fB~@<1oAhwiofe z*}aJ4hsENl+Z})bgwbsjJp{qLUT2Y7jUJ5_qtV>=VO?B~;#19j{qqX6+r6u+YmgfZ zLf0MldVZxsA|%O0(K?!~r;}9}-hq;?_x}ZdSaJ05nRyAx{a{%x*O6+q>3LI-@%?!a zEH8&MMd|JWz<`sXAA8=!^JegGm1+ZlPZZlcuK_zlQO#npS}0UxsVj+XLD<6cZRlY( zTSOqs`T5klm_EKgZr(R99~*)w@5tv%yHo(k1I1DmIXI{}uI~boF_^^u~313 zcu)Z?aBv;J1Oa%i*dRHWNR#3jT7n4zI8I<#j$;&PI@RRK2G?kCG$mmef#h-})4b^S z1IrpYmJbbp>Aw7a*?epmPKIvUj&IvT!|-(7#_cT7)^*1)+}%pieDoHL-^L6h z!*+)W0fw7OWs!6`3zD*IeA1O=y;fs?ZhqZ(KgUofTy2pIXrLfy$>cr)Wpz5PX?ka8 z=aw~u@|rZSX+1@;j}95|ZnaEJwc#PEnw7~A+ma-)1CMk|t0Rf};UOi89q>CkVxU?; zRZTdD5hc-mB$3D@5@{60l1UszGmsE~)TtB>K*4AV&M`EBCD8QVUg|GseHdjB;Ehn= P00000NkvXXu0mjfL5@C} diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/destructor.png b/src/main/resources/assets/refinedstorage/textures/blocks/destructor.png index 8595ea11ea6e9f47564546875cba3263eccc296f..21033289f8c27d70fcf35a7f722679c606eca46e 100755 GIT binary patch delta 640 zcmV-`0)PGW1;_=EJPyAA01m$aI0aKA0000PkxCnXF)*zP3cvsW0!2wgK~y+TJ&ESt(Wucx zqegRmCX<*vb93&Q_q^|!5vp43^920RCG_hU974> zUtZ9E=L>kfg(5%yjyyY)S64Ebl&O@)^|glHyu6g>=Q19b2M011b9+>QvE15{iG&7S zbf>2p7Z>vIP@bH~<72tMuf2*y+-_Cm=K8e(*x8ZMs0@eY_O?7alDoTF5sm&{U;i{W z_i=Xi_4s&Bjz@Sr`I;ZbcmO$jdzzY>0Ycb+2QTVyI6K=dTrMvjnlbjV*q@CJkeiz* zey*izWe+sVmS zV`Fx^Ly+=gWd#K%3Sb_vM8`bfjT#(Im&nS>#TZ>`bd(wVxB{7s>C13sm;omPwhYIA zqt4EYo*uXw70w??&G#Lo9(8sSZy=U_XB;P&w1M3ZZg@0*=)je!%{LfB9 z1K@{ZqpE7HvQj@ER8$y^>4LSeBox?ZjnBY7(b^hsYQhNVc6~iH7Q4;O7E7kK5-r~8 zIpLa`NNsJXx|$~FpNpD=#qx5ak}eDei@{)46syr_QxpqSV9Ox@0000$?$xuGbAAhxkel2+%M^}5WS$}B5Z zs{-+Vd}}d(cXRW&-aOrHKW?|51_NjF_G#(A9}chA>&MmV!*sgwy!+Yowp6JTgvVol zHoFD85B|O0yY&5s)#|a=8({-x-mT|7xbCu4s#CF8n@m=d$Cd z?#WVH6n6+h8$FE2GX$55i@AL{|4sDkg;XlHCz;IdBR`2C4>H*T9UT=1mSc_F??lLd z`GJIFE}6=LOgfLqUI+)Qfs;i-ERiW!cub_q3S3Rb1VJp8ibfMW*Fw|Ts!%EO>Z)SmA}Xp8iKKQV$x;WGbVsuzOWN@#wse*gdg diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/importer_exporter_external_storage.png b/src/main/resources/assets/refinedstorage/textures/blocks/importer_exporter_external_storage.png old mode 100644 new mode 100755 index 5783d502ffc4f3be6fc98de065c4e1bb4c566c32..a0c07decf80ecf7c65b9f0c2b8ed51c95c416f1e GIT binary patch delta 116 zcmV-)0E_>C1j+%BBnkm@Qb$4nuFf3kks%uj!vFvd!vV){sAQ2wCQ$%8Nkl28@JQA&Y4#EKyC`y2lQzm}_en~_@R5(vfQVEiTAQ1Bh-j26` zAcx|NHUIzHra^bNDn*6vPSTVn!!UQ<*!L4Kj>|N$Wf8zQ62W!o=V6$-e!>_)0%zaH zaUK5h=l49n;QqLF_woJ$-}jF(-rCa|-*!U+<85=+qU5RJPUxL`@B4)z5Fm8l#_Vl7 zB(Hy0ul4?mO*@>S4gI0@0Xr$JlxAIZ({xGK4HV}n@o@@K_Jk$ULh^x%Hb>L62}DX+ z*uWSK5aOGQoKEeOGD^9SK!P^L0g+$=qi`WegJP&tt0*cG+&x8$0{{7qFb!07lhpNV zmE_HZ!d%RW*hooHQbn1rAt=fUABeFP;9P%krf>?O7?Xl;;HWPPAkfP5Dk;kvRTv1N zSE1uFq~sEr;9;3tNpHyW5(dFu-Y0+3qU?rZTxMATL4hA;n)rj8FJZ}WjTMGJEea~E z3j^#e#NX2Myv|{6o_Tx&KyScGj}4pVhlIIj6!@2rra6#hK!Fn;K;Q%{9P1gzvOE_} ZvmY6>WKk~F{M!Hk002ovPDHLkV1j!R%N+m!