From 2855aaffb538f5dae1fcbbbd051bfb4e3a5951c8 Mon Sep 17 00:00:00 2001 From: Alkalus <3060479+draknyte1@users.noreply.github.com> Date: Thu, 1 Nov 2018 14:58:08 +0000 Subject: + Added new Radioactive ore. + Added Custom Nuclear Texture Set. % More material work. $ Fixed issue allowing Multiblocks to have > 1 Control Core Hatch. $ Fixed Broken Ore texture for ENRICHED TextureSet. $ Fixed a few fluid recipes broken in the refactor. --- .../textures/blocks/materialicons/ENRICHED/ore .png | Bin 271 -> 0 bytes .../textures/blocks/materialicons/ENRICHED/ore.png | Bin 0 -> 271 bytes .../textures/blocks/materialicons/NUCLEAR/block1.png | Bin 0 -> 504 bytes .../textures/blocks/materialicons/NUCLEAR/block2.png | Bin 0 -> 620 bytes .../textures/blocks/materialicons/NUCLEAR/block3.png | Bin 0 -> 642 bytes .../textures/blocks/materialicons/NUCLEAR/block4.png | Bin 0 -> 655 bytes .../textures/blocks/materialicons/NUCLEAR/block5.png | Bin 0 -> 427 bytes .../textures/blocks/materialicons/NUCLEAR/block6.png | Bin 0 -> 504 bytes .../textures/blocks/materialicons/NUCLEAR/foil.png | Bin 0 -> 368 bytes .../textures/blocks/materialicons/NUCLEAR/frameGt.png | Bin 0 -> 441 bytes .../textures/blocks/materialicons/NUCLEAR/ore.png | Bin 0 -> 665 bytes .../textures/blocks/materialicons/NUCLEAR/ore.png.mcmeta | 6 ++++++ .../textures/blocks/materialicons/NUCLEAR/oreSmall.png | Bin 0 -> 339 bytes .../textures/blocks/materialicons/NUCLEAR/pipeHuge.png | Bin 0 -> 348 bytes .../textures/blocks/materialicons/NUCLEAR/pipeLarge.png | Bin 0 -> 446 bytes .../textures/blocks/materialicons/NUCLEAR/pipeMedium.png | Bin 0 -> 442 bytes .../textures/blocks/materialicons/NUCLEAR/pipeSide.png | Bin 0 -> 401 bytes .../textures/blocks/materialicons/NUCLEAR/pipeSmall.png | Bin 0 -> 429 bytes .../textures/blocks/materialicons/NUCLEAR/pipeTiny.png | Bin 0 -> 418 bytes .../textures/blocks/materialicons/NUCLEAR/void.png | Bin 0 -> 143 bytes .../textures/blocks/materialicons/NUCLEAR/wire.png | Bin 0 -> 513 bytes 21 files changed, 6 insertions(+) delete mode 100644 src/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/ore .png create mode 100644 src/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/ore.png create mode 100644 src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/block1.png create mode 100644 src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/block2.png create mode 100644 src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/block3.png create mode 100644 src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/block4.png create mode 100644 src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/block5.png create mode 100644 src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/block6.png create mode 100644 src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/foil.png create mode 100644 src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/frameGt.png create mode 100644 src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/ore.png create mode 100644 src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/ore.png.mcmeta create mode 100644 src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/oreSmall.png create mode 100644 src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/pipeHuge.png create mode 100644 src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/pipeLarge.png create mode 100644 src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/pipeMedium.png create mode 100644 src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/pipeSide.png create mode 100644 src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/pipeSmall.png create mode 100644 src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/pipeTiny.png create mode 100644 src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/void.png create mode 100644 src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/wire.png (limited to 'src/resources/assets/gregtech/textures/blocks') diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/ore .png b/src/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/ore .png deleted file mode 100644 index 6e4e79b4fa..0000000000 Binary files a/src/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/ore .png and /dev/null differ diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/ore.png b/src/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/ore.png new file mode 100644 index 0000000000..6e4e79b4fa Binary files /dev/null and b/src/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/ore.png differ diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/block1.png b/src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/block1.png new file mode 100644 index 0000000000..b58ded215f Binary files /dev/null and b/src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/block1.png differ diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/block2.png b/src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/block2.png new file mode 100644 index 0000000000..a56a62ad1b Binary files /dev/null and b/src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/block2.png differ diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/block3.png b/src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/block3.png new file mode 100644 index 0000000000..6de77b309b Binary files /dev/null and b/src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/block3.png differ diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/block4.png b/src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/block4.png new file mode 100644 index 0000000000..e5f7b5e76f Binary files /dev/null and b/src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/block4.png differ diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/block5.png b/src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/block5.png new file mode 100644 index 0000000000..4bb49067ed Binary files /dev/null and b/src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/block5.png differ diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/block6.png b/src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/block6.png new file mode 100644 index 0000000000..b58ded215f Binary files /dev/null and b/src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/block6.png differ diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/foil.png b/src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/foil.png new file mode 100644 index 0000000000..2edad5a448 Binary files /dev/null and b/src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/foil.png differ diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/frameGt.png b/src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/frameGt.png new file mode 100644 index 0000000000..d93c52c24c Binary files /dev/null and b/src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/frameGt.png differ diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/ore.png b/src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/ore.png new file mode 100644 index 0000000000..92a1c3be3a Binary files /dev/null and b/src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/ore.png differ diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/ore.png.mcmeta b/src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/ore.png.mcmeta new file mode 100644 index 0000000000..d2c3416c73 --- /dev/null +++ b/src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/ore.png.mcmeta @@ -0,0 +1,6 @@ +{ + "animation":{ + "frametime":2, + "frames": [0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 3, 3, 2, 2, 1, 1] + } +} \ No newline at end of file diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/oreSmall.png b/src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/oreSmall.png new file mode 100644 index 0000000000..0a7e9d6e9e Binary files /dev/null and b/src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/oreSmall.png differ diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/pipeHuge.png b/src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/pipeHuge.png new file mode 100644 index 0000000000..7985626666 Binary files /dev/null and b/src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/pipeHuge.png differ diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/pipeLarge.png b/src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/pipeLarge.png new file mode 100644 index 0000000000..65529e2772 Binary files /dev/null and b/src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/pipeLarge.png differ diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/pipeMedium.png b/src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/pipeMedium.png new file mode 100644 index 0000000000..06b3e0d189 Binary files /dev/null and b/src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/pipeMedium.png differ diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/pipeSide.png b/src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/pipeSide.png new file mode 100644 index 0000000000..aec8883d6a Binary files /dev/null and b/src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/pipeSide.png differ diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/pipeSmall.png b/src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/pipeSmall.png new file mode 100644 index 0000000000..b5e620f045 Binary files /dev/null and b/src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/pipeSmall.png differ diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/pipeTiny.png b/src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/pipeTiny.png new file mode 100644 index 0000000000..c1ef295198 Binary files /dev/null and b/src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/pipeTiny.png differ diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/void.png b/src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/void.png new file mode 100644 index 0000000000..d83a131004 Binary files /dev/null and b/src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/void.png differ diff --git a/src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/wire.png b/src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/wire.png new file mode 100644 index 0000000000..455335e5c2 Binary files /dev/null and b/src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/wire.png differ -- cgit