Merge remote-tracking branch 'origin/unstable' into

CircuitChemistryUpdateFollowup

Conflicts:
	src/main/java/gregtech/api/enums/Materials.java
	src/main/java/gregtech/common/GT_RecipeAdder.java
	src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java

1 files changed, 2 insertions, 1 deletions

diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Casings1.java b/src/main/java/gregtech/common/blocks/GT_Block_Casings1.java
index 26797d69c8..08f7118f66 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Casings1.java
+++ b/src/main/java/gregtech/common/blocks/GT_Block_Casings1.java
@@ -1,5 +1,6 @@
 package gregtech.common.blocks;

 

+import gregtech.api.enums.Dyes;

 import gregtech.api.enums.ItemList;

 import gregtech.api.enums.Textures;

 import gregtech.api.objects.GT_CopiedBlockTexture;

@@ -15,7 +16,7 @@ public class GT_Block_Casings1
         for (byte i = 0; i < 16; i = (byte) (i + 1)) {

             Textures.BlockIcons.CASING_BLOCKS[i] = new GT_CopiedBlockTexture(this, 6, i);

         }

-        Textures.BlockIcons.CASING_BLOCKS[111] = new GT_CopiedBlockTexture(this, 6, 0);

+        Textures.BlockIcons.CASING_BLOCKS[111] = new GT_CopiedBlockTexture(this, 6, 0,Dyes.MACHINE_METAL.mRGBa);

         GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "ULV Machine Casing");

         GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "LV Machine Casing");

         GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "MV Machine Casing");