From 0193f9f45f79268edda7a0525600649fb7bf82c5 Mon Sep 17 00:00:00 2001 From: Robert Sosnitzka 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 --- .../ztic_addon/models/block/noctunyx_block.json | 6 ++++++ .../ztic_addon/models/block/noxtunyx_block.json | 6 ------ .../ztic_addon/models/item/tiberium_nugget.json | 6 ++++++ .../models/item/tiberium_shard_stable.json | 6 ------ .../ztic_addon/textures/blocks/adamantite_block.png | Bin 15849 -> 15797 bytes .../ztic_addon/textures/blocks/aegisalt_block.png | Bin 15903 -> 15915 bytes .../ztic_addon/textures/blocks/astrium_block.png | Bin 16000 -> 15985 bytes .../ztic_addon/textures/blocks/dyonite_block.png | Bin 16038 -> 16253 bytes .../ztic_addon/textures/blocks/ignitite_block.png | Bin 16488 -> 16451 bytes .../ztic_addon/textures/blocks/imperomite_block.png | Bin 15688 -> 15872 bytes .../ztic_addon/textures/blocks/lumixyl_block.png | Bin 16181 -> 16289 bytes .../ztic_addon/textures/blocks/nitronite_block.png | Bin 16053 -> 16298 bytes .../ztic_addon/textures/blocks/nucleum_block.png | Bin 15956 -> 15995 bytes .../ztic_addon/textures/blocks/rubium_block.png | Bin 15975 -> 15981 bytes .../ztic_addon/textures/items/tiberium_nugget.png | Bin 0 -> 15826 bytes .../textures/items/tiberium_shard_stable.png | Bin 15741 -> 0 bytes .../textures/items/tic/cryptogen_ingot.png | Bin 15830 -> 15861 bytes .../textures/items/tic/ignitite_ingot.png | Bin 16267 -> 16288 bytes .../textures/items/tic/imperomite_ingot.png | Bin 15797 -> 15813 bytes .../ztic_addon/textures/items/tic/lumixyl_ingot.png | Bin 16295 -> 16286 bytes .../textures/items/tic/meteorite_ingot.png | Bin 15799 -> 15815 bytes .../ztic_addon/textures/items/tic/mythril_ingot.png | Bin 15794 -> 15807 bytes .../textures/items/tic/nitronite_ingot.png | Bin 16247 -> 16254 bytes .../textures/items/tic/noctunyx_ingot.png | Bin 0 -> 16261 bytes .../textures/items/tic/noxtunyx_ingot.png | Bin 16264 -> 0 bytes .../ztic_addon/textures/items/tic/nucleum_ingot.png | Bin 15909 -> 15944 bytes .../ztic_addon/textures/items/tic/rubium_ingot.png | Bin 15943 -> 15962 bytes .../textures/items/tic/tiberium_ingot.png | Bin 15960 -> 15960 bytes .../textures/items/tic/titanite_ingot.png | Bin 16121 -> 16110 bytes .../textures/items/tic/vibranium_ingot.png | Bin 15871 -> 15891 bytes .../ztic_addon/textures/items/tic/violium_ingot.png | Bin 15828 -> 15861 bytes 31 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 create mode 100644 src/main/resources/assets/ztic_addon/textures/items/tiberium_nugget.png delete mode 100644 src/main/resources/assets/ztic_addon/textures/items/tiberium_shard_stable.png create mode 100644 src/main/resources/assets/ztic_addon/textures/items/tic/noctunyx_ingot.png delete mode 100644 src/main/resources/assets/ztic_addon/textures/items/tic/noxtunyx_ingot.png (limited to 'src/main/resources') 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 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 index 16b9e07..fc588a6 100644 Binary files a/src/main/resources/assets/ztic_addon/textures/blocks/adamantite_block.png and b/src/main/resources/assets/ztic_addon/textures/blocks/adamantite_block.png differ 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 index 088f066..9735a5d 100644 Binary files a/src/main/resources/assets/ztic_addon/textures/blocks/aegisalt_block.png and b/src/main/resources/assets/ztic_addon/textures/blocks/aegisalt_block.png differ 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 index 8e9d563..5617453 100644 Binary files a/src/main/resources/assets/ztic_addon/textures/blocks/astrium_block.png and b/src/main/resources/assets/ztic_addon/textures/blocks/astrium_block.png differ 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 index 8100e9e..0dbce24 100644 Binary files a/src/main/resources/assets/ztic_addon/textures/blocks/dyonite_block.png and b/src/main/resources/assets/ztic_addon/textures/blocks/dyonite_block.png differ 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 index c34643a..8294716 100644 Binary files a/src/main/resources/assets/ztic_addon/textures/blocks/ignitite_block.png and b/src/main/resources/assets/ztic_addon/textures/blocks/ignitite_block.png differ 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 index d6b5edf..57eee71 100644 Binary files a/src/main/resources/assets/ztic_addon/textures/blocks/imperomite_block.png and b/src/main/resources/assets/ztic_addon/textures/blocks/imperomite_block.png differ 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 index 96401b3..affd6dc 100644 Binary files a/src/main/resources/assets/ztic_addon/textures/blocks/lumixyl_block.png and b/src/main/resources/assets/ztic_addon/textures/blocks/lumixyl_block.png differ 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 index a561ea8..4fe8506 100644 Binary files a/src/main/resources/assets/ztic_addon/textures/blocks/nitronite_block.png and b/src/main/resources/assets/ztic_addon/textures/blocks/nitronite_block.png differ 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 index 7c17657..98abf4a 100644 Binary files a/src/main/resources/assets/ztic_addon/textures/blocks/nucleum_block.png and b/src/main/resources/assets/ztic_addon/textures/blocks/nucleum_block.png differ 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 index 45e8e96..3a745c8 100644 Binary files a/src/main/resources/assets/ztic_addon/textures/blocks/rubium_block.png and b/src/main/resources/assets/ztic_addon/textures/blocks/rubium_block.png differ diff --git a/src/main/resources/assets/ztic_addon/textures/items/tiberium_nugget.png b/src/main/resources/assets/ztic_addon/textures/items/tiberium_nugget.png new file mode 100644 index 0000000..2aeff63 Binary files /dev/null and b/src/main/resources/assets/ztic_addon/textures/items/tiberium_nugget.png differ 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_shard_stable.png deleted file mode 100644 index 40c74e7..0000000 Binary files a/src/main/resources/assets/ztic_addon/textures/items/tiberium_shard_stable.png and /dev/null differ 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 index 24999a9..69177ba 100644 Binary files a/src/main/resources/assets/ztic_addon/textures/items/tic/cryptogen_ingot.png and b/src/main/resources/assets/ztic_addon/textures/items/tic/cryptogen_ingot.png differ 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 index 7d55ac6..7fbbcad 100644 Binary files a/src/main/resources/assets/ztic_addon/textures/items/tic/ignitite_ingot.png and b/src/main/resources/assets/ztic_addon/textures/items/tic/ignitite_ingot.png differ 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 index 1dc600f..83ddca3 100644 Binary files a/src/main/resources/assets/ztic_addon/textures/items/tic/imperomite_ingot.png and b/src/main/resources/assets/ztic_addon/textures/items/tic/imperomite_ingot.png differ 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 index da2600d..9f7e64d 100644 Binary files a/src/main/resources/assets/ztic_addon/textures/items/tic/lumixyl_ingot.png and b/src/main/resources/assets/ztic_addon/textures/items/tic/lumixyl_ingot.png differ 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 index 973cf01..7295e5d 100644 Binary files a/src/main/resources/assets/ztic_addon/textures/items/tic/meteorite_ingot.png and b/src/main/resources/assets/ztic_addon/textures/items/tic/meteorite_ingot.png differ 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 index fb66c7b..3351cda 100644 Binary files a/src/main/resources/assets/ztic_addon/textures/items/tic/mythril_ingot.png and b/src/main/resources/assets/ztic_addon/textures/items/tic/mythril_ingot.png differ 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 index 13b0132..dd3561a 100644 Binary files a/src/main/resources/assets/ztic_addon/textures/items/tic/nitronite_ingot.png and b/src/main/resources/assets/ztic_addon/textures/items/tic/nitronite_ingot.png differ diff --git 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 new file mode 100644 index 0000000..10eadb3 Binary files /dev/null and b/src/main/resources/assets/ztic_addon/textures/items/tic/noctunyx_ingot.png differ 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/noxtunyx_ingot.png deleted file mode 100644 index 139630f..0000000 Binary files a/src/main/resources/assets/ztic_addon/textures/items/tic/noxtunyx_ingot.png and /dev/null differ 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 index f72befd..9c1da98 100644 Binary files a/src/main/resources/assets/ztic_addon/textures/items/tic/nucleum_ingot.png and b/src/main/resources/assets/ztic_addon/textures/items/tic/nucleum_ingot.png differ 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 index de33aee..c7baace 100644 Binary files a/src/main/resources/assets/ztic_addon/textures/items/tic/rubium_ingot.png and b/src/main/resources/assets/ztic_addon/textures/items/tic/rubium_ingot.png differ 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 index cd0fd75..817d28e 100644 Binary files a/src/main/resources/assets/ztic_addon/textures/items/tic/tiberium_ingot.png and b/src/main/resources/assets/ztic_addon/textures/items/tic/tiberium_ingot.png differ 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 index 283430e..d85c02c 100644 Binary files a/src/main/resources/assets/ztic_addon/textures/items/tic/titanite_ingot.png and b/src/main/resources/assets/ztic_addon/textures/items/tic/titanite_ingot.png differ 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 index 293ddf5..63c9c05 100644 Binary files a/src/main/resources/assets/ztic_addon/textures/items/tic/vibranium_ingot.png and b/src/main/resources/assets/ztic_addon/textures/items/tic/vibranium_ingot.png differ 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 index e918452..6393ea2 100644 Binary files a/src/main/resources/assets/ztic_addon/textures/items/tic/violium_ingot.png and b/src/main/resources/assets/ztic_addon/textures/items/tic/violium_ingot.png differ -- cgit v1.2.3