From 0193f9f45f79268edda7a0525600649fb7bf82c5 Mon Sep 17 00:00:00 2001
From: Robert Sosnitzka <robert.sosnitzka@gmail.com>
Date: Tue, 17 May 2016 23:40:24 +0200
Subject: Fixed some blocks and colors! Put back in integration of materials -
 something's wrong here

---
 .../resources/assets/ztic_addon/models/block/noctunyx_block.json    | 6 ++++++
 .../resources/assets/ztic_addon/models/block/noxtunyx_block.json    | 6 ------
 .../resources/assets/ztic_addon/models/item/tiberium_nugget.json    | 6 ++++++
 .../assets/ztic_addon/models/item/tiberium_shard_stable.json        | 6 ------
 4 files changed, 12 insertions(+), 12 deletions(-)
 create mode 100644 src/main/resources/assets/ztic_addon/models/block/noctunyx_block.json
 delete mode 100644 src/main/resources/assets/ztic_addon/models/block/noxtunyx_block.json
 create mode 100644 src/main/resources/assets/ztic_addon/models/item/tiberium_nugget.json
 delete mode 100644 src/main/resources/assets/ztic_addon/models/item/tiberium_shard_stable.json

(limited to 'src/main/resources/assets/ztic_addon/models')

diff --git a/src/main/resources/assets/ztic_addon/models/block/noctunyx_block.json b/src/main/resources/assets/ztic_addon/models/block/noctunyx_block.json
new file mode 100644
index 0000000..28e5715
--- /dev/null
+++ b/src/main/resources/assets/ztic_addon/models/block/noctunyx_block.json
@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "ztic_addon:blocks/noctunyx_block"
+  }
+}
diff --git a/src/main/resources/assets/ztic_addon/models/block/noxtunyx_block.json b/src/main/resources/assets/ztic_addon/models/block/noxtunyx_block.json
deleted file mode 100644
index 28e5715..0000000
--- a/src/main/resources/assets/ztic_addon/models/block/noxtunyx_block.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "block/cube_all",
-  "textures": {
-    "all": "ztic_addon:blocks/noctunyx_block"
-  }
-}
diff --git a/src/main/resources/assets/ztic_addon/models/item/tiberium_nugget.json b/src/main/resources/assets/ztic_addon/models/item/tiberium_nugget.json
new file mode 100644
index 0000000..bb9a137
--- /dev/null
+++ b/src/main/resources/assets/ztic_addon/models/item/tiberium_nugget.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "ztic_addon:items/tiberium_nugget"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/ztic_addon/models/item/tiberium_shard_stable.json b/src/main/resources/assets/ztic_addon/models/item/tiberium_shard_stable.json
deleted file mode 100644
index bed14a1..0000000
--- a/src/main/resources/assets/ztic_addon/models/item/tiberium_shard_stable.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "item/generated",
-  "textures": {
-    "layer0": "ztic_addon:items/tiberium_shard_stable"
-  }
-}
\ No newline at end of file
-- 
cgit v1.2.3