From c70915ffb045c8ece1bc5746220b7dd412692188 Mon Sep 17 00:00:00 2001
From: dpeter99 <dpeter99@gmail.com>
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 e7a5effb..77ca47b3 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 756b748e..6b9d342e 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 dde6c091..0052b96e 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 4376a689..e9d94041 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 7ec91a16..d6381bb0 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 2e56ec39..df7b14b0 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 be6a2e34..08329cf7 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 d92a8d2e..511f1515 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 719be018..00000000
--- 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!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6-E$sR$z
z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBD8X6a5n0T@z_$#98Qbry
z%m)femAFQf1m~xflqVLYG6W=M=9TFAxrQi|8S9zq85+8Ob}|R5dg|%o7-HeSbdn<9
zAqN51Y84NG76pTrkV1y0ELNd|j1yv*?kg0?FdpQcm9XQaN&e*hJZ~3h)oq?>|G#wC
z+$6)bIzf@su9^4>Jzv4Ddf;=$w;Qu!ughD%e}A%rp<?^V+i}I-GkF3SPh@^&-I6<7
zg<;<NvkZZn@65!b&+#!cnA+IqvKdH~wEkygSr|V5S8->SQ)z5EL;CxlK8$<ynI<l}
z=VZQi`_Jue>7F}3He~34L_SVGk^Ch;MKgkLn#%-^26uk%<DXI+4oO^C`IYg?hnjr0
ridAmPOJ<8PocEv2I8o_9z|_(u774dH+;=trJ<Q<g>gTe~DWM4fPfd{$

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!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6-E$sR$z
z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBD8X6a5n0T@z_$#98Qbry
z%m)femAFQf1m~xflqVLYG6W=M=9TFAxrQi|8S9zq85+8Ob}|R5dgSTi7-HeSbdn<9
zAqN51Y84MHEyETQMMvd;wHZy03n$t#%7q`ToRzTS<b>@f<J-ytMEBo3GylKUUB8Wb
z(%m7~xAGpIaK!SJBj<-5GrqEKe*G=?`DJ5CL5BC+s&4MxH030NXoHM-`~izTPo@Vy
z@9_vseN=ZnI<nN5!PLe+m(4(`r1d`|%fj&azluAvoN{lcF{Ho$>BCs7#WZozJty<E
z+kb9%OZVLQv>`(WB=U6niR6#@DVh;{(_AKSG`RD7AODova7g09N?*n+A8PX1Dpt8E
oFPSaIaNd75<3yzcF}<}62fD&#ugY!m2Ktu4)78&qol`;+09R0wZ2$lO

literal 0
HcmV?d00001

diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/dense_energy_cell1.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/dense_energy_cell1.png
new file mode 100644
index 0000000000000000000000000000000000000000..a173bb9667d5ab04cb093240766a6b91e97b503e
GIT binary patch
literal 401
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6-E$sR$z
z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBD8X6a5n0T@z_$#98Qbry
z%m)femAFQf1m~xflqVLYG6W=M=9TFAxrQi|8S9zq85+8Ob}|R5dg$rm7-HeSbdn)o
zlY@Y(<s>OCZ|UR}J?t9<xx62X=B&xFZ8E8n6Ozt1dXoF;y5O;{N0ZO~`PrX1Gs$qh
zZcu3GwQadV&sVUk9{8M6c7ImvHF@jz@h3YNDz@LeE$8h$lP7@jMB-Q0lGy1g4D;Tf
zWeC)KXBMt~`Z0$C?|J{(j6H0z59=8mUtC@OFJ{rKfXgP52X0o|1v|)hIV@SR{eti7
z+<$8?Mh4|sDM)n#MaqAvewy(|I+ANzv#Ov9(}RnLFKw)mTwuUflI6@`YIA=!<GfWD
oIbJSfJ@EN*n!^$fgRorNk~I-;uKxMu4fHI7r>mdKI;Vst0L#3R=l}o!

literal 0
HcmV?d00001

diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/dense_energy_cell2.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/dense_energy_cell2.png
new file mode 100644
index 0000000000000000000000000000000000000000..103babce5b6893f50ccdee1951f1e4d8e129c9d6
GIT binary patch
literal 403
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6-E$sR$z
z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBD8X6a5n0T@z_$#98Qbry
z%m)femAFQf1m~xflqVLYG6W=M=9TFAxrQi|8S9zq85+8Ob}|R5dhF@q7-HeSbdn<9
zAqN51Y84NTl}7}ES`ROba%?(S#H_;ZFj>pw&JxbH**>4mexAO-x9XAk?4O_Gm*3W$
z_W71lXlQEgZMDL_ssN@verey=-YosQ@$<ilJsb_?v-iG@j5?Llz~#`lT7SXoT`G(p
zYVz4Syb8DPjM!<>!*J!ppDmIHGA@YzV;5+Nt9^A|brq+n?_|a~d!HM#ep$%j(pANM
zcgwwJ_oe2lK3&GVXd_5udAw5p$^8?TCRj!YIVv&8+3Luip3caX?6BO7CE)Pqy^;@B
pO7%|2i(;^`&t-GzVo1Jvjk%{N=J6_<xuB3@@O1TaS?83{1OPU7l#u`c

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!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6-E$sR$z
z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBD8X6a5n0T@z_$#98Qbry
z%m)femAFQf1m~xflqVLYG6W=M=9TFAxrQi|8S9zq85+8Ob}|R5dg|%o7-HeSbdn<9
zAqN51Y84NG76pTrkV1y0ELNd|j1yv*?kg0?FdpQcm9XQaN&e*hJZ~3h)oq?>|G#wC
z+$6)bIzf@su9^4>Jzv4Ddf;=$w;Qu!ughD%e}A%rp<?^V+i}I-GkF3SPh@^&-I6<7
zg<;<NvkZZn@65!b&+#!cnA+IqvKdH~wEkygSr|V5S8->SQ)z5EL;CxlK8$<ynI<l}
z=VZQi`_Jue>7F}3He~34L_SVGk^Ch;MKgkLn#%-^26uk%<DXI+4oO^C`IYg?hnjr0
ridAmPOJ<8PocEv2I8o_9z|_(u774dH+;=trJ<Q<g>gTe~DWM4fPfd{$

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!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6-E$sR$z
z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBD8X6a5n0T@z_$#98Qbry
z%m)femAFQf1m~xflqVLYG6W=M=9TFAxrQi|8S9zq85+8Ob}|R5dhF@q7-HeSbdn+0
zAqN51Vii_yZBOM%r-V72f+DIIvu(XLZ1~0ycR(-Wv9H>m*8P1aBbNS1oN50*b<@lw
z)AhPRp`q8d<qADt!LEAXbH=wDvtqByTffgc*}+ip{pRgBZ||8r0gNYB{$bj+&RdA#
z{P(nm6(ZkfcTep;%;CU$-hVb@4_oZRdIrZASC{{bSu`u)vWet@o7Hx~4)R?NOIB>Z
z;QKoF-`b0jL3vgRQr$q2@?WZ-X8e(k<eJv3DyYKr;Nsy+8*3yN7_gOOIWw5r+@H-j
rZ`DPPm&;fWe7>CKu!O@PEZ27Tzm$u2QY&+T-evG~^>bP0l+XkKbKRC8

literal 0
HcmV?d00001

diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/dense_energy_cell5.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/dense_energy_cell5.png
new file mode 100644
index 0000000000000000000000000000000000000000..3c6240776f871b9d590dd6e2cc27460029b918c3
GIT binary patch
literal 404
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6-E$sR$z
z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBD8X6a5n0T@z_$#98Qbry
z%m)femAFQf1m~xflqVLYG6W=M=9TFAxrQi|8S9zq85+8Ob}|R5dgAHg7-HeSbdn+0
zAqN51Vii_yZ$a0fN~YB=8@`AnJ+%zFS;efMAS`h3p0iH{cfIW7jb0xQ8`b|ionm~n
zC@ONvCY`mJvsBIn@_RL0zxZaO>F%}n%WlR_7G(VJZu0WlXVZ)%7cfn@{D?c_wwWh`
z&HdSoi-PXtpW8M|mW?5+qV5(?g2@Z6|I8dt>+QZi7rNT=YS%f2bN4>aWU7j1QF7he
znirM-IluSZq@u@+7b8F-kM$=We{ugr&;}WuP6a`Rez|FVPfs(n8ZHQa&Aj5_&wD%{
rLVDdi%yk*&%{OCKa&1_s^_t=Gk&F}W)iP~B|1x;G`njxgN@xNAClZtw

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!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6-E$sR$z
z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBD8X6a5n0T@z_$#98Qbry
z%m)femAFQf1m~xflqVLYG6W=M=9TFAxrQi|8S9zq85+8Ob}|R5dg|%o7-HeSbdoOL
zAqRohY84Lw4<7r_ISg01njT45h?K8*BqGCjk;S>-PGicf{K?yS-Y(FJ+dR|!{p%9z
zqghdrOE&4O&77rjE|A}=;rqomTTOTC&M&(eJ6VwN!@J4twa=y*NiJZT@c9vU#%(iC
z2Alh{85afFtnuGA^DR3=Rz=+{o&=K@T>qIloYvcYeJ*sh<<+ip4Cn5Bp2<`d&!XhI
zw>2*+|8sutxk*Kj881eFL>}u;JpSVTiJ%QKI-LrF4E=J``ktO<Xf<3A{F-^i!=Lwf
sK7{nTd6?@m%$sk<tmN9TQ0q0r>#m&rJFnf!1$vml)78&qol`;+0O<Oa)Bpeg

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!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6-E$sR$z
z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBD8X6a5n0T@z_$#98Qbry
z%m)femAFQf1m~xflqVLYG6W=M=9TFAxrQi|8S9zq85+8Ob}|R5dgAHg7-HeSbdn+0
zAqN51Vii_yZ|R904>;FMI^@^?P*BIlLF>Iz1WV2yC$86=`48788-;1sMLauSKQm|9
zjdR-FA=8$c`c6J#`O1;=gXQef>dnW0<!(Q0D=EnE-n4p_?(Qik8AKam!s8uoZ}Vh&
z@beyzz|=>X#T)NFvS120{P}Vk!(zwqAMy?YRbN-yPhX)Ha=nzT;M=_OA{W|~1T<gi
zmRzoyU7uYtZOUxEj$<H^xpkd3YX9A)H9bx6Wa(t6__CoyC!S5ChjH#L0SDgm-_shF
qXPG$d%4GcTXN#nOCR0ynB>%~0`SWIGEHMH4m%-E3&t;ucLK6VZT9S+a

literal 0
HcmV?d00001