From a422de6adbf60521fd29ca929b56587176d34489 Mon Sep 17 00:00:00 2001
From: shartte <sebastian@hartte.de>
Date: Sun, 14 Aug 2016 13:28:45 +0200
Subject: [PATCH] Fixes charger model and adds an appropriate item model. (#29)

---
 .../blockstates/tile.BlockCharger.json        |  2 +-
 .../models/block/tile.BlockCharger.json       | 21 ++++++++++---------
 .../models/item/tile.BlockCharger.json        |  3 +++
 3 files changed, 15 insertions(+), 11 deletions(-)
 create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/tile.BlockCharger.json

diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockCharger.json b/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockCharger.json
index d53d6e9f..dade42d4 100644
--- a/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockCharger.json
+++ b/src/main/resources/assets/appliedenergistics2/blockstates/tile.BlockCharger.json
@@ -1,5 +1,5 @@
 {
     "variants": {
-		"normal": { "model": "appliedenergistics2:tile.BlockCharger", "y":180}
+		"normal": { "model": "appliedenergistics2:tile.BlockCharger" }
     }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockCharger.json b/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockCharger.json
index 03963dab..e9cb249b 100644
--- a/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockCharger.json
+++ b/src/main/resources/assets/appliedenergistics2/models/block/tile.BlockCharger.json
@@ -1,4 +1,5 @@
 {
+    "parent": "block/orientable",
     "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)",
     "textures": {
         "0": "appliedenergistics2:blocks/BlockChargerSide",
@@ -8,8 +9,8 @@
     "elements": [
         {
             "name": "Back",
-            "from": [ 6.0, 0.0, 0.0 ], 
-            "to": [ 10.0, 16.0, 1.0 ], 
+            "from": [ 6.0, 0.0, 15.0 ],
+            "to": [ 10.0, 16.0, 16.0 ],
             "faces": {
                 "north": { "texture": "#0", "uv": [ 0.0, 0.0, 4.0, 16.0 ] },
                 "east": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 16.0 ] },
@@ -21,8 +22,8 @@
         },
         {
             "name": "Bottom",
-            "from": [ 2.0, 0.0, 1.0 ], 
-            "to": [ 14.0, 2.0, 14.0 ], 
+            "from": [ 2.0, 0.0, 2.0 ],
+            "to": [ 14.0, 2.0, 15.0 ],
             "faces": {
                 "north": { "texture": "#0", "uv": [ 0.0, 0.0, 12.0, 2.0 ] },
                 "east": { "texture": "#0", "uv": [ 0.0, 0.0, 13.0, 2.0 ] },
@@ -34,8 +35,8 @@
         },
         {
             "name": "Top",
-            "from": [ 2.0, 13.0, 1.0 ], 
-            "to": [ 14.0, 16.0, 14.0 ], 
+            "from": [ 2.0, 13.0, 2.0 ],
+            "to": [ 14.0, 16.0, 15.0 ],
             "faces": {
                 "north": { "texture": "#0", "uv": [ 0.0, 0.0, 12.0, 3.0 ] },
                 "east": { "texture": "#0", "uv": [ 0.0, 0.0, 13.0, 3.0 ] },
@@ -47,8 +48,8 @@
         },
         {
             "name": "BottomTop",
-            "from": [ 3.0, 2.0, 3.0 ], 
-            "to": [ 13.0, 3.0, 13.0 ], 
+            "from": [ 3.0, 2.0, 3.0 ],
+            "to": [ 13.0, 3.0, 13.0 ],
             "faces": {
                 "north": { "texture": "#0", "uv": [ 0.0, 0.0, 10.0, 1.0 ] },
                 "east": { "texture": "#0", "uv": [ 0.0, 0.0, 10.0, 1.0 ] },
@@ -60,8 +61,8 @@
         },
         {
             "name": "TopTop",
-            "from": [ 3.0, 12.0, 3.0 ], 
-            "to": [ 13.0, 13.0, 13.0 ], 
+            "from": [ 3.0, 12.0, 3.0 ],
+            "to": [ 13.0, 13.0, 13.0 ],
             "faces": {
                 "north": { "texture": "#0", "uv": [ 0.0, 0.0, 10.0, 1.0 ] },
                 "east": { "texture": "#0", "uv": [ 0.0, 0.0, 10.0, 1.0 ] },
diff --git a/src/main/resources/assets/appliedenergistics2/models/item/tile.BlockCharger.json b/src/main/resources/assets/appliedenergistics2/models/item/tile.BlockCharger.json
new file mode 100644
index 00000000..8a99b54b
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/models/item/tile.BlockCharger.json
@@ -0,0 +1,3 @@
+{
+    "parent": "appliedenergistics2:block/tile.BlockCharger"
+}
\ No newline at end of file