From 1103e0d46bf6c4a7dc96fdabbb76628b0b8ca3a8 Mon Sep 17 00:00:00 2001 From: Mary <33456283+FourIsTheNumber@users.noreply.github.com> Date: Thu, 18 Jul 2024 04:58:35 -0400 Subject: Add a multiblock for Fluid Canner/Canner (#2729) * Ported changes from canner-dev branch because I have thoroughly messed up my branch management. * Renamed multi, fixed textures, spotless --- src/main/resources/assets/gregtech/lang/en_US.lang | 2 ++ .../blocks/iconsets/OVERLAY_FRONT_MULTI_CANNER.png | Bin 0 -> 254 bytes .../blocks/iconsets/OVERLAY_FRONT_MULTI_CANNER_ACTIVE.png | Bin 0 -> 255 bytes .../iconsets/OVERLAY_FRONT_MULTI_CANNER_ACTIVE_GLOW.png | Bin 0 -> 255 bytes .../blocks/iconsets/OVERLAY_FRONT_MULTI_CANNER_GLOW.png | Bin 0 -> 256 bytes 5 files changed, 2 insertions(+) create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_MULTI_CANNER.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_MULTI_CANNER_ACTIVE.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_MULTI_CANNER_ACTIVE_GLOW.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_MULTI_CANNER_GLOW.png (limited to 'src/main/resources') diff --git a/src/main/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang index d4d6b7e60d..9d5a59264c 100644 --- a/src/main/resources/assets/gregtech/lang/en_US.lang +++ b/src/main/resources/assets/gregtech/lang/en_US.lang @@ -330,6 +330,8 @@ GT5U.GTPP_MULTI_INDUSTRIAL_PLATE_PRESS.mode.1=Bending GT5U.GTPP_MULTI_INDUSTRIAL_MULTI_MACHINE.mode.0=Metal GT5U.GTPP_MULTI_INDUSTRIAL_MULTI_MACHINE.mode.1=Fluid GT5U.GTPP_MULTI_INDUSTRIAL_MULTI_MACHINE.mode.2=Misc +GT5U.MULTI_CANNER.mode.0=Canner +GT5U.MULTI_CANNER.mode.1=Fluid Canner GT5U.GTPP_MULTI_INDUSTRIAL_DEHYDRATOR.mode.0=Vacuum Furnace GT5U.GTPP_MULTI_INDUSTRIAL_DEHYDRATOR.mode.1=Dehydrator GT5U.GTPP_MULTI_MASS_FABRICATOR.mode.0=Mass Fabricator diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_MULTI_CANNER.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_MULTI_CANNER.png new file mode 100644 index 0000000000..6092ec4c18 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_MULTI_CANNER.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_MULTI_CANNER_ACTIVE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_MULTI_CANNER_ACTIVE.png new file mode 100644 index 0000000000..ffd43d8dc2 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_MULTI_CANNER_ACTIVE.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_MULTI_CANNER_ACTIVE_GLOW.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_MULTI_CANNER_ACTIVE_GLOW.png new file mode 100644 index 0000000000..3bb29bbda6 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_MULTI_CANNER_ACTIVE_GLOW.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_MULTI_CANNER_GLOW.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_MULTI_CANNER_GLOW.png new file mode 100644 index 0000000000..b7955d63ab Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_MULTI_CANNER_GLOW.png differ -- cgit