From 197f994dde3238bfcd0472d27627e73410356933 Mon Sep 17 00:00:00 2001
From: yueh <yueh@users.noreply.github.com>
Date: Fri, 18 Sep 2020 21:11:17 +0200
Subject: [PATCH] Fixed quartz ore item missing texture

Also added an _ to all variants for readability
---
 .../blockstates/charged_quartz_ore.json       |   6 +-
 .../blockstates/dense_energy_cell.json        |  10 +-
 .../blockstates/energy_cell.json              |  10 +-
 .../blockstates/quartz_ore.json               |   8 +-
 ...tz_ore0.json => charged_quartz_ore_0.json} |   2 +-
 ...tz_ore1.json => charged_quartz_ore_1.json} |   2 +-
 ...tz_ore2.json => charged_quartz_ore_2.json} |   2 +-
 .../block/energy_cell/dense_energy_cell0.json |   6 --
 .../block/energy_cell/dense_energy_cell1.json |   6 --
 .../block/energy_cell/dense_energy_cell2.json |   6 --
 .../block/energy_cell/dense_energy_cell3.json |   6 --
 .../block/energy_cell/dense_energy_cell4.json |   6 --
 .../block/energy_cell/dense_energy_cell5.json |   6 --
 .../block/energy_cell/dense_energy_cell6.json |   6 --
 .../block/energy_cell/dense_energy_cell7.json |   6 --
 .../energy_cell/dense_energy_cell_0.json      |   6 ++
 .../energy_cell/dense_energy_cell_1.json      |   6 ++
 .../energy_cell/dense_energy_cell_2.json      |   6 ++
 .../energy_cell/dense_energy_cell_3.json      |   6 ++
 .../energy_cell/dense_energy_cell_4.json      |   6 ++
 .../energy_cell/dense_energy_cell_5.json      |   6 ++
 .../block/energy_cell/energy_cell4.json       |   6 --
 .../block/energy_cell/energy_cell5.json       |   6 --
 .../block/energy_cell/energy_cell6.json       |   6 --
 .../block/energy_cell/energy_cell7.json       |   6 --
 .../block/energy_cell/energy_cell_0.json      |   6 ++
 .../block/energy_cell/energy_cell_1.json      |   6 ++
 .../block/energy_cell/energy_cell_2.json      |   6 ++
 .../block/energy_cell/energy_cell_3.json      |   6 ++
 .../block/energy_cell/energy_cell_4.json      |   6 ++
 .../block/energy_cell/energy_cell_5.json      |   6 ++
 .../models/block/quartz_ore0.json             |   6 --
 .../models/block/quartz_ore1.json             |   6 --
 .../models/block/quartz_ore2.json             |   6 --
 .../models/block/quartz_ore3.json             |   6 --
 .../energy_cell0.json => quartz_ore_0.json}   |   2 +-
 .../energy_cell1.json => quartz_ore_1.json}   |   2 +-
 .../energy_cell2.json => quartz_ore_2.json}   |   2 +-
 .../energy_cell3.json => quartz_ore_3.json}   |   2 +-
 .../models/item/dense_energy_cell.json        |  30 ++----
 .../models/item/energy_cell.json              |  30 ++----
 .../models/item/quartz_ore.json               |   5 +-
 ...ht0.png => charged_quartz_ore_light_0.png} | Bin
 ... => charged_quartz_ore_light_0.png.mcmeta} |  96 +++++++++---------
 ...ht1.png => charged_quartz_ore_light_1.png} | Bin
 ... => charged_quartz_ore_light_1.png.mcmeta} |  96 +++++++++---------
 ...ht2.png => charged_quartz_ore_light_2.png} | Bin
 ... => charged_quartz_ore_light_2.png.mcmeta} |  96 +++++++++---------
 .../textures/block/dense_energy_cell5.png     | Bin 3909 -> 0 bytes
 .../textures/block/dense_energy_cell6.png     | Bin 3914 -> 0 bytes
 .../textures/block/dense_energy_cell7.png     | Bin 3908 -> 0 bytes
 ...ergy_cell0.png => dense_energy_cell_0.png} | Bin
 ...ergy_cell1.png => dense_energy_cell_1.png} | Bin
 ...ergy_cell2.png => dense_energy_cell_2.png} | Bin
 ...ergy_cell3.png => dense_energy_cell_3.png} | Bin
 ...ergy_cell4.png => dense_energy_cell_4.png} | Bin
 .../textures/block/energy_cell5.png           | Bin 382 -> 0 bytes
 .../textures/block/energy_cell6.png           | Bin 385 -> 0 bytes
 .../textures/block/energy_cell7.png           | Bin 384 -> 0 bytes
 .../{energy_cell0.png => energy_cell_0.png}   | Bin
 .../{energy_cell1.png => energy_cell_1.png}   | Bin
 .../{energy_cell2.png => energy_cell_2.png}   | Bin
 .../{energy_cell3.png => energy_cell_3.png}   | Bin
 .../{energy_cell4.png => energy_cell_4.png}   | Bin
 .../{quartz_ore0.png => quartz_ore_0.png}     | Bin
 .../{quartz_ore1.png => quartz_ore_1.png}     | Bin
 .../{quartz_ore2.png => quartz_ore_2.png}     | Bin
 .../{quartz_ore3.png => quartz_ore_3.png}     | Bin
 .../appliedenergistics2/textures/desktop.ini  |   4 +
 .../textures/guis/desktop.ini                 |   4 +
 70 files changed, 264 insertions(+), 313 deletions(-)
 rename src/main/resources/assets/appliedenergistics2/models/block/{charged_quartz_ore0.json => charged_quartz_ore_0.json} (99%)
 rename src/main/resources/assets/appliedenergistics2/models/block/{charged_quartz_ore1.json => charged_quartz_ore_1.json} (99%)
 rename src/main/resources/assets/appliedenergistics2/models/block/{charged_quartz_ore2.json => charged_quartz_ore_2.json} (99%)
 delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell0.json
 delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell1.json
 delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell2.json
 delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell3.json
 delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell4.json
 delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell5.json
 delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell6.json
 delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell7.json
 create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell_0.json
 create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell_1.json
 create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell_2.json
 create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell_3.json
 create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell_4.json
 create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell_5.json
 delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell4.json
 delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell5.json
 delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell6.json
 delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell7.json
 create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell_0.json
 create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell_1.json
 create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell_2.json
 create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell_3.json
 create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell_4.json
 create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell_5.json
 delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/quartz_ore0.json
 delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/quartz_ore1.json
 delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/quartz_ore2.json
 delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/quartz_ore3.json
 rename src/main/resources/assets/appliedenergistics2/models/block/{energy_cell/energy_cell0.json => quartz_ore_0.json} (50%)
 rename src/main/resources/assets/appliedenergistics2/models/block/{energy_cell/energy_cell1.json => quartz_ore_1.json} (50%)
 rename src/main/resources/assets/appliedenergistics2/models/block/{energy_cell/energy_cell2.json => quartz_ore_2.json} (50%)
 rename src/main/resources/assets/appliedenergistics2/models/block/{energy_cell/energy_cell3.json => quartz_ore_3.json} (50%)
 rename src/main/resources/assets/appliedenergistics2/textures/block/{charged_quartz_ore_light0.png => charged_quartz_ore_light_0.png} (100%)
 rename src/main/resources/assets/appliedenergistics2/textures/block/{charged_quartz_ore_light0.png.mcmeta => charged_quartz_ore_light_0.png.mcmeta} (91%)
 rename src/main/resources/assets/appliedenergistics2/textures/block/{charged_quartz_ore_light1.png => charged_quartz_ore_light_1.png} (100%)
 rename src/main/resources/assets/appliedenergistics2/textures/block/{charged_quartz_ore_light1.png.mcmeta => charged_quartz_ore_light_1.png.mcmeta} (91%)
 rename src/main/resources/assets/appliedenergistics2/textures/block/{charged_quartz_ore_light2.png => charged_quartz_ore_light_2.png} (100%)
 rename src/main/resources/assets/appliedenergistics2/textures/block/{charged_quartz_ore_light2.png.mcmeta => charged_quartz_ore_light_2.png.mcmeta} (91%)
 delete mode 100644 src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell5.png
 delete mode 100644 src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell6.png
 delete mode 100644 src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell7.png
 rename src/main/resources/assets/appliedenergistics2/textures/block/{dense_energy_cell0.png => dense_energy_cell_0.png} (100%)
 rename src/main/resources/assets/appliedenergistics2/textures/block/{dense_energy_cell1.png => dense_energy_cell_1.png} (100%)
 rename src/main/resources/assets/appliedenergistics2/textures/block/{dense_energy_cell2.png => dense_energy_cell_2.png} (100%)
 rename src/main/resources/assets/appliedenergistics2/textures/block/{dense_energy_cell3.png => dense_energy_cell_3.png} (100%)
 rename src/main/resources/assets/appliedenergistics2/textures/block/{dense_energy_cell4.png => dense_energy_cell_4.png} (100%)
 delete mode 100644 src/main/resources/assets/appliedenergistics2/textures/block/energy_cell5.png
 delete mode 100644 src/main/resources/assets/appliedenergistics2/textures/block/energy_cell6.png
 delete mode 100644 src/main/resources/assets/appliedenergistics2/textures/block/energy_cell7.png
 rename src/main/resources/assets/appliedenergistics2/textures/block/{energy_cell0.png => energy_cell_0.png} (100%)
 rename src/main/resources/assets/appliedenergistics2/textures/block/{energy_cell1.png => energy_cell_1.png} (100%)
 rename src/main/resources/assets/appliedenergistics2/textures/block/{energy_cell2.png => energy_cell_2.png} (100%)
 rename src/main/resources/assets/appliedenergistics2/textures/block/{energy_cell3.png => energy_cell_3.png} (100%)
 rename src/main/resources/assets/appliedenergistics2/textures/block/{energy_cell4.png => energy_cell_4.png} (100%)
 rename src/main/resources/assets/appliedenergistics2/textures/block/{quartz_ore0.png => quartz_ore_0.png} (100%)
 rename src/main/resources/assets/appliedenergistics2/textures/block/{quartz_ore1.png => quartz_ore_1.png} (100%)
 rename src/main/resources/assets/appliedenergistics2/textures/block/{quartz_ore2.png => quartz_ore_2.png} (100%)
 rename src/main/resources/assets/appliedenergistics2/textures/block/{quartz_ore3.png => quartz_ore_3.png} (100%)
 create mode 100644 src/main/resources/assets/appliedenergistics2/textures/desktop.ini
 create mode 100644 src/main/resources/assets/appliedenergistics2/textures/guis/desktop.ini

diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/charged_quartz_ore.json b/src/main/resources/assets/appliedenergistics2/blockstates/charged_quartz_ore.json
index 244f95763..4bfc0c167 100644
--- a/src/main/resources/assets/appliedenergistics2/blockstates/charged_quartz_ore.json
+++ b/src/main/resources/assets/appliedenergistics2/blockstates/charged_quartz_ore.json
@@ -1,9 +1,9 @@
 {
   "variants": {
     "": [
-      { "model": "appliedenergistics2:block/charged_quartz_ore0", "weight": 1 },
-      { "model": "appliedenergistics2:block/charged_quartz_ore1", "weight": 1 },
-      { "model": "appliedenergistics2:block/charged_quartz_ore2", "weight": 1 }
+      { "model": "appliedenergistics2:block/charged_quartz_ore_0", "weight": 1 },
+      { "model": "appliedenergistics2:block/charged_quartz_ore_1", "weight": 1 },
+      { "model": "appliedenergistics2:block/charged_quartz_ore_2", "weight": 1 }
     ]
   }
 }
diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/dense_energy_cell.json b/src/main/resources/assets/appliedenergistics2/blockstates/dense_energy_cell.json
index 5897d5818..d13e91424 100644
--- a/src/main/resources/assets/appliedenergistics2/blockstates/dense_energy_cell.json
+++ b/src/main/resources/assets/appliedenergistics2/blockstates/dense_energy_cell.json
@@ -1,19 +1,19 @@
 {
   "variants": {
     "fullness=0": {
-      "model": "appliedenergistics2:block/energy_cell/dense_energy_cell0"
+      "model": "appliedenergistics2:block/energy_cell/dense_energy_cell_0"
     },
     "fullness=1": {
-      "model": "appliedenergistics2:block/energy_cell/dense_energy_cell1"
+      "model": "appliedenergistics2:block/energy_cell/dense_energy_cell_1"
     },
     "fullness=2": {
-      "model": "appliedenergistics2:block/energy_cell/dense_energy_cell2"
+      "model": "appliedenergistics2:block/energy_cell/dense_energy_cell_2"
     },
     "fullness=3": {
-      "model": "appliedenergistics2:block/energy_cell/dense_energy_cell3"
+      "model": "appliedenergistics2:block/energy_cell/dense_energy_cell_3"
     },
     "fullness=4": {
-      "model": "appliedenergistics2:block/energy_cell/dense_energy_cell4"
+      "model": "appliedenergistics2:block/energy_cell/dense_energy_cell_4"
     }
   }
 }
diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/energy_cell.json b/src/main/resources/assets/appliedenergistics2/blockstates/energy_cell.json
index c91c21d11..2ad1590c0 100644
--- a/src/main/resources/assets/appliedenergistics2/blockstates/energy_cell.json
+++ b/src/main/resources/assets/appliedenergistics2/blockstates/energy_cell.json
@@ -1,19 +1,19 @@
 {
   "variants": {
     "fullness=0": {
-      "model": "appliedenergistics2:block/energy_cell/energy_cell0"
+      "model": "appliedenergistics2:block/energy_cell/energy_cell_0"
     },
     "fullness=1": {
-      "model": "appliedenergistics2:block/energy_cell/energy_cell1"
+      "model": "appliedenergistics2:block/energy_cell/energy_cell_1"
     },
     "fullness=2": {
-      "model": "appliedenergistics2:block/energy_cell/energy_cell2"
+      "model": "appliedenergistics2:block/energy_cell/energy_cell_2"
     },
     "fullness=3": {
-      "model": "appliedenergistics2:block/energy_cell/energy_cell3"
+      "model": "appliedenergistics2:block/energy_cell/energy_cell_3"
     },
     "fullness=4": {
-      "model": "appliedenergistics2:block/energy_cell/energy_cell4"
+      "model": "appliedenergistics2:block/energy_cell/energy_cell_4"
     }
   }
 }
diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/quartz_ore.json b/src/main/resources/assets/appliedenergistics2/blockstates/quartz_ore.json
index 65cf5bcae..386b2fd98 100644
--- a/src/main/resources/assets/appliedenergistics2/blockstates/quartz_ore.json
+++ b/src/main/resources/assets/appliedenergistics2/blockstates/quartz_ore.json
@@ -1,10 +1,10 @@
 {
   "variants": {
     "": [
-      { "model": "appliedenergistics2:block/quartz_ore0", "weight": 1 },
-      { "model": "appliedenergistics2:block/quartz_ore1", "weight": 1 },
-      { "model": "appliedenergistics2:block/quartz_ore2", "weight": 1 },
-      { "model": "appliedenergistics2:block/quartz_ore3", "weight": 1 }
+      { "model": "appliedenergistics2:block/quartz_ore_0", "weight": 1 },
+      { "model": "appliedenergistics2:block/quartz_ore_1", "weight": 1 },
+      { "model": "appliedenergistics2:block/quartz_ore_2", "weight": 1 },
+      { "model": "appliedenergistics2:block/quartz_ore_3", "weight": 1 }
     ]
   }
 }
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/charged_quartz_ore0.json b/src/main/resources/assets/appliedenergistics2/models/block/charged_quartz_ore_0.json
similarity index 99%
rename from src/main/resources/assets/appliedenergistics2/models/block/charged_quartz_ore0.json
rename to src/main/resources/assets/appliedenergistics2/models/block/charged_quartz_ore_0.json
index e4b0601ad..8ec1c3234 100644
--- a/src/main/resources/assets/appliedenergistics2/models/block/charged_quartz_ore0.json
+++ b/src/main/resources/assets/appliedenergistics2/models/block/charged_quartz_ore_0.json
@@ -2,7 +2,7 @@
   "parent": "block/block",
   "textures": {
     "block": "block/stone",
-    "quartz": "appliedenergistics2:block/charged_quartz_ore_light0",
+    "quartz": "appliedenergistics2:block/charged_quartz_ore_light_0",
     "particle": "appliedenergistics2:block/charged_quartz_ore"
   },
   "elements": [
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/charged_quartz_ore1.json b/src/main/resources/assets/appliedenergistics2/models/block/charged_quartz_ore_1.json
similarity index 99%
rename from src/main/resources/assets/appliedenergistics2/models/block/charged_quartz_ore1.json
rename to src/main/resources/assets/appliedenergistics2/models/block/charged_quartz_ore_1.json
index 60ce29668..0406512c9 100644
--- a/src/main/resources/assets/appliedenergistics2/models/block/charged_quartz_ore1.json
+++ b/src/main/resources/assets/appliedenergistics2/models/block/charged_quartz_ore_1.json
@@ -2,7 +2,7 @@
   "parent": "block/block",
   "textures": {
     "block": "block/stone",
-    "quartz": "appliedenergistics2:block/charged_quartz_ore_light1",
+    "quartz": "appliedenergistics2:block/charged_quartz_ore_light_1",
     "particle": "appliedenergistics2:block/charged_quartz_ore"
   },
   "elements": [
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/charged_quartz_ore2.json b/src/main/resources/assets/appliedenergistics2/models/block/charged_quartz_ore_2.json
similarity index 99%
rename from src/main/resources/assets/appliedenergistics2/models/block/charged_quartz_ore2.json
rename to src/main/resources/assets/appliedenergistics2/models/block/charged_quartz_ore_2.json
index 2a92411b7..5bbbc7864 100644
--- a/src/main/resources/assets/appliedenergistics2/models/block/charged_quartz_ore2.json
+++ b/src/main/resources/assets/appliedenergistics2/models/block/charged_quartz_ore_2.json
@@ -2,7 +2,7 @@
   "parent": "block/block",
   "textures": {
     "block": "block/stone",
-    "quartz": "appliedenergistics2:block/charged_quartz_ore_light2",
+    "quartz": "appliedenergistics2:block/charged_quartz_ore_light_2",
     "particle": "appliedenergistics2:block/charged_quartz_ore"
   },
   "elements": [
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell0.json b/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell0.json
deleted file mode 100644
index 154d12786..000000000
--- a/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell0.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "block/cube_all",
-  "textures": {
-    "all": "appliedenergistics2:block/dense_energy_cell0"
-  }
-}
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell1.json b/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell1.json
deleted file mode 100644
index 1bd02c19d..000000000
--- a/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell1.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "block/cube_all",
-  "textures": {
-    "all": "appliedenergistics2:block/dense_energy_cell1"
-  }
-}
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell2.json b/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell2.json
deleted file mode 100644
index f31ac6758..000000000
--- a/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell2.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "block/cube_all",
-  "textures": {
-    "all": "appliedenergistics2:block/dense_energy_cell2"
-  }
-}
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell3.json b/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell3.json
deleted file mode 100644
index 14a91bcdd..000000000
--- a/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell3.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "block/cube_all",
-  "textures": {
-    "all": "appliedenergistics2:block/dense_energy_cell3"
-  }
-}
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell4.json b/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell4.json
deleted file mode 100644
index ed1d7e1e2..000000000
--- a/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell4.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "block/cube_all",
-  "textures": {
-    "all": "appliedenergistics2:block/dense_energy_cell4"
-  }
-}
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell5.json b/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell5.json
deleted file mode 100644
index a55d2a509..000000000
--- a/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell5.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "block/cube_all",
-  "textures": {
-    "all": "appliedenergistics2:block/dense_energy_cell5"
-  }
-}
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell6.json b/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell6.json
deleted file mode 100644
index 93dba33cf..000000000
--- a/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell6.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "block/cube_all",
-  "textures": {
-    "all": "appliedenergistics2:block/dense_energy_cell6"
-  }
-}
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell7.json b/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell7.json
deleted file mode 100644
index 66432b1fa..000000000
--- a/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell7.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "block/cube_all",
-  "textures": {
-    "all": "appliedenergistics2:block/dense_energy_cell7"
-  }
-}
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell_0.json b/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell_0.json
new file mode 100644
index 000000000..69dc1bf5e
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell_0.json
@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "appliedenergistics2:block/dense_energy_cell_0"
+  }
+}
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell_1.json b/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell_1.json
new file mode 100644
index 000000000..fed8e5554
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell_1.json
@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "appliedenergistics2:block/dense_energy_cell_1"
+  }
+}
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell_2.json b/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell_2.json
new file mode 100644
index 000000000..20871fccb
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell_2.json
@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "appliedenergistics2:block/dense_energy_cell_2"
+  }
+}
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell_3.json b/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell_3.json
new file mode 100644
index 000000000..b4120788b
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell_3.json
@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "appliedenergistics2:block/dense_energy_cell_3"
+  }
+}
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell_4.json b/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell_4.json
new file mode 100644
index 000000000..3360d5fa1
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell_4.json
@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "appliedenergistics2:block/dense_energy_cell_4"
+  }
+}
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell_5.json b/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell_5.json
new file mode 100644
index 000000000..f632def96
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell_5.json
@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "appliedenergistics2:block/dense_energy_cell_5"
+  }
+}
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell4.json b/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell4.json
deleted file mode 100644
index 5fe9da98e..000000000
--- a/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell4.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "block/cube_all",
-  "textures": {
-    "all": "appliedenergistics2:block/energy_cell4"
-  }
-}
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell5.json b/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell5.json
deleted file mode 100644
index 5fd33371d..000000000
--- a/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell5.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "block/cube_all",
-  "textures": {
-    "all": "appliedenergistics2:block/energy_cell5"
-  }
-}
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell6.json b/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell6.json
deleted file mode 100644
index d82de6b8d..000000000
--- a/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell6.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "block/cube_all",
-  "textures": {
-    "all": "appliedenergistics2:block/energy_cell6"
-  }
-}
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell7.json b/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell7.json
deleted file mode 100644
index 866eaa353..000000000
--- a/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell7.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "block/cube_all",
-  "textures": {
-    "all": "appliedenergistics2:block/energy_cell7"
-  }
-}
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell_0.json b/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell_0.json
new file mode 100644
index 000000000..301a6b84e
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell_0.json
@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "appliedenergistics2:block/energy_cell_0"
+  }
+}
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell_1.json b/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell_1.json
new file mode 100644
index 000000000..f06576224
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell_1.json
@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "appliedenergistics2:block/energy_cell_1"
+  }
+}
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell_2.json b/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell_2.json
new file mode 100644
index 000000000..2e05357bf
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell_2.json
@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "appliedenergistics2:block/energy_cell_2"
+  }
+}
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell_3.json b/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell_3.json
new file mode 100644
index 000000000..50201ceb5
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell_3.json
@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "appliedenergistics2:block/energy_cell_3"
+  }
+}
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell_4.json b/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell_4.json
new file mode 100644
index 000000000..eca95d56b
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell_4.json
@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "appliedenergistics2:block/energy_cell_4"
+  }
+}
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell_5.json b/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell_5.json
new file mode 100644
index 000000000..548d037c5
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell_5.json
@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "appliedenergistics2:block/energy_cell_5"
+  }
+}
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/quartz_ore0.json b/src/main/resources/assets/appliedenergistics2/models/block/quartz_ore0.json
deleted file mode 100644
index 53bceb7f2..000000000
--- a/src/main/resources/assets/appliedenergistics2/models/block/quartz_ore0.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "block/cube_all",
-  "textures": {
-    "all": "appliedenergistics2:block/quartz_ore0"
-  }
-}
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/quartz_ore1.json b/src/main/resources/assets/appliedenergistics2/models/block/quartz_ore1.json
deleted file mode 100644
index 8cd28906d..000000000
--- a/src/main/resources/assets/appliedenergistics2/models/block/quartz_ore1.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "block/cube_all",
-  "textures": {
-    "all": "appliedenergistics2:block/quartz_ore1"
-  }
-}
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/quartz_ore2.json b/src/main/resources/assets/appliedenergistics2/models/block/quartz_ore2.json
deleted file mode 100644
index 709f31a35..000000000
--- a/src/main/resources/assets/appliedenergistics2/models/block/quartz_ore2.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "block/cube_all",
-  "textures": {
-    "all": "appliedenergistics2:block/quartz_ore2"
-  }
-}
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/quartz_ore3.json b/src/main/resources/assets/appliedenergistics2/models/block/quartz_ore3.json
deleted file mode 100644
index c309b13a4..000000000
--- a/src/main/resources/assets/appliedenergistics2/models/block/quartz_ore3.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "block/cube_all",
-  "textures": {
-    "all": "appliedenergistics2:block/quartz_ore3"
-  }
-}
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell0.json b/src/main/resources/assets/appliedenergistics2/models/block/quartz_ore_0.json
similarity index 50%
rename from src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell0.json
rename to src/main/resources/assets/appliedenergistics2/models/block/quartz_ore_0.json
index 60faa2ac4..cc1fc85a5 100644
--- a/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell0.json
+++ b/src/main/resources/assets/appliedenergistics2/models/block/quartz_ore_0.json
@@ -1,6 +1,6 @@
 {
   "parent": "block/cube_all",
   "textures": {
-    "all": "appliedenergistics2:block/energy_cell0"
+    "all": "appliedenergistics2:block/quartz_ore_0"
   }
 }
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell1.json b/src/main/resources/assets/appliedenergistics2/models/block/quartz_ore_1.json
similarity index 50%
rename from src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell1.json
rename to src/main/resources/assets/appliedenergistics2/models/block/quartz_ore_1.json
index a695e5fb4..fc3c1492e 100644
--- a/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell1.json
+++ b/src/main/resources/assets/appliedenergistics2/models/block/quartz_ore_1.json
@@ -1,6 +1,6 @@
 {
   "parent": "block/cube_all",
   "textures": {
-    "all": "appliedenergistics2:block/energy_cell1"
+    "all": "appliedenergistics2:block/quartz_ore_1"
   }
 }
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell2.json b/src/main/resources/assets/appliedenergistics2/models/block/quartz_ore_2.json
similarity index 50%
rename from src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell2.json
rename to src/main/resources/assets/appliedenergistics2/models/block/quartz_ore_2.json
index 52911e1d2..1c37dd665 100644
--- a/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell2.json
+++ b/src/main/resources/assets/appliedenergistics2/models/block/quartz_ore_2.json
@@ -1,6 +1,6 @@
 {
   "parent": "block/cube_all",
   "textures": {
-    "all": "appliedenergistics2:block/energy_cell2"
+    "all": "appliedenergistics2:block/quartz_ore_2"
   }
 }
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell3.json b/src/main/resources/assets/appliedenergistics2/models/block/quartz_ore_3.json
similarity index 50%
rename from src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell3.json
rename to src/main/resources/assets/appliedenergistics2/models/block/quartz_ore_3.json
index c46c209b8..f00e64ef8 100644
--- a/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell3.json
+++ b/src/main/resources/assets/appliedenergistics2/models/block/quartz_ore_3.json
@@ -1,6 +1,6 @@
 {
   "parent": "block/cube_all",
   "textures": {
-    "all": "appliedenergistics2:block/energy_cell3"
+    "all": "appliedenergistics2:block/quartz_ore_3"
   }
 }
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/dense_energy_cell.json b/src/main/resources/assets/appliedenergistics2/models/item/dense_energy_cell.json
index 709f85b90..bb4435d42 100644
--- a/src/main/resources/assets/appliedenergistics2/models/item/dense_energy_cell.json
+++ b/src/main/resources/assets/appliedenergistics2/models/item/dense_energy_cell.json
@@ -1,47 +1,29 @@
 {
-  "parent": "appliedenergistics2:block/energy_cell/dense_energy_cell0",
+  "parent": "appliedenergistics2:block/energy_cell/dense_energy_cell_0",
   "overrides": [
     {
       "predicate": {
-        "appliedenergistics2:fill_level": 0.125
+        "appliedenergistics2:fill_level": 0
       },
-      "model": "appliedenergistics2:block/energy_cell/dense_energy_cell1"
+      "model": "appliedenergistics2:block/energy_cell/dense_energy_cell_1"
     },
     {
       "predicate": {
         "appliedenergistics2:fill_level": 0.25
       },
-      "model": "appliedenergistics2:block/energy_cell/dense_energy_cell2"
-    },
-    {
-      "predicate": {
-        "appliedenergistics2:fill_level": 0.375
-      },
-      "model": "appliedenergistics2:block/energy_cell/dense_energy_cell3"
+      "model": "appliedenergistics2:block/energy_cell/dense_energy_cell_2"
     },
     {
       "predicate": {
         "appliedenergistics2:fill_level": 0.5
       },
-      "model": "appliedenergistics2:block/energy_cell/dense_energy_cell4"
-    },
-    {
-      "predicate": {
-        "appliedenergistics2:fill_level": 0.625
-      },
-      "model": "appliedenergistics2:block/energy_cell/dense_energy_cell5"
+      "model": "appliedenergistics2:block/energy_cell/dense_energy_cell_3"
     },
     {
       "predicate": {
         "appliedenergistics2:fill_level": 0.75
       },
-      "model": "appliedenergistics2:block/energy_cell/dense_energy_cell6"
-    },
-    {
-      "predicate": {
-        "appliedenergistics2:fill_level": 0.875
-      },
-      "model": "appliedenergistics2:block/energy_cell/dense_energy_cell7"
+      "model": "appliedenergistics2:block/energy_cell/dense_energy_cell_4"
     }
   ]
 }
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/energy_cell.json b/src/main/resources/assets/appliedenergistics2/models/item/energy_cell.json
index e8ea4e909..bcbb789ca 100644
--- a/src/main/resources/assets/appliedenergistics2/models/item/energy_cell.json
+++ b/src/main/resources/assets/appliedenergistics2/models/item/energy_cell.json
@@ -1,47 +1,29 @@
 {
-  "parent": "appliedenergistics2:block/energy_cell/energy_cell0",
+  "parent": "appliedenergistics2:block/energy_cell/energy_cell_0",
   "overrides": [
     {
       "predicate": {
-        "appliedenergistics2:fill_level": 0.125
+        "appliedenergistics2:fill_level": 0
       },
-      "model": "appliedenergistics2:block/energy_cell/energy_cell1"
+      "model": "appliedenergistics2:block/energy_cell/energy_cell_1"
     },
     {
       "predicate": {
         "appliedenergistics2:fill_level": 0.25
       },
-      "model": "appliedenergistics2:block/energy_cell/energy_cell2"
-    },
-    {
-      "predicate": {
-        "appliedenergistics2:fill_level": 0.375
-      },
-      "model": "appliedenergistics2:block/energy_cell/energy_cell3"
+      "model": "appliedenergistics2:block/energy_cell/energy_cell_2"
     },
     {
       "predicate": {
         "appliedenergistics2:fill_level": 0.5
       },
-      "model": "appliedenergistics2:block/energy_cell/energy_cell4"
-    },
-    {
-      "predicate": {
-        "appliedenergistics2:fill_level": 0.625
-      },
-      "model": "appliedenergistics2:block/energy_cell/energy_cell5"
+      "model": "appliedenergistics2:block/energy_cell/energy_cell_3"
     },
     {
       "predicate": {
         "appliedenergistics2:fill_level": 0.75
       },
-      "model": "appliedenergistics2:block/energy_cell/energy_cell6"
-    },
-    {
-      "predicate": {
-        "appliedenergistics2:fill_level": 0.875
-      },
-      "model": "appliedenergistics2:block/energy_cell/energy_cell7"
+      "model": "appliedenergistics2:block/energy_cell/energy_cell_4"
     }
   ]
 }
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/quartz_ore.json b/src/main/resources/assets/appliedenergistics2/models/item/quartz_ore.json
index 6369af854..cc1fc85a5 100644
--- a/src/main/resources/assets/appliedenergistics2/models/item/quartz_ore.json
+++ b/src/main/resources/assets/appliedenergistics2/models/item/quartz_ore.json
@@ -1,3 +1,6 @@
 {
-  "parent": "appliedenergistics2:block/quartz_ore"
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "appliedenergistics2:block/quartz_ore_0"
+  }
 }
diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore_light0.png b/src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore_light_0.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore_light0.png
rename to src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore_light_0.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore_light0.png.mcmeta b/src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore_light_0.png.mcmeta
similarity index 91%
rename from src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore_light0.png.mcmeta
rename to src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore_light_0.png.mcmeta
index b0bb0570f..57fa4d474 100644
--- a/src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore_light0.png.mcmeta
+++ b/src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore_light_0.png.mcmeta
@@ -1,49 +1,49 @@
- {
-  "animation": {
-  "interpolate": true,
-  	"frames": [
-  		{
-  			"index": 0,
-  			"time": 25
-  		},
-  		{
-  			"index": 1,
-  			"time": 2
-  		},
-  		{
-  			"index": 2,
-  			"time": 2
-  		},
-  		{
-  			"index": 3,
-  			"time": 2
-  		}
-  		,
-  		{
-  			"index": 4,
-  			"time": 2
-  		},
-  		{
-  			"index": 5,
-  			"time": 2
-  		},
-  		{
-  			"index": 6,
-  			"time": 2
-  		},
-  		{
-  			"index": 7,
-  			"time": 2
-  		}
-  		,
-  		{
-  			"index": 8,
-  			"time": 2
-  		},
-  		{
-  			"index": 9,
-  			"time": 2
-  		}
-  	]
-  }  
+ {
+  "animation": {
+  "interpolate": true,
+  	"frames": [
+  		{
+  			"index": 0,
+  			"time": 25
+  		},
+  		{
+  			"index": 1,
+  			"time": 2
+  		},
+  		{
+  			"index": 2,
+  			"time": 2
+  		},
+  		{
+  			"index": 3,
+  			"time": 2
+  		}
+  		,
+  		{
+  			"index": 4,
+  			"time": 2
+  		},
+  		{
+  			"index": 5,
+  			"time": 2
+  		},
+  		{
+  			"index": 6,
+  			"time": 2
+  		},
+  		{
+  			"index": 7,
+  			"time": 2
+  		}
+  		,
+  		{
+  			"index": 8,
+  			"time": 2
+  		},
+  		{
+  			"index": 9,
+  			"time": 2
+  		}
+  	]
+  }  
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore_light1.png b/src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore_light_1.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore_light1.png
rename to src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore_light_1.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore_light1.png.mcmeta b/src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore_light_1.png.mcmeta
similarity index 91%
rename from src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore_light1.png.mcmeta
rename to src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore_light_1.png.mcmeta
index 59678f563..92deaa673 100644
--- a/src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore_light1.png.mcmeta
+++ b/src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore_light_1.png.mcmeta
@@ -1,49 +1,49 @@
- {
-  "animation": {
-  "interpolate": true,
-  	"frames": [
-  		{
-  			"index": 0,
-  			"time": 2
-  		},
-  		{
-  			"index": 1,
-  			"time": 2
-  		},
-  		{
-  			"index": 2,
-  			"time": 2
-  		},
-  		{
-  			"index": 3,
-  			"time": 2
-  		}
-  		,
-  		{
-  			"index": 4,
-  			"time": 2
-  		},
-  		{
-  			"index": 5,
-  			"time": 2
-  		},
-  		{
-  			"index": 6,
-  			"time": 2
-  		},
-  		{
-  			"index": 7,
-  			"time": 2
-  		}
-  		,
-  		{
-  			"index": 8,
-  			"time": 25
-  		},
-  		{
-  			"index": 9,
-  			"time": 2
-  		}
-  	]
-  }  
+ {
+  "animation": {
+  "interpolate": true,
+  	"frames": [
+  		{
+  			"index": 0,
+  			"time": 2
+  		},
+  		{
+  			"index": 1,
+  			"time": 2
+  		},
+  		{
+  			"index": 2,
+  			"time": 2
+  		},
+  		{
+  			"index": 3,
+  			"time": 2
+  		}
+  		,
+  		{
+  			"index": 4,
+  			"time": 2
+  		},
+  		{
+  			"index": 5,
+  			"time": 2
+  		},
+  		{
+  			"index": 6,
+  			"time": 2
+  		},
+  		{
+  			"index": 7,
+  			"time": 2
+  		}
+  		,
+  		{
+  			"index": 8,
+  			"time": 25
+  		},
+  		{
+  			"index": 9,
+  			"time": 2
+  		}
+  	]
+  }  
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore_light2.png b/src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore_light_2.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore_light2.png
rename to src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore_light_2.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore_light2.png.mcmeta b/src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore_light_2.png.mcmeta
similarity index 91%
rename from src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore_light2.png.mcmeta
rename to src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore_light_2.png.mcmeta
index 3a459b8c2..3d61c70bd 100644
--- a/src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore_light2.png.mcmeta
+++ b/src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore_light_2.png.mcmeta
@@ -1,49 +1,49 @@
- {
-  "animation": {
-  "interpolate": true,
-  	"frames": [
-  		{
-  			"index": 0,
-  			"time": 2
-  		},
-  		{
-  			"index": 1,
-  			"time": 2
-  		},
-  		{
-  			"index": 2,
-  			"time": 25
-  		},
-  		{
-  			"index": 3,
-  			"time": 2
-  		}
-  		,
-  		{
-  			"index": 4,
-  			"time": 2
-  		},
-  		{
-  			"index": 5,
-  			"time": 2
-  		},
-  		{
-  			"index": 6,
-  			"time": 2
-  		},
-  		{
-  			"index": 7,
-  			"time": 2
-  		}
-  		,
-  		{
-  			"index": 8,
-  			"time": 2
-  		},
-  		{
-  			"index": 9,
-  			"time": 2
-  		}
-  	]
-  }  
+ {
+  "animation": {
+  "interpolate": true,
+  	"frames": [
+  		{
+  			"index": 0,
+  			"time": 2
+  		},
+  		{
+  			"index": 1,
+  			"time": 2
+  		},
+  		{
+  			"index": 2,
+  			"time": 25
+  		},
+  		{
+  			"index": 3,
+  			"time": 2
+  		}
+  		,
+  		{
+  			"index": 4,
+  			"time": 2
+  		},
+  		{
+  			"index": 5,
+  			"time": 2
+  		},
+  		{
+  			"index": 6,
+  			"time": 2
+  		},
+  		{
+  			"index": 7,
+  			"time": 2
+  		}
+  		,
+  		{
+  			"index": 8,
+  			"time": 2
+  		},
+  		{
+  			"index": 9,
+  			"time": 2
+  		}
+  	]
+  }  
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell5.png b/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell5.png
deleted file mode 100644
index 4c0d1e8e89344ccb92ac8a894ad3a63a4d61a237..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3909
zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4kiW$h6xih%orFLI14-?iy0WWg+Z8+Vb&Z8
z1_qw;%#etZ2wxwo<osN{#FYG`RK1Ga0tOJUv9BmdOwLX%QAkQn&&;z`dcS+Wl0s&R
ztx~wDuYqrYb81GWM^#a3aFt(3a#eP+Wr~u$oq|n;RYh(=ZfZ%QLPc&)Ua?h$trFN=
ztGr?>kg&dz0$52&wylyQ$U=n(-v9;Y{GwC^Gd%;{WCH^u1#?S1Lo*W-GXot3BLgD?
zeFIZ{LnB>7Gb;lVD?@VyC{VIfuqjGOvkG!?gW6S;l4h%vQBqQ1rLSLJUanVete0Pu
zu5V~*X{m2uq;F)TTa=QfTU?n}l31aeSF8*(!6mggxhS)sBr`ux0c2ugQhsTPt&$Sd
z*oxc&xUqS~&|pf=&(*I;EYLU9GXQxB?AMfJxVnPUq8za0Darb&IjOm+c_qdAhI)o@
zwH3JqzP@nfSdGoig{v+uaV;ysuevy-vLIDID784hv?w{%wJbHSL>cCT;*y|LM9^Th
z3{`tjY8qT~K}LQ_esM-VjzEA*qXb1sW*QC)K{6;xQ!6rYC<V#Dl@?ez7o{ea<QIkH
z=jXuEP5{hp3eL_78sV9FDf#8anjmjOm8ZHSmZaJ$fs&D~frYN2MTn81m9eFjsfD(I
zk(Ge~M5%9TNn%Q3Ng}FZBl8eLGb>{gD-%-`#rY|jX_W+(rX*XX<rn29me?v~<|d}6
z>KEjtgKhKmwerj>E=kNwPW5!LRjSA>(96tBu`;(XFiJH|Hq|w?G)>brH8wHVO*Ax5
z(KWM3PBAhzF*HjuH-+hU$xki?B`J`8NbX9>PtHuSg2#nba*9!ksez@Du4S@eqHdb0
zNwThmnNgaqiKUroigAj8nF+!)|Dw$F%)G=LWK%(|O36&IN-{`GHBK@x(=|>qOVc&9
zFfr6kGD@`6O-wRMF)&L@voJO`QBpwI>ztpHU*wygl4`4DtfT;nYb*bv%+$P+L{RRs
zRWgJMMt~A(PANpt+{nPdz(C&+L_*~w3CJU)L-R6AY?X|Z6hNuP3T%IHL1J>Mt&*9k
zsj(?kJRq|oH7CL)GdDG_I5R)bR>{x|Stb%y22_rL@~4$YW^qY=Q6;pb2~I79vT`yN
zz**8NF&W~8WKh~nO;LghXJUz9;(`)lY<Wg%9^O<7QC6IvR#Ki=l<JtCnpZ*~Pw3-v
zdU0YIeuo<yo2D71rCREm8X1`ArX`uA=vrDPC+emqC8bzc8d@4Bnx?@#j_GhCD-#1N
zQv+BIBHiK8AWhCl%u7#Au~pJnBHt^P7G|lbNy(PFmPtuzy2i#PX}T5`1}3_xhUP{o
zDJe#l$!3Yzy@I7MAj&I7hI&TGB@;vwF`h}z&nrtUDnZ0eL1Iy2ZfZ$tQL(L3T2X$k
zLSjKdPG&MVXX%&ar9f*YcxF^6$yY!WJvaj`CABCMDFq<g0(XJ}740LK-iRv+Apwb+
z-e?+0`k<x(qzKRl*WO5_1BCAa2}w6l+<>cGD{SQev1u?UHO(r8U_ozekeXy}WRaqq
znq*?Cn`mfatecc<k*aH8o??=0YGjaPkpwQ4K&ItWTF`^i5IlKV!RiagyyR3+F<A^P
zVVn}vp{$%tJM7gHF|M`&2Y5~<A+t=363vVZjLdaYEsc|P&5TV_buA1njdfF!ERqe(
zEzOcsQc{RD%gi9zBE>MxP&e5i$ynFi(j-wgDb><g*TTdsEzu$^)i^QLfLOE4lPyyc
z4Gj!*4HGR5b(2j@EOe6$4b5~DEzC_#%}vZwjg3r*HOs;v**MM6C`mWX$S7IY(A>mG
z*TT>!Ro5`lIN8j=)WpKrG6~ZxQYvvI-QaMCM4~?a*aoXaYCYR2K#U1;aRV{I4Si6f
z-%bJ1n@G(|u~jNkvbW19IgrP|z*OSt;uxYaF?Z5^@8Cq4WAneix%#;5+{C9j-JZ&`
zG^hPko}A#=(Q)#H+M8#0Tm(W~%)jxwlnTarir;OC>*s22+Ou-PrZbYQI|>%)-Ew+<
zC*}E@yZ2<L%-!D2?6mm()z42We|&oS(7EmW_t|R>or>X5^qeH1B$0K!)ON0)zK%{#
zsu_cT6NloeM`5<UTSA_>PqB9NeKhBH&AzFR+!YpQ&RV3waAljf;-%9PpMU?I^ZD#0
z;Zvt<N<8Gg%$<^2>625JF?)umzriuBsay>o!(v0PcFgSAUb5eBPkO3ft3b<yW5<r2
zHfP&DIX!(IKXb>?BnE~(+V`q$%*0>W8-Fm{xkLDb!~zDN%X_S=e%zJ{3%|zbviM?w
z1&_j1ue0aQ)%B}$wI;kT+ZLk5si>itvRm<Ib!~3ZyY5x17<dk!c>cMMLEyfp-t7HG
z_X-YGxV0)cJ3Id<U-Ej=_S4)4JfyyDiG3avd)?HxSnODYj@W9kRlGOZ7_K^nw#A4q
zcv*5QQ=s8;&(!TJ+O3@0V#I%(_uknzNBsrkf$bFux&hC3%~}yV@z=W2JKJ4$OWUsb
zmK^@3Yu1hQ-(d$oh3!>*IxVNXzx;09PMdsD;Yqo-ng0nY9y$BsN9*ERhBZw`H_u7m
z8M=YtOU7}vbup&CpJNKnJS_@j*p|CHX5BSmj_FP}9F||<eD;NvA$Ixge*Ou;(vLn*
zQ)!vdBCs>2FR1EI_9^TCX<ME$GQ?h2p2*SAy|4YETK21p%f+XrvHRXyquDZH=a);X
zpDtRYu{y_U!6Sx!%k9<0%iXfJ-nuv6Hga0%QD4)exgS=ZsbXcgsmidRjsHRM`=gU*
hd!Ne<Ei_*}Z~wZhCN>k@I{$(?x}L6nF6*2UngAF6N>Km+

diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell6.png b/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell6.png
deleted file mode 100644
index 57e04a329b051ba1bb06ec0fe92d508cf9316afa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3914
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

diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell7.png b/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell7.png
deleted file mode 100644
index e07df5d7f6110892198bb92fa1657b5b7f36bee0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3908
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

diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell0.png b/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell_0.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell0.png
rename to src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell_0.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell1.png b/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell_1.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell1.png
rename to src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell_1.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell2.png b/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell_2.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell2.png
rename to src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell_2.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell3.png b/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell_3.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell3.png
rename to src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell_3.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell4.png b/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell_4.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell4.png
rename to src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell_4.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/energy_cell5.png b/src/main/resources/assets/appliedenergistics2/textures/block/energy_cell5.png
deleted file mode 100644
index d7ccdf5754227447531dddae69bfba45b24d4fa5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 382
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#PlZ
zx;Tbd_%EHL$aly=z;!2ITS&4%=w5eWr=aH5M<(54x+?v^(v@{uF;C^}KPOYHCA9vP
z8GrtN`{lOX%Vc$fua}ygFBbfLrkU%(zaKZAe%qE<am!@yn}S{I7_Pi{c+mS8qZWtK
zflWHDOh*j-*{}5e{kVrIpj*y}uVZoIA65YteMxo$xk;Q~Yu__`+o)d8=&;^ZA^6$d
zm&;0{Y)o%^pUP!VNftaYrE+_`(&=aCSA4i{A9OcikCek&yAzCtXEK;xEMx6h?{$oE
hW|qUV%v%@tMH!|yZ;M;5#=yY9;OXk;vd$@?2>=t$jo|<Q

diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/energy_cell6.png b/src/main/resources/assets/appliedenergistics2/textures/block/energy_cell6.png
deleted file mode 100644
index d2c80dfea7a2832510a6bf1c53dfb09c116699dc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 385
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#J>k
zx;Tbd_%EHbk@t`TkE=1S=*x@=5en5UTo)ArFDzZSaA8{W8po4tk&Rt~J@-8CZ_-<)
zcy#}qH~;TjPB(d*x4|d&`b~>I*Eh!eS`DusC;$F@+pm53-F*G%e0^gE)2fOOlL{NS
znm7!6gC{Z=p1I6en!MHW9K)4G?LEwoG9>C5Sq^$1W9(^9ajLy<-BA1HWIV%#Y{3&#
zDy8pk@#|imR_(d-X+w?<(@dlHpS)8d|454d`|Z9;x+k1@#Z`7og*HiFhPzuBK8BvO
jPzdHdVe>X`gZ{h2>E}1vhS)MNFfe$!`njxgN@xNAC=QI=

diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/energy_cell7.png b/src/main/resources/assets/appliedenergistics2/textures/block/energy_cell7.png
deleted file mode 100644
index 9c18613e915611ea259d2ffa67d0f27d11ec4bf3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 384
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#J>i
zx;Tbd_%EHbk@t`TkE<~+uS<vFCU*hWBnGY}CME_9+9|wVW+%8pdJ?|){hC&4$gBD9
zY0Cfq=XNg1EN@PIwd>rmLY<`fl>v+~@8zxE+%L1Vds|q2Gp%|a<BE%io2U0MhX}Yd
zWX|eh=}4T%w?caL*G#qrVzwzV0`7-@a4T@c8Sy39s0hFMeUI@?vj0D(hPZBrWoK@`
zSXLTkV|v^BlrDQpvfzm+mDA&uPCq)o;=_IWpt}isq#V}TonSOPlfm?28EeOSuVaie
hvmBmfmN(ZjGD#+9b2I-eWME)m@O1TaS?83{1OTS#hDHDY

diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/energy_cell0.png b/src/main/resources/assets/appliedenergistics2/textures/block/energy_cell_0.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/block/energy_cell0.png
rename to src/main/resources/assets/appliedenergistics2/textures/block/energy_cell_0.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/energy_cell1.png b/src/main/resources/assets/appliedenergistics2/textures/block/energy_cell_1.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/block/energy_cell1.png
rename to src/main/resources/assets/appliedenergistics2/textures/block/energy_cell_1.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/energy_cell2.png b/src/main/resources/assets/appliedenergistics2/textures/block/energy_cell_2.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/block/energy_cell2.png
rename to src/main/resources/assets/appliedenergistics2/textures/block/energy_cell_2.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/energy_cell3.png b/src/main/resources/assets/appliedenergistics2/textures/block/energy_cell_3.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/block/energy_cell3.png
rename to src/main/resources/assets/appliedenergistics2/textures/block/energy_cell_3.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/energy_cell4.png b/src/main/resources/assets/appliedenergistics2/textures/block/energy_cell_4.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/block/energy_cell4.png
rename to src/main/resources/assets/appliedenergistics2/textures/block/energy_cell_4.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/quartz_ore0.png b/src/main/resources/assets/appliedenergistics2/textures/block/quartz_ore_0.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/block/quartz_ore0.png
rename to src/main/resources/assets/appliedenergistics2/textures/block/quartz_ore_0.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/quartz_ore1.png b/src/main/resources/assets/appliedenergistics2/textures/block/quartz_ore_1.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/block/quartz_ore1.png
rename to src/main/resources/assets/appliedenergistics2/textures/block/quartz_ore_1.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/quartz_ore2.png b/src/main/resources/assets/appliedenergistics2/textures/block/quartz_ore_2.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/block/quartz_ore2.png
rename to src/main/resources/assets/appliedenergistics2/textures/block/quartz_ore_2.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/quartz_ore3.png b/src/main/resources/assets/appliedenergistics2/textures/block/quartz_ore_3.png
similarity index 100%
rename from src/main/resources/assets/appliedenergistics2/textures/block/quartz_ore3.png
rename to src/main/resources/assets/appliedenergistics2/textures/block/quartz_ore_3.png
diff --git a/src/main/resources/assets/appliedenergistics2/textures/desktop.ini b/src/main/resources/assets/appliedenergistics2/textures/desktop.ini
new file mode 100644
index 000000000..17c2f566e
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/textures/desktop.ini
@@ -0,0 +1,4 @@
+[ViewState]
+Mode=
+Vid=
+FolderType=Pictures
diff --git a/src/main/resources/assets/appliedenergistics2/textures/guis/desktop.ini b/src/main/resources/assets/appliedenergistics2/textures/guis/desktop.ini
new file mode 100644
index 000000000..17c2f566e
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/textures/guis/desktop.ini
@@ -0,0 +1,4 @@
+[ViewState]
+Mode=
+Vid=
+FolderType=Pictures