From f02ee6da60a1c8f009b0e9d294d25dde06437e41 Mon Sep 17 00:00:00 2001 From: Connor-Colenso <52056774+Connor-Colenso@users.noreply.github.com> Date: Fri, 29 Jul 2022 22:26:26 +0100 Subject: New coil textures. Credit to GDCloud and BlueRaven. (#1170) Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> --- .../textures/blocks/iconsets/MACHINE_COIL_ETERNAL.png | Bin 2808 -> 1757 bytes .../blocks/iconsets/MACHINE_COIL_ETERNAL.png.mcmeta | 7 +------ .../textures/blocks/iconsets/MACHINE_COIL_HYPOGEN.png | Bin 1666 -> 4179 bytes .../blocks/iconsets/MACHINE_COIL_HYPOGEN.png.mcmeta | 7 +------ 4 files changed, 2 insertions(+), 12 deletions(-) (limited to 'src') diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_COIL_ETERNAL.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_COIL_ETERNAL.png index 742a8717bf..b2332e480f 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_COIL_ETERNAL.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_COIL_ETERNAL.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_COIL_ETERNAL.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_COIL_ETERNAL.png.mcmeta index ce674fa692..6575dfcc65 100644 --- a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_COIL_ETERNAL.png.mcmeta +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_COIL_ETERNAL.png.mcmeta @@ -1,6 +1 @@ -{ - "animation": { - "frametime": 3, - "frames": [0,1,2,3,4,5,6,7,8] - } -} +{"animation": {"frametime": 3}} diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_COIL_HYPOGEN.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_COIL_HYPOGEN.png index acf82a69b1..fc373a0b6b 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_COIL_HYPOGEN.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_COIL_HYPOGEN.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_COIL_HYPOGEN.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_COIL_HYPOGEN.png.mcmeta index 2b44373763..a668e18a77 100644 --- a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_COIL_HYPOGEN.png.mcmeta +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_COIL_HYPOGEN.png.mcmeta @@ -1,6 +1 @@ -{ - "animation": { - "frametime": 1, - "frames": [0,1,2,3] - } -} +{"animation": {"frametime": 2}} -- cgit