From b404dd06675bb5031c4c3095f950a83fb7d40e43 Mon Sep 17 00:00:00 2001
From: Alkalus <3060479+draknyte1@users.noreply.github.com>
Date: Tue, 14 Dec 2021 14:40:37 +0000
Subject: Fix PSS not forming correctly. Thanks to @Glease. Fix
 ItemBasicScrubberTurbine not working in Scrubbers. Improved scrubber handling
 slightly.

---
 src/resources/assets/miscutils/lang/en_US.lang | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/resources/assets/miscutils')

diff --git a/src/resources/assets/miscutils/lang/en_US.lang b/src/resources/assets/miscutils/lang/en_US.lang
index c70d102235..7a021cbc26 100644
--- a/src/resources/assets/miscutils/lang/en_US.lang
+++ b/src/resources/assets/miscutils/lang/en_US.lang
@@ -3235,6 +3235,7 @@ tile.Botmium Frame Box.name=Botmium Frame Box
 item.itemBasicTurbine.name=Basic Turbine
 item.itemBasicTurbine_0.name=Basic Iron Turbine
 item.itemBasicTurbine_1.name=Basic Bronze Turbine
+item.itemBasicTurbine_2.name=Basic Steel Turbine
 
 interaction.voidexcess.enabled=Void Excess Enabled
 interaction.voidexcess.disabled=Void Excess Disabled
-- 
cgit 


From 9e2108e939fb78c002fc0618b2200427dc88914f Mon Sep 17 00:00:00 2001
From: Alkalus <3060479+draknyte1@users.noreply.github.com>
Date: Tue, 14 Dec 2021 15:09:44 +0000
Subject: Changed IsaMill textures slightly.

---
 .../common/blocks/GregtechMetaCasingBlocks5.java        |   4 ++--
 .../blocks/textures/TexturesGrinderMultiblock.java      |   2 +-
 .../TileEntities/MACHINE_CASING_GRINDING_FACTORY.png    | Bin 671 -> 677 bytes
 .../blocks/TileEntities/MACHINE_CASING_PIPE_T1.png      | Bin 598 -> 656 bytes
 4 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/resources/assets/miscutils')

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks5.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks5.java
index c594ee0e5d..61c71ba552 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks5.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks5.java
@@ -60,9 +60,9 @@ extends GregtechMetaCasingBlocksAbstract {
 		if ((aMeta >= 0) && (aMeta < 16)) {
 			switch (aMeta) {
 				case 0:
-					return TexturesGtBlock.TEXTURE_CASING_GRINDING_MILL.getIcon();
-				case 1:
 					return TexturesGtBlock.TEXTURE_PIPE_GRINDING_MILL.getIcon();
+				case 1:
+					return TexturesGtBlock.TEXTURE_CASING_GRINDING_MILL.getIcon();
 				case 2:
 					return TexturesGtBlock.TEXTURE_GEARBOX_GRINDING_MILL.getIcon();
 				case 3:
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGrinderMultiblock.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGrinderMultiblock.java
index 962f981d3b..b254fdbc1e 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGrinderMultiblock.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGrinderMultiblock.java
@@ -85,7 +85,7 @@ public class TexturesGrinderMultiblock {
 
 	public IIcon handleCasingsGT(final IBlockAccess aWorld, final int xCoord, final int yCoord, final int zCoord, final int aSide, final GregtechMetaCasingBlocks5 ii) {
 		final int tMeta = aWorld.getBlockMetadata(xCoord, yCoord, zCoord);
-		if (tMeta != 0) {
+		if (tMeta != 1) {
 			return GregtechMetaCasingBlocks5.getStaticIcon(aSide, tMeta);
 		}
 		int tInvertLeftRightMod = aSide % 2 * 2 - 1;
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_GRINDING_FACTORY.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_GRINDING_FACTORY.png
index d8677eda87..b807fc0465 100644
Binary files a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_GRINDING_FACTORY.png and b/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_GRINDING_FACTORY.png differ
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_PIPE_T1.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_PIPE_T1.png
index c0065f8379..1b942edfc9 100644
Binary files a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_PIPE_T1.png and b/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_PIPE_T1.png differ
-- 
cgit