diff options
| author | Robert Sosnitzka <robert.sosnitzka@gmail.com> | 2016-05-17 23:40:24 +0200 |
|---|---|---|
| committer | Robert Sosnitzka <robert.sosnitzka@gmail.com> | 2016-05-17 23:40:24 +0200 |
| commit | 0193f9f45f79268edda7a0525600649fb7bf82c5 (patch) | |
| tree | bcec6f79b3ba188cfa9c4b54a5f89ecbc9ca5da2 /src/main/resources/assets | |
| parent | 6e6a0e983f58232b4ee9cf30f355dd7fc8f89cd7 (diff) | |
Fixed some blocks and colors! Put back in integration of materials - something's wrong here
Diffstat (limited to 'src/main/resources/assets')
28 files changed, 6 insertions, 6 deletions
diff --git a/src/main/resources/assets/ztic_addon/models/block/noxtunyx_block.json b/src/main/resources/assets/ztic_addon/models/block/noctunyx_block.json index 28e5715..28e5715 100644 --- a/src/main/resources/assets/ztic_addon/models/block/noxtunyx_block.json +++ b/src/main/resources/assets/ztic_addon/models/block/noctunyx_block.json 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 diff --git a/src/main/resources/assets/ztic_addon/textures/blocks/adamantite_block.png b/src/main/resources/assets/ztic_addon/textures/blocks/adamantite_block.png Binary files differindex 16b9e07..fc588a6 100644 --- a/src/main/resources/assets/ztic_addon/textures/blocks/adamantite_block.png +++ b/src/main/resources/assets/ztic_addon/textures/blocks/adamantite_block.png diff --git a/src/main/resources/assets/ztic_addon/textures/blocks/aegisalt_block.png b/src/main/resources/assets/ztic_addon/textures/blocks/aegisalt_block.png Binary files differindex 088f066..9735a5d 100644 --- a/src/main/resources/assets/ztic_addon/textures/blocks/aegisalt_block.png +++ b/src/main/resources/assets/ztic_addon/textures/blocks/aegisalt_block.png diff --git a/src/main/resources/assets/ztic_addon/textures/blocks/astrium_block.png b/src/main/resources/assets/ztic_addon/textures/blocks/astrium_block.png Binary files differindex 8e9d563..5617453 100644 --- a/src/main/resources/assets/ztic_addon/textures/blocks/astrium_block.png +++ b/src/main/resources/assets/ztic_addon/textures/blocks/astrium_block.png diff --git a/src/main/resources/assets/ztic_addon/textures/blocks/dyonite_block.png b/src/main/resources/assets/ztic_addon/textures/blocks/dyonite_block.png Binary files differindex 8100e9e..0dbce24 100644 --- a/src/main/resources/assets/ztic_addon/textures/blocks/dyonite_block.png +++ b/src/main/resources/assets/ztic_addon/textures/blocks/dyonite_block.png diff --git a/src/main/resources/assets/ztic_addon/textures/blocks/ignitite_block.png b/src/main/resources/assets/ztic_addon/textures/blocks/ignitite_block.png Binary files differindex c34643a..8294716 100644 --- a/src/main/resources/assets/ztic_addon/textures/blocks/ignitite_block.png +++ b/src/main/resources/assets/ztic_addon/textures/blocks/ignitite_block.png diff --git a/src/main/resources/assets/ztic_addon/textures/blocks/imperomite_block.png b/src/main/resources/assets/ztic_addon/textures/blocks/imperomite_block.png Binary files differindex d6b5edf..57eee71 100644 --- a/src/main/resources/assets/ztic_addon/textures/blocks/imperomite_block.png +++ b/src/main/resources/assets/ztic_addon/textures/blocks/imperomite_block.png diff --git a/src/main/resources/assets/ztic_addon/textures/blocks/lumixyl_block.png b/src/main/resources/assets/ztic_addon/textures/blocks/lumixyl_block.png Binary files differindex 96401b3..affd6dc 100644 --- a/src/main/resources/assets/ztic_addon/textures/blocks/lumixyl_block.png +++ b/src/main/resources/assets/ztic_addon/textures/blocks/lumixyl_block.png diff --git a/src/main/resources/assets/ztic_addon/textures/blocks/nitronite_block.png b/src/main/resources/assets/ztic_addon/textures/blocks/nitronite_block.png Binary files differindex a561ea8..4fe8506 100644 --- a/src/main/resources/assets/ztic_addon/textures/blocks/nitronite_block.png +++ b/src/main/resources/assets/ztic_addon/textures/blocks/nitronite_block.png diff --git a/src/main/resources/assets/ztic_addon/textures/blocks/nucleum_block.png b/src/main/resources/assets/ztic_addon/textures/blocks/nucleum_block.png Binary files differindex 7c17657..98abf4a 100644 --- a/src/main/resources/assets/ztic_addon/textures/blocks/nucleum_block.png +++ b/src/main/resources/assets/ztic_addon/textures/blocks/nucleum_block.png diff --git a/src/main/resources/assets/ztic_addon/textures/blocks/rubium_block.png b/src/main/resources/assets/ztic_addon/textures/blocks/rubium_block.png Binary files differindex 45e8e96..3a745c8 100644 --- a/src/main/resources/assets/ztic_addon/textures/blocks/rubium_block.png +++ b/src/main/resources/assets/ztic_addon/textures/blocks/rubium_block.png diff --git a/src/main/resources/assets/ztic_addon/textures/items/tiberium_shard_stable.png b/src/main/resources/assets/ztic_addon/textures/items/tiberium_nugget.png Binary files differindex 40c74e7..2aeff63 100644 --- a/src/main/resources/assets/ztic_addon/textures/items/tiberium_shard_stable.png +++ b/src/main/resources/assets/ztic_addon/textures/items/tiberium_nugget.png diff --git 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 Binary files differindex 24999a9..69177ba 100644 --- 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 diff --git 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 Binary files differindex 7d55ac6..7fbbcad 100644 --- 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 diff --git 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 Binary files differindex 1dc600f..83ddca3 100644 --- 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 diff --git 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 Binary files differindex da2600d..9f7e64d 100644 --- 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 diff --git 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 Binary files differindex 973cf01..7295e5d 100644 --- 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 diff --git 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 Binary files differindex fb66c7b..3351cda 100644 --- 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 diff --git 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 Binary files differindex 13b0132..dd3561a 100644 --- 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 diff --git a/src/main/resources/assets/ztic_addon/textures/items/tic/noxtunyx_ingot.png b/src/main/resources/assets/ztic_addon/textures/items/tic/noctunyx_ingot.png Binary files differindex 139630f..10eadb3 100644 --- a/src/main/resources/assets/ztic_addon/textures/items/tic/noxtunyx_ingot.png +++ b/src/main/resources/assets/ztic_addon/textures/items/tic/noctunyx_ingot.png diff --git 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 Binary files differindex f72befd..9c1da98 100644 --- 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 diff --git 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 Binary files differindex de33aee..c7baace 100644 --- 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 diff --git 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 Binary files differindex cd0fd75..817d28e 100644 --- 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 diff --git 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 Binary files differindex 283430e..d85c02c 100644 --- 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 diff --git 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 Binary files differindex 293ddf5..63c9c05 100644 --- 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 diff --git 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 Binary files differindex e918452..6393ea2 100644 --- 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 |
