From 75584c6b6ddbca089d912061a2ab93d36a455b5a Mon Sep 17 00:00:00 2001 From: Tec Date: Sat, 11 Aug 2018 21:38:32 +0200 Subject: Push some collider work and change plasma nerf behaviour. --- .../gregtech/textures/blocks/iconsets/EM_COLLIDER.png | Bin 463 -> 582 bytes .../textures/blocks/iconsets/EM_COLLIDER_ACTIVE.png | Bin 856 -> 1007 bytes .../blocks/iconsets/EM_COLLIDER_ACTIVE_SLAVE.png | Bin 0 -> 874 bytes .../iconsets/EM_COLLIDER_ACTIVE_SLAVE.png.mcmeta | 5 +++++ .../textures/blocks/iconsets/EM_COLLIDER_SLAVE.png | Bin 0 -> 465 bytes .../blocks/iconsets/EM_COLLIDER_SLAVE.png.mcmeta | 5 +++++ 6 files changed, 10 insertions(+) create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_COLLIDER_ACTIVE_SLAVE.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_COLLIDER_ACTIVE_SLAVE.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_COLLIDER_SLAVE.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_COLLIDER_SLAVE.png.mcmeta (limited to 'src/main/resources') diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_COLLIDER.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_COLLIDER.png index 910d8cf7cd..187394cf54 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_COLLIDER.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_COLLIDER.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_COLLIDER_ACTIVE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_COLLIDER_ACTIVE.png index b9efef601a..9d3bfe7284 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_COLLIDER_ACTIVE.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_COLLIDER_ACTIVE.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_COLLIDER_ACTIVE_SLAVE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_COLLIDER_ACTIVE_SLAVE.png new file mode 100644 index 0000000000..e76cd31b5e Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_COLLIDER_ACTIVE_SLAVE.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_COLLIDER_ACTIVE_SLAVE.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_COLLIDER_ACTIVE_SLAVE.png.mcmeta new file mode 100644 index 0000000000..97596ba817 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_COLLIDER_ACTIVE_SLAVE.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":2 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_COLLIDER_SLAVE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_COLLIDER_SLAVE.png new file mode 100644 index 0000000000..58cb0a9573 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_COLLIDER_SLAVE.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_COLLIDER_SLAVE.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_COLLIDER_SLAVE.png.mcmeta new file mode 100644 index 0000000000..5e86a7cd5f --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/EM_COLLIDER_SLAVE.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":8 + } +} \ No newline at end of file -- cgit