From c70915ffb045c8ece1bc5746220b7dd412692188 Mon Sep 17 00:00:00 2001 From: dpeter99 Date: Fri, 19 Aug 2016 13:54:25 +0200 Subject: [PATCH] Energy cell updates - Added dense texture: fixes #65 - Removes unused cell modell (without a number) --- .../block/EnergyCell/dense_energy_cell0.json | 2 +- .../block/EnergyCell/dense_energy_cell1.json | 2 +- .../block/EnergyCell/dense_energy_cell2.json | 2 +- .../block/EnergyCell/dense_energy_cell3.json | 2 +- .../block/EnergyCell/dense_energy_cell4.json | 2 +- .../block/EnergyCell/dense_energy_cell5.json | 2 +- .../block/EnergyCell/dense_energy_cell6.json | 2 +- .../block/EnergyCell/dense_energy_cell7.json | 2 +- .../models/block/EnergyCell/energy_cell.json | 6 ------ .../textures/blocks/dense_energy_cell.png | Bin 0 -> 405 bytes .../textures/blocks/dense_energy_cell0.png | Bin 0 -> 402 bytes .../textures/blocks/dense_energy_cell1.png | Bin 0 -> 401 bytes .../textures/blocks/dense_energy_cell2.png | Bin 0 -> 403 bytes .../textures/blocks/dense_energy_cell3.png | Bin 0 -> 405 bytes .../textures/blocks/dense_energy_cell4.png | Bin 0 -> 403 bytes .../textures/blocks/dense_energy_cell5.png | Bin 0 -> 404 bytes .../textures/blocks/dense_energy_cell6.png | Bin 0 -> 405 bytes .../textures/blocks/dense_energy_cell7.png | Bin 0 -> 404 bytes 18 files changed, 8 insertions(+), 14 deletions(-) delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/energy_cell.json create mode 100644 src/main/resources/assets/appliedenergistics2/textures/blocks/dense_energy_cell.png create mode 100644 src/main/resources/assets/appliedenergistics2/textures/blocks/dense_energy_cell0.png create mode 100644 src/main/resources/assets/appliedenergistics2/textures/blocks/dense_energy_cell1.png create mode 100644 src/main/resources/assets/appliedenergistics2/textures/blocks/dense_energy_cell2.png create mode 100644 src/main/resources/assets/appliedenergistics2/textures/blocks/dense_energy_cell3.png create mode 100644 src/main/resources/assets/appliedenergistics2/textures/blocks/dense_energy_cell4.png create mode 100644 src/main/resources/assets/appliedenergistics2/textures/blocks/dense_energy_cell5.png create mode 100644 src/main/resources/assets/appliedenergistics2/textures/blocks/dense_energy_cell6.png create mode 100644 src/main/resources/assets/appliedenergistics2/textures/blocks/dense_energy_cell7.png diff --git a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/dense_energy_cell0.json b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/dense_energy_cell0.json index e7a5effbf..77ca47b38 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/dense_energy_cell0.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/dense_energy_cell0.json @@ -1,6 +1,6 @@ { "parent": "block/cube_all", "textures": { - "all": "appliedenergistics2:blocks/energy_cell0" + "all": "appliedenergistics2:blocks/dense_energy_cell0" } } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/dense_energy_cell1.json b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/dense_energy_cell1.json index 756b748e6..6b9d342e1 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/dense_energy_cell1.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/dense_energy_cell1.json @@ -1,6 +1,6 @@ { "parent": "block/cube_all", "textures": { - "all": "appliedenergistics2:blocks/energy_cell1" + "all": "appliedenergistics2:blocks/dense_energy_cell1" } } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/dense_energy_cell2.json b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/dense_energy_cell2.json index dde6c0917..0052b96e5 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/dense_energy_cell2.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/dense_energy_cell2.json @@ -1,6 +1,6 @@ { "parent": "block/cube_all", "textures": { - "all": "appliedenergistics2:blocks/energy_cell2" + "all": "appliedenergistics2:blocks/dense_energy_cell2" } } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/dense_energy_cell3.json b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/dense_energy_cell3.json index 4376a6897..e9d94041a 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/dense_energy_cell3.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/dense_energy_cell3.json @@ -1,6 +1,6 @@ { "parent": "block/cube_all", "textures": { - "all": "appliedenergistics2:blocks/energy_cell3" + "all": "appliedenergistics2:blocks/dense_energy_cell3" } } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/dense_energy_cell4.json b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/dense_energy_cell4.json index 7ec91a16d..d6381bb05 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/dense_energy_cell4.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/dense_energy_cell4.json @@ -1,6 +1,6 @@ { "parent": "block/cube_all", "textures": { - "all": "appliedenergistics2:blocks/energy_cell4" + "all": "appliedenergistics2:blocks/dense_energy_cell4" } } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/dense_energy_cell5.json b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/dense_energy_cell5.json index 2e56ec392..df7b14b00 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/dense_energy_cell5.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/dense_energy_cell5.json @@ -1,6 +1,6 @@ { "parent": "block/cube_all", "textures": { - "all": "appliedenergistics2:blocks/energy_cell5" + "all": "appliedenergistics2:blocks/dense_energy_cell5" } } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/dense_energy_cell6.json b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/dense_energy_cell6.json index be6a2e349..08329cf74 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/dense_energy_cell6.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/dense_energy_cell6.json @@ -1,6 +1,6 @@ { "parent": "block/cube_all", "textures": { - "all": "appliedenergistics2:blocks/energy_cell6" + "all": "appliedenergistics2:blocks/dense_energy_cell6" } } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/dense_energy_cell7.json b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/dense_energy_cell7.json index d92a8d2ec..511f15159 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/dense_energy_cell7.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/dense_energy_cell7.json @@ -1,6 +1,6 @@ { "parent": "block/cube_all", "textures": { - "all": "appliedenergistics2:blocks/energy_cell7" + "all": "appliedenergistics2:blocks/dense_energy_cell7" } } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/energy_cell.json b/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/energy_cell.json deleted file mode 100644 index 719be0187..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/EnergyCell/energy_cell.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "appliedenergistics2:blocks/energy_cell" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/dense_energy_cell.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/dense_energy_cell.png new file mode 100644 index 0000000000000000000000000000000000000000..9e602fd116a2a7e7c6db2f664d6189a80f6f5955 GIT binary patch literal 405 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7SkfJR9T^xl_H+M9WMyDr zP)PO&@?~JCQe$9fXklRZ#lXPO@PdJ%)PRBERRRNp)eHs(@q#(K0&N%=7&r?&B8wRq z_?Ce%WBZ+z`3wvUQYEetCBgY=CFO}lsSE*$nRz98ey$-3WyX4@dWMGXpPkGZ7#N;< zx;Tbd_%EHL$aly=z_nV%L!d>$pe3Y`p(%@1=pf^S7^eFQ1u~2Wd1oc;IBAkUc|XtF z1zL5RXWIWS-8DDKaIH>I|m(ae)4u)vG+`# z0LBxUUs<>0&Q@WV_x>zHpyoR>@#u4W%nYVB_PJ~ZQYEeb8Ce#F&;M22ndMX(o6eB_ z{-+P)UVWyCi|#p@uigH0yIZ>F&W{ZlIv|mc(@!LS$xqRY;G5<$fuq5l-~0Hd)P_S6 z7gl~{yz-$YpRHn*oAQ#`Vhrc~XERPzIuJ0mbcsd6tq%8{4Gatn44$rjF6*2UngCBt BkrDs^ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/dense_energy_cell0.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/dense_energy_cell0.png new file mode 100644 index 0000000000000000000000000000000000000000..afce73be4ced90a6f270921ac11b93f2c5a0bf42 GIT binary patch literal 402 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7SkfJR9T^xl_H+M9WMyDr zP)PO&@?~JCQe$9fXklRZ#lXPO@PdJ%)PRBERRRNp)eHs(@q#(K0&N%=7&r?&B8wRq z_?Ce%WBZ+z`3wvUQYEetCBgY=CFO}lsSE*$nRz98ey$-3WyX4@dWMGXpPkGZ7#JRT zx;Tbd_%EHL$aly=z_nV%LrcrB#YE9jIbdx@ljFjPwv2M&M=NI~>^M1L`^osWvH;Qj zH_y!fZ*|viqn>nk$n~wfhbJ7deC5dbVaJTG?3-VI%YA;?SW=MT{kE!`dpAuv$spPw zV;+CNqR*4*!Owd<0#hH=U5}0|HD)livCm~QkSb~Y&&aYceEzTE&Mc?g+i48x?|=F* z)@m_LTy)RLeC_t1+uhPVcRp>%&;f}&oqi(uV}6Qe1m8552^DH*d>%d(Y$vU_6od zm9->xx(dU*_h%UbHQ$+qYoC71;lO*|e>P(eTkOMn2FDjym;Z}dG%Mh;iR6Ks)po%S z@?8!~R&2lE`#SgE+KZ7vc~%Ni-407ul>buwG~Pr4$;PntNNVu&*kBX^&sp_q8`m|8D&JZ(lOTJ$hn`S53pF)!K(5?LOv)PHjS#H9(A5kihi405(QvZtprawR(~ zH)9Dn{CThBgOyUf6Y`=MZ0vK{T)G&NuU=#BDT;Z#%4RMoq!>J1{an^LB{Ts5Hg}Yf literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/dense_energy_cell3.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/dense_energy_cell3.png new file mode 100644 index 0000000000000000000000000000000000000000..9e602fd116a2a7e7c6db2f664d6189a80f6f5955 GIT binary patch literal 405 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7SkfJR9T^xl_H+M9WMyDr zP)PO&@?~JCQe$9fXklRZ#lXPO@PdJ%)PRBERRRNp)eHs(@q#(K0&N%=7&r?&B8wRq z_?Ce%WBZ+z`3wvUQYEetCBgY=CFO}lsSE*$nRz98ey$-3WyX4@dWMGXpPkGZ7#N;< zx;Tbd_%EHL$aly=z_nV%L!d>$pe3Y`p(%@1=pf^S7^eFQ1u~2Wd1oc;IBAkUc|XtF z1zL5RXWIWS-8DDKaIH>I|m(ae)4u)vG+`# z0LBxUUs<>0&Q@WV_x>zHpyoR>@#u4W%nYVB_PJ~ZQYEeb8Ce#F&;M22ndMX(o6eB_ z{-+P)UVWyCi|#p@uigH0yIZ>F&W{ZlIv|mc(@!LS$xqRY;G5<$fuq5l-~0Hd)P_S6 z7gl~{yz-$YpRHn*oAQ#`Vhrc~XERPzIuJ0mbcsd6tq%8{4Gatn44$rjF6*2UngCBt BkrDs^ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/dense_energy_cell4.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/dense_energy_cell4.png new file mode 100644 index 0000000000000000000000000000000000000000..7fa921c87a726d9218d072b944e17b9316490633 GIT binary patch literal 403 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7SkfJR9T^xl_H+M9WMyDr zP)PO&@?~JCQe$9fXklRZ#lXPO@PdJ%)PRBERRRNp)eHs(@q#(K0&N%=7&r?&B8wRq z_?Ce%WBZ+z`3wvUQYEetCBgY=CFO}lsSE*$nRz98ey$-3WyX4@dWMGXpPkGZ7#JRV zx;Tbd_%EGg$aTm;z_nO~m0R0WdD1Ci4yT}qD#mPEuMHc%F~l9v%XsXowx@M}-^qxj zKN4r!|4-dCGs$$lZcu3GwQadV&sVUk9{8N`?Z&Lw>+;s`^GpCCQkt4 ziIsntcCGUkVmSXjtzm`8_u1W3yAN|X@SgXd&Dg^h`>>wD@x|5U|6&%+3bwlwabPtB1umzgKkza>n8{c9K7f3Q^8#?J9(qm z$HPYT|4yeEA1#WCT(U`LZRRYMbAkL`4c9Ne*=V|Z?ftTwv6BTEKfIf~y!P2NBgq9! z6D~jE&bV#n$zXGTHshk8JNf6f&5~tf$f~Hj#gkz2g6lsshtqnyug`_9w!GSPj^W(B z&oh~-;#rhj_qOIm<$uoaJvXW7G2_JukjP{GiN{~uKM}M+MyFFjkfC30THn*t46TL> zf?qSQc=+=k&xep+HxF}NhI#YNn3Y@`7HYj_xO^nzgnPA28v_FagQu&X%Q~loCIBZA BlotR1 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/dense_energy_cell6.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/dense_energy_cell6.png new file mode 100644 index 0000000000000000000000000000000000000000..72c6c5d01e0d5302c643d75051b74915705984f1 GIT binary patch literal 405 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7SkfJR9T^xl_H+M9WMyDr zP)PO&@?~JCQe$9fXklRZ#lXPO@PdJ%)PRBERRRNp)eHs(@q#(K0&N%=7&r?&B8wRq z_?Ce%WBZ+z`3wvUQYEetCBgY=CFO}lsSE*$nRz98ey$-3WyX4@dWMGXpPkGZ7#N;< zx;Tbd_%EHL%Xi2@ptV}XL%@T_K6DPlRj#H-5*8xmD;|l+FkWPFF1XW}GAn=bcAmEj zwBk0;G=KlP#QJDfROFIPI%_j$shkVs_iFfl@y%A#-MaJ3ZpKa)Wc=`Ma(nHwX-1L@ zm?nIF#GP^5%#*?9{%poYK{jjrx6ORZ&X846cZ(;%m0+m zd!J`ARmHO?x$bSvi^~6;-+OLS(PPGo5g?Jr`V)`8xPKyOgN#n6f*?b`+_b)@rx{ue z7X-g%Uh(kfJ)RFCy>1@nx(xH?n=vc7HZ0V7&G5P_XaCM?w{jU67#KWV{an^LB{Ts5 D==zn^ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/dense_energy_cell7.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/dense_energy_cell7.png new file mode 100644 index 0000000000000000000000000000000000000000..1e714aef796f791dbad04c9171abc13f7aca76b0 GIT binary patch literal 404 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7SkfJR9T^xl_H+M9WMyDr zP)PO&@?~JCQe$9fXklRZ#lXPO@PdJ%)PRBERRRNp)eHs(@q#(K0&N%=7&r?&B8wRq z_?Ce%WBZ+z`3wvUQYEetCBgY=CFO}lsSE*$nRz98ey$-3WyX4@dWMGXpPkGZ7#N;- zx;Tbd_%EGg$aTm;z_nO~mD^i-V#fo{HIokc^*@q@n5;y58Fx#GQ2mfo~65c%1H*% zhM4ephuhmcnI8PS$0IQHQD*VRyN@iG0uFz^oW`)&G5m+TgFw~SmG;wDsD)fFWh?kL z@4U!`b|nGLSGpyat7g|{mrR>7o3G;-NMvqZr;XZww`omJ6FgZu87jVPDA9>$)97KG zdrQE9_x$&?hUHl%PP;N0Km6GuDWJ*J6B@~X@>%}8nHft=7#J8BJYD@<);T3K0RYWf Bl8gWV literal 0 HcmV?d00001