Fixed some blocks and colors! Put back in integration of materials - something's wrong here

2016-05-17 23:40:24 +02:00
parent 6e6a0e983f
commit 0193f9f45f
34 changed files with 39 additions and 33 deletions
--- a/src/main/resources/assets/ztic_addon/models/block/noctunyx_block.json
+++ b/src/main/resources/assets/ztic_addon/models/block/noctunyx_block.json
--- a/src/main/resources/assets/ztic_addon/models/item/tiberium_nugget.json
+++ 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"
+  }
+}
--- 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
@@ -1,6 +0,0 @@
-{
-  "parent": "item/generated",
-  "textures": {
-    "layer0": "ztic_addon:items/tiberium_shard_stable"
-  }
-}
--- a/src/main/resources/assets/ztic_addon/textures/blocks/adamantite_block.png
+++ b/src/main/resources/assets/ztic_addon/textures/blocks/adamantite_block.png
--- a/src/main/resources/assets/ztic_addon/textures/blocks/aegisalt_block.png
+++ b/src/main/resources/assets/ztic_addon/textures/blocks/aegisalt_block.png
--- a/src/main/resources/assets/ztic_addon/textures/blocks/astrium_block.png
+++ b/src/main/resources/assets/ztic_addon/textures/blocks/astrium_block.png
--- a/src/main/resources/assets/ztic_addon/textures/blocks/dyonite_block.png
+++ b/src/main/resources/assets/ztic_addon/textures/blocks/dyonite_block.png
--- a/src/main/resources/assets/ztic_addon/textures/blocks/ignitite_block.png
+++ b/src/main/resources/assets/ztic_addon/textures/blocks/ignitite_block.png
--- a/src/main/resources/assets/ztic_addon/textures/blocks/imperomite_block.png
+++ b/src/main/resources/assets/ztic_addon/textures/blocks/imperomite_block.png
--- a/src/main/resources/assets/ztic_addon/textures/blocks/lumixyl_block.png
+++ b/src/main/resources/assets/ztic_addon/textures/blocks/lumixyl_block.png
--- a/src/main/resources/assets/ztic_addon/textures/blocks/nitronite_block.png
+++ b/src/main/resources/assets/ztic_addon/textures/blocks/nitronite_block.png
--- a/src/main/resources/assets/ztic_addon/textures/blocks/nucleum_block.png
+++ b/src/main/resources/assets/ztic_addon/textures/blocks/nucleum_block.png
--- a/src/main/resources/assets/ztic_addon/textures/blocks/rubium_block.png
+++ b/src/main/resources/assets/ztic_addon/textures/blocks/rubium_block.png
--- a/src/main/resources/assets/ztic_addon/textures/items/tiberium_shard_stable.png
+++ b/src/main/resources/assets/ztic_addon/textures/items/tiberium_shard_stable.png
--- a/src/main/resources/assets/ztic_addon/textures/items/tic/cryptogen_ingot.png
+++ b/src/main/resources/assets/ztic_addon/textures/items/tic/cryptogen_ingot.png
--- a/src/main/resources/assets/ztic_addon/textures/items/tic/ignitite_ingot.png
+++ b/src/main/resources/assets/ztic_addon/textures/items/tic/ignitite_ingot.png
--- a/src/main/resources/assets/ztic_addon/textures/items/tic/imperomite_ingot.png
+++ b/src/main/resources/assets/ztic_addon/textures/items/tic/imperomite_ingot.png
--- a/src/main/resources/assets/ztic_addon/textures/items/tic/lumixyl_ingot.png
+++ b/src/main/resources/assets/ztic_addon/textures/items/tic/lumixyl_ingot.png
--- a/src/main/resources/assets/ztic_addon/textures/items/tic/meteorite_ingot.png
+++ b/src/main/resources/assets/ztic_addon/textures/items/tic/meteorite_ingot.png
--- a/src/main/resources/assets/ztic_addon/textures/items/tic/mythril_ingot.png
+++ b/src/main/resources/assets/ztic_addon/textures/items/tic/mythril_ingot.png
--- a/src/main/resources/assets/ztic_addon/textures/items/tic/nitronite_ingot.png
+++ b/src/main/resources/assets/ztic_addon/textures/items/tic/nitronite_ingot.png
--- a/src/main/resources/assets/ztic_addon/textures/items/tic/noctunyx_ingot.png
+++ b/src/main/resources/assets/ztic_addon/textures/items/tic/noctunyx_ingot.png
--- a/src/main/resources/assets/ztic_addon/textures/items/tic/nucleum_ingot.png
+++ b/src/main/resources/assets/ztic_addon/textures/items/tic/nucleum_ingot.png
--- a/src/main/resources/assets/ztic_addon/textures/items/tic/rubium_ingot.png
+++ b/src/main/resources/assets/ztic_addon/textures/items/tic/rubium_ingot.png
--- a/src/main/resources/assets/ztic_addon/textures/items/tic/tiberium_ingot.png
+++ b/src/main/resources/assets/ztic_addon/textures/items/tic/tiberium_ingot.png
--- a/src/main/resources/assets/ztic_addon/textures/items/tic/titanite_ingot.png
+++ b/src/main/resources/assets/ztic_addon/textures/items/tic/titanite_ingot.png
--- a/src/main/resources/assets/ztic_addon/textures/items/tic/vibranium_ingot.png
+++ b/src/main/resources/assets/ztic_addon/textures/items/tic/vibranium_ingot.png
--- a/src/main/resources/assets/ztic_addon/textures/items/tic/violium_ingot.png
+++ b/src/main/resources/assets/ztic_addon/textures/items/tic/violium_ingot.png