From 259b55e31b9db9079d4797e4b179737208e40695 Mon Sep 17 00:00:00 2001 From: Jason Mitchell Date: Sat, 26 Dec 2020 15:50:50 -0800 Subject: Adds long distance Item & Fluid pipelines and pipes. Inspired/ported from GT6 under LGPL. --- .../blocks/iconsets/OVERLAY_PIPELINE_FLUID_BACK.png | Bin 0 -> 534 bytes .../blocks/iconsets/OVERLAY_PIPELINE_FLUID_FRONT.png | Bin 0 -> 534 bytes .../blocks/iconsets/OVERLAY_PIPELINE_FLUID_SIDE.png | Bin 0 -> 362 bytes .../blocks/iconsets/OVERLAY_PIPELINE_ITEM_BACK.png | Bin 0 -> 516 bytes .../blocks/iconsets/OVERLAY_PIPELINE_ITEM_FRONT.png | Bin 0 -> 537 bytes .../blocks/iconsets/OVERLAY_PIPELINE_ITEM_SIDE.png | Bin 0 -> 387 bytes 6 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_PIPELINE_FLUID_BACK.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_PIPELINE_FLUID_FRONT.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_PIPELINE_FLUID_SIDE.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_PIPELINE_ITEM_BACK.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_PIPELINE_ITEM_FRONT.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_PIPELINE_ITEM_SIDE.png (limited to 'src/main/resources/assets/gregtech') diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_PIPELINE_FLUID_BACK.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_PIPELINE_FLUID_BACK.png new file mode 100644 index 0000000000..171c2e9b71 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_PIPELINE_FLUID_BACK.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_PIPELINE_FLUID_FRONT.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_PIPELINE_FLUID_FRONT.png new file mode 100644 index 0000000000..500e594028 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_PIPELINE_FLUID_FRONT.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_PIPELINE_FLUID_SIDE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_PIPELINE_FLUID_SIDE.png new file mode 100644 index 0000000000..47136fe5c2 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_PIPELINE_FLUID_SIDE.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_PIPELINE_ITEM_BACK.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_PIPELINE_ITEM_BACK.png new file mode 100644 index 0000000000..a52e83e3ae Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_PIPELINE_ITEM_BACK.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_PIPELINE_ITEM_FRONT.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_PIPELINE_ITEM_FRONT.png new file mode 100644 index 0000000000..19e84f1778 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_PIPELINE_ITEM_FRONT.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_PIPELINE_ITEM_SIDE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_PIPELINE_ITEM_SIDE.png new file mode 100644 index 0000000000..1d5cff3496 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_PIPELINE_ITEM_SIDE.png differ -- cgit From 82edef8ca76f8f594bf10137cbe6831b15b2ccf1 Mon Sep 17 00:00:00 2001 From: Jason Mitchell Date: Sat, 26 Dec 2020 17:16:01 -0800 Subject: Add ~~stolen~~ borrowed textures for long distance pipes --- .../textures/blocks/iconsets/LONG_DISTANCE_PIPE_FLUID.png | Bin 0 -> 408 bytes .../textures/blocks/iconsets/LONG_DISTANCE_PIPE_ITEM.png | Bin 0 -> 418 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LONG_DISTANCE_PIPE_FLUID.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/LONG_DISTANCE_PIPE_ITEM.png (limited to 'src/main/resources/assets/gregtech') diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LONG_DISTANCE_PIPE_FLUID.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LONG_DISTANCE_PIPE_FLUID.png new file mode 100644 index 0000000000..eda6e9363d Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LONG_DISTANCE_PIPE_FLUID.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LONG_DISTANCE_PIPE_ITEM.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LONG_DISTANCE_PIPE_ITEM.png new file mode 100644 index 0000000000..195f5927d6 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LONG_DISTANCE_PIPE_ITEM.png differ -- cgit From 7e51be749de428eacac0c67521bf47b36afb9f38 Mon Sep 17 00:00:00 2001 From: DreamMasterXXL Date: Sun, 27 Dec 2020 23:05:56 +0100 Subject: update Textures bump verion (cherry picked from commit 5cd8800ac37e8cbcf0bc6578cec0c3215c7df4f9) --- .../blocks/iconsets/LONG_DISTANCE_PIPE_FLUID.png | Bin 408 -> 3154 bytes .../blocks/iconsets/LONG_DISTANCE_PIPE_ITEM.png | Bin 418 -> 3175 bytes .../blocks/iconsets/OVERLAY_PIPELINE_ITEM_SIDE.png | Bin 387 -> 3155 bytes 3 files changed, 0 insertions(+), 0 deletions(-) (limited to 'src/main/resources/assets/gregtech') diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LONG_DISTANCE_PIPE_FLUID.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LONG_DISTANCE_PIPE_FLUID.png index eda6e9363d..027a05ee42 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LONG_DISTANCE_PIPE_FLUID.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LONG_DISTANCE_PIPE_FLUID.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LONG_DISTANCE_PIPE_ITEM.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LONG_DISTANCE_PIPE_ITEM.png index 195f5927d6..6dc66efb7e 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LONG_DISTANCE_PIPE_ITEM.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LONG_DISTANCE_PIPE_ITEM.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_PIPELINE_ITEM_SIDE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_PIPELINE_ITEM_SIDE.png index 1d5cff3496..67fd8754a1 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_PIPELINE_ITEM_SIDE.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_PIPELINE_ITEM_SIDE.png differ -- cgit From 1b9ef1b6c2803647a4ac21176320150698105c8c Mon Sep 17 00:00:00 2001 From: DreamMasterXXL Date: Mon, 28 Dec 2020 00:47:22 +0100 Subject: change textures (cherry picked from commit bcd9bd8449a810cc0022fc58806d3e78f995ef56) --- .../blocks/iconsets/LONG_DISTANCE_PIPE_FLUID.png | Bin 3154 -> 3124 bytes .../blocks/iconsets/LONG_DISTANCE_PIPE_ITEM.png | Bin 3175 -> 3232 bytes 2 files changed, 0 insertions(+), 0 deletions(-) (limited to 'src/main/resources/assets/gregtech') diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LONG_DISTANCE_PIPE_FLUID.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LONG_DISTANCE_PIPE_FLUID.png index 027a05ee42..02089e9113 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LONG_DISTANCE_PIPE_FLUID.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LONG_DISTANCE_PIPE_FLUID.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LONG_DISTANCE_PIPE_ITEM.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LONG_DISTANCE_PIPE_ITEM.png index 6dc66efb7e..64a8628606 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LONG_DISTANCE_PIPE_ITEM.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LONG_DISTANCE_PIPE_ITEM.png differ -- cgit From e141a558bbf5fa37c75d1420691fcf969e5759c8 Mon Sep 17 00:00:00 2001 From: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Date: Mon, 28 Dec 2020 04:28:06 +0100 Subject: Refactor + Added 2 more coils + Improved Tooltips --- .../textures/blocks/iconsets/MACHINE_COIL_HSSS.png | Bin 0 -> 496 bytes .../textures/blocks/iconsets/MACHINE_COIL_TRINIUM.png | Bin 0 -> 510 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_COIL_HSSS.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_COIL_TRINIUM.png (limited to 'src/main/resources/assets/gregtech') diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_COIL_HSSS.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_COIL_HSSS.png new file mode 100644 index 0000000000..3851bf2c41 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_COIL_HSSS.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_COIL_TRINIUM.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_COIL_TRINIUM.png new file mode 100644 index 0000000000..f110674d6b Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_COIL_TRINIUM.png differ -- cgit From a34efc6ade3fb0f05017bf697564aba79fb5d7d2 Mon Sep 17 00:00:00 2001 From: DreamMasterXXL Date: Fri, 1 Jan 2021 12:38:13 +0100 Subject: fix (GT)emitter and sensor textures (cherry picked from commit 9e483b5c905ec21d8c2193f146a8789a47b17a87) --- .../gregtech/textures/items/gt.metaitem.01/678.png | Bin 643 -> 3292 bytes .../gregtech/textures/items/gt.metaitem.01/679.png | Bin 629 -> 3285 bytes .../gregtech/textures/items/gt.metaitem.01/688.png | Bin 562 -> 3219 bytes .../gregtech/textures/items/gt.metaitem.01/698.png | Bin 513 -> 3164 bytes 4 files changed, 0 insertions(+), 0 deletions(-) (limited to 'src/main/resources/assets/gregtech') diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/678.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/678.png index 1fd18e5200..75ab908299 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/678.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/678.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/679.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/679.png index 13679b1c24..968385400f 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/679.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/679.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/688.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/688.png index 48bd4a3a6d..8573c22620 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/688.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/688.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/698.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/698.png index 5c97efb495..73be90cea7 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/698.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/698.png differ -- cgit