From 6ae126921b95a38acef23e6025371f032f5ae2f4 Mon Sep 17 00:00:00 2001 From: Connor-Colenso <52056774+Connor-Colenso@users.noreply.github.com> Date: Tue, 5 Jul 2022 06:40:33 +0100 Subject: DTPF Laser (#1100) * DTPF Laser * exotic * Structure forms with TT laser, recipe broken. WIP. * Format amps in PA correctly. * Fix incorrect colouring on text. * New DTPF controller textures. * Update spacetime material. * Update DTPF texture * Update DTPF NEI page * Add spacetime wires * Tons of fixes/adjustments. * Localise achievements. * Typos * More fixes + move plasmas to mixer. * Spacetime adjustment * Spacetime blocks. * Spacetime wires. * Localise coils * Adjust DTPF fuels * Adjust DTPF fuels. * Stuff * Fix optimiser * DTPF * Depreciated Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> Co-authored-by: Yang Xizhi <60341015+GlodBlock@users.noreply.github.com> --- .../textures/blocks/iconsets/BLOCK_SPACETIME.png | Bin 0 -> 37428 bytes .../textures/blocks/iconsets/BLOCK_SPACETIME.png.mcmeta | 1 + .../textures/blocks/iconsets/OVERLAY_DTPF_OFF.png | Bin 0 -> 1111 bytes .../textures/blocks/iconsets/OVERLAY_DTPF_ON.png | Bin 0 -> 1244 bytes .../textures/blocks/iconsets/OVERLAY_DTPF_ON.png.mcmeta | 6 ++++++ .../materialicons/CUSTOM/spacetime/BLOCK_SPACETIME.png | Bin 0 -> 37428 bytes 6 files changed, 7 insertions(+) create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_SPACETIME.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_SPACETIME.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_DTPF_OFF.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_DTPF_ON.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_DTPF_ON.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/BLOCK_SPACETIME.png (limited to 'src/main/resources/assets/gregtech/textures/blocks') diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_SPACETIME.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_SPACETIME.png new file mode 100644 index 0000000000..fe5696854b Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_SPACETIME.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_SPACETIME.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_SPACETIME.png.mcmeta new file mode 100644 index 0000000000..0dab81071f --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_SPACETIME.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 3}} \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_DTPF_OFF.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_DTPF_OFF.png new file mode 100644 index 0000000000..0db6b6bf29 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_DTPF_OFF.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_DTPF_ON.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_DTPF_ON.png new file mode 100644 index 0000000000..9d397ecde5 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_DTPF_ON.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_DTPF_ON.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_DTPF_ON.png.mcmeta new file mode 100644 index 0000000000..f16b74ddb1 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_DTPF_ON.png.mcmeta @@ -0,0 +1,6 @@ +{ + "animation": { + "frametime": 8 + } +} + diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/BLOCK_SPACETIME.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/BLOCK_SPACETIME.png new file mode 100644 index 0000000000..fe5696854b Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/BLOCK_SPACETIME.png differ -- cgit