Merge remote-tracking branch 'origin/experimental' into experimental

13 files changed, 487 insertions, 234 deletions

diff --git a/src/main/java/gregtech/api/enums/ConfigCategories.java b/src/main/java/gregtech/api/enums/ConfigCategories.java
index 1919441539..513872ce38 100644
--- a/src/main/java/gregtech/api/enums/ConfigCategories.java
+++ b/src/main/java/gregtech/api/enums/ConfigCategories.java
@@ -63,4 +63,4 @@ public enum ConfigCategories {
         hammerquintupleplate,
 		scoop;
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/gregtech/api/enums/Dyes.java b/src/main/java/gregtech/api/enums/Dyes.java
index c8aec75f9e..418cea65ff 100644
--- a/src/main/java/gregtech/api/enums/Dyes.java
+++ b/src/main/java/gregtech/api/enums/Dyes.java
@@ -107,4 +107,4 @@ public enum Dyes implements IColorModulationContainer {
     public short[] getRGBA() {
         return mRGBa;
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/gregtech/api/enums/GTNH_ExtraMaterials.java b/src/main/java/gregtech/api/enums/GTNH_ExtraMaterials.java
index d8d254ce55..517b9beac8 100644
--- a/src/main/java/gregtech/api/enums/GTNH_ExtraMaterials.java
+++ b/src/main/java/gregtech/api/enums/GTNH_ExtraMaterials.java
@@ -60,4 +60,4 @@ public class GTNH_ExtraMaterials implements IMaterialHandler {
     public void onComponentIteration(Materials aMaterial) {
 
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/gregtech/api/enums/GT_Values.java b/src/main/java/gregtech/api/enums/GT_Values.java
index a0ccd107a6..7152663c42 100644
--- a/src/main/java/gregtech/api/enums/GT_Values.java
+++ b/src/main/java/gregtech/api/enums/GT_Values.java
@@ -300,5 +300,6 @@ public class GT_Values {
     public static boolean cls_enabled;
     
     public static boolean hideAssLineRecipes = false;
+    public static boolean updateFluidDisplayItems = true;
     public static final int STEAM_PER_WATER = 160;
 }
diff --git a/src/main/java/gregtech/api/enums/HeatingCoilLevel.java b/src/main/java/gregtech/api/enums/HeatingCoilLevel.java
index 2388a92cd3..d4446e31d0 100644
--- a/src/main/java/gregtech/api/enums/HeatingCoilLevel.java
+++ b/src/main/java/gregtech/api/enums/HeatingCoilLevel.java
@@ -66,4 +66,4 @@ public enum HeatingCoilLevel {
 
             return HeatingCoilLevel.values()[tier+2];
         }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/gregtech/api/enums/MaterialBuilder.java b/src/main/java/gregtech/api/enums/MaterialBuilder.java
index 7df2e4bc39..94d0db1e35 100644
--- a/src/main/java/gregtech/api/enums/MaterialBuilder.java
+++ b/src/main/java/gregtech/api/enums/MaterialBuilder.java
@@ -258,4 +258,4 @@ public class MaterialBuilder {
 		return this;
 	}
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java
index 47c6e06677..1bb38f7621 100644
--- a/src/main/java/gregtech/api/enums/Materials.java
+++ b/src/main/java/gregtech/api/enums/Materials.java
@@ -53,7 +53,7 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
     public static Materials Bismuth                 = new Materials(  90, TextureSet.SET_METALLIC          ,   6.0F,     64,  1, 1|2  |8   |32|64|128      , 100, 160, 160,   0,   "Bismuth"                 ,   "Bismuth"                       ,    0,       0,        544,    0, false, false,   2,   1,   1, Dyes.dyeCyan        , Element.Bi        , Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_AspectStack(TC_Aspects.INSTRUMENTUM, 1)));
     public static Materials Boron                   = new Materials(   9, TextureSet.SET_DULL              ,   1.0F,      0,  2, 1|32                      , 210, 250, 210,   0,   "Boron"                   ,   "Boron"                         ,    0,       0,       2349,    0, false, false,   1,   1,   1, Dyes.dyeWhite       , Element.B         , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 3)));
     public static Materials Caesium                 = new Materials(  62, TextureSet.SET_METALLIC          ,   1.0F,      0,  2, 1|2  |8   |32             , 255, 255, 255,   0,   "Caesium"                 ,   "Caesium"                       ,    0,       0,        301,    0, false, false,   4,   1,   1, Dyes._NULL          , Element.Cs        , Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_AspectStack(TC_Aspects.RADIO, 1)));
-    public static Materials Calcium                 = new Materials(  26, TextureSet.SET_METALLIC          ,   1.0F,      0,  2, 1         |32             , 255, 245, 245,   0,   "Calcium"                 ,   "Calcium"                       ,    0,       0,       1115,    0, false, false,   4,   1,   1, Dyes.dyePink        , Element.Ca        , Arrays.asList(new TC_AspectStack(TC_Aspects.SANO, 1), new TC_AspectStack(TC_Aspects.TUTAMEN, 1)));
+    public static Materials Calcium                 = new Materials(  26, TextureSet.SET_METALLIC          ,   1.0F,      0,  2, 1         |32             , 255, 245, 245,   0,   "Calcium"                 ,   "Calcium"                       ,    0,       0,       1115, 1115,  true, false,   4,   1,   1, Dyes.dyePink        , Element.Ca        , Arrays.asList(new TC_AspectStack(TC_Aspects.SANO, 1), new TC_AspectStack(TC_Aspects.TUTAMEN, 1)));
     public static Materials Carbon                  = new Materials(  10, TextureSet.SET_DULL              ,   1.0F,     64,  2, 1|2    |16|32|64|128      ,  20,  20,  20,   0,   "Carbon"                  ,   "Carbon"                        ,    0,       0,       3800,    0, false, false,   2,   1,   1, Dyes.dyeBlack       , Element.C         , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1), new TC_AspectStack(TC_Aspects.IGNIS, 1)));
     public static Materials Cadmium                 = new Materials(  55, TextureSet.SET_SHINY             ,   1.0F,      0,  2, 1    |8   |32             ,  50,  50,  60,   0,   "Cadmium"                 ,   "Cadmium"                       ,    0,       0,        594,    0, false, false,   3,   1,   1, Dyes.dyeGray        , Element.Cd        , Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 1), new TC_AspectStack(TC_Aspects.POTENTIA, 1), new TC_AspectStack(TC_Aspects.VENENUM, 1)));
     public static Materials Cerium                  = new Materials(  65, TextureSet.SET_METALLIC          ,   1.0F,      0,  2, 1|2  |8   |32             , 255, 255, 255,   0,   "Cerium"                  ,   "Cerium"                        ,    0,       0,       1068, 1068,  true, false,   4,   1,   1, Dyes._NULL          , Element.Ce        , Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_AspectStack(TC_Aspects.RADIO, 1)));
@@ -2094,9 +2094,33 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
         initMaterialProperties(); //No more material addition or manipulation should be done past this point!
         MATERIALS_ARRAY = MATERIALS_MAP.values().toArray(new Materials[0]); //Generate standard object array. This is a lot faster to loop over.
         VALUES = Arrays.asList(MATERIALS_ARRAY);
-        if (!Loader.isModLoaded("dreamcraft"))
-            if (!GT_Mod.gregtechproxy.mEnableAllComponents)
-                OrePrefixes.initMaterialComponents();
+        if (!Loader.isModLoaded("dreamcraft") && !GT_Mod.gregtechproxy.mEnableAllComponents)
+            OrePrefixes.initMaterialComponents();
+        else {
+            OrePrefixes.ingotHot.mDisabledItems.addAll(
+                    Arrays.stream(Materials.values()).parallel()
+                            .filter(OrePrefixes.ingotHot::doGenerateItem)
+                            .filter(m -> m.mBlastFurnaceTemp < 1750 && m.mAutoGenerateBlastFurnaceRecipes)
+                            .collect(Collectors.toSet())
+            );
+            OrePrefixes.ingotHot.disableComponent(Materials.Reinforced);
+            OrePrefixes.ingotHot.disableComponent(Materials.ConductiveIron);
+            OrePrefixes.ingotHot.disableComponent(Materials.FierySteel);
+            OrePrefixes.ingotHot.disableComponent(Materials.ElectricalSteel);
+            OrePrefixes.ingotHot.disableComponent(Materials.EndSteel);
+            OrePrefixes.ingotHot.disableComponent(Materials.Soularium);
+            OrePrefixes.ingotHot.disableComponent(Materials.EnergeticSilver);
+            OrePrefixes.ingotHot.disableComponent(Materials.Cheese);
+            OrePrefixes.ingotHot.disableComponent(Materials.Calcium);
+            OrePrefixes.ingotHot.disableComponent(Materials.Flerovium);
+            OrePrefixes.ingotHot.disableComponent(Materials.Cobalt);
+            OrePrefixes.ingotHot.disableComponent(Materials.RedstoneAlloy);
+            OrePrefixes.ingotHot.disableComponent(Materials.Ardite);
+            OrePrefixes.ingotHot.disableComponent(Materials.DarkSteel);
+            OrePrefixes.ingotHot.disableComponent(Materials.EnergeticAlloy);
+            OrePrefixes.ingotHot.disableComponent(Materials.PulsatingIron);
+            OrePrefixes.ingotHot.disableComponent(Materials.CrudeSteel);
+        }
 
         fillGeneratedMaterialsMap();
 
diff --git a/src/main/java/gregtech/api/enums/OreDictNames.java b/src/main/java/gregtech/api/enums/OreDictNames.java
index c9cf6af77a..d1c84f7119 100644
--- a/src/main/java/gregtech/api/enums/OreDictNames.java
+++ b/src/main/java/gregtech/api/enums/OreDictNames.java
@@ -75,4 +75,4 @@ public enum OreDictNames {
     craftingWireIron,
     craftingWireTin,
     craftingWorkBench,
-}
\ No newline at end of file
+}
diff --git a/src/main/java/gregtech/api/enums/SubTag.java b/src/main/java/gregtech/api/enums/SubTag.java
index b586728949..681358f8f1 100644
--- a/src/main/java/gregtech/api/enums/SubTag.java
+++ b/src/main/java/gregtech/api/enums/SubTag.java
@@ -279,4 +279,4 @@ public final class SubTag implements ICondition<ISubTagContainer> {
     public boolean isTrue(ISubTagContainer aObject) {
         return aObject.contains(this);
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/gregtech/api/enums/TC_Aspects.java b/src/main/java/gregtech/api/enums/TC_Aspects.java
index a7d7da1229..582ffb86f6 100644
--- a/src/main/java/gregtech/api/enums/TC_Aspects.java
+++ b/src/main/java/gregtech/api/enums/TC_Aspects.java
@@ -109,4 +109,4 @@ public enum TC_Aspects {
             return false;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/gregtech/api/enums/TextureSet.java b/src/main/java/gregtech/api/enums/TextureSet.java
index 38a96bb4ac..2e11e79cfb 100644
--- a/src/main/java/gregtech/api/enums/TextureSet.java
+++ b/src/main/java/gregtech/api/enums/TextureSet.java
@@ -47,8 +47,8 @@ public class TextureSet {
 
     public final IIconContainer[] mTextures = new IIconContainer[128];
     public final String mSetName;
-    private final static String aTextMatIconDir = "materialicons/";
-    private final static String aTextVoidDir = "/void";
+    private static final String aTextMatIconDir = "materialicons/";
+    private static final String aTextVoidDir = "/void";
 
     public TextureSet(String aSetName) {
         mSetName = aSetName;
@@ -181,4 +181,4 @@ public class TextureSet {
         mTextures[126] = new Textures.ItemIcons.CustomIcon(aTextMatIconDir + mSetName + "/handleMallet");
         mTextures[127] = new Textures.ItemIcons.CustomIcon(aTextMatIconDir + mSetName + "/toolHeadMallet");
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/gregtech/api/enums/Textures.java b/src/main/java/gregtech/api/enums/Textures.java
index b2afa4216e..b0f7f7a337 100644
--- a/src/main/java/gregtech/api/enums/Textures.java
+++ b/src/main/java/gregtech/api/enums/Textures.java
@@ -3,9 +3,7 @@ package gregtech.api.enums;
 import gregtech.api.GregTech_API;
 import gregtech.api.interfaces.IIconContainer;
 import gregtech.api.interfaces.ITexture;
-import gregtech.api.objects.GT_RenderedTexture;
-import gregtech.api.objects.GT_SidedTexture;
-import gregtech.api.objects.GT_StdRenderedTexture;
+import gregtech.api.render.TextureFactory;
 import gregtech.api.util.GT_Utility;
 import net.minecraft.client.renderer.texture.TextureMap;
 import net.minecraft.util.IIcon;
@@ -45,16 +43,20 @@ public class Textures {
         MACHINE_MAXV_BOTTOM,
 
         OVERLAY_SCHEST,
+        OVERLAY_SCHEST_GLOW,
         OVERLAY_STANK,
-        
+        OVERLAY_STANK_GLOW,
+
         OVERLAY_PIPELINE_FLUID_BACK,
         OVERLAY_PIPELINE_FLUID_FRONT,
-        OVERLAY_PIPELINE_FLUID_SIDE,  
-        
+        OVERLAY_PIPELINE_FLUID_SIDE,
+        OVERLAY_PIPELINE_FLUID_SIDE_GLOW,
+
         OVERLAY_PIPELINE_ITEM_BACK,
         OVERLAY_PIPELINE_ITEM_FRONT,
         OVERLAY_PIPELINE_ITEM_SIDE,
-        
+        OVERLAY_PIPELINE_ITEM_SIDE_GLOW,
+
         LONG_DISTANCE_PIPE_FLUID,
         LONG_DISTANCE_PIPE_ITEM,
 
@@ -88,8 +90,9 @@ public class Textures {
         OVERLAY_ENERGY_IN_POWER,
         OVERLAY_ENERGY_OUT_POWER,
         OVERLAY_AUTOMAINTENANCE,
+        OVERLAY_AUTOMAINTENANCE_GLOW,
         OVERLAY_AUTOMAINTENANCE_IDLE,
-        OVERLAY_TELEPORTER_SIDES,
+        OVERLAY_AUTOMAINTENANCE_IDLE_GLOW,
 
         //
         VOID // The Empty Texture
@@ -124,16 +127,26 @@ public class Textures {
         VENT_ADVANCED,
         COVER_WOOD_PLATE,
         ARROW_UP,
+        ARROW_UP_GLOW,
         ARROW_DOWN,
+        ARROW_DOWN_GLOW,
         ARROW_LEFT,
+        ARROW_LEFT_GLOW,
         ARROW_RIGHT,
+        ARROW_RIGHT_GLOW,
         AUTOMATION_FILTER,
+        AUTOMATION_FILTER_GLOW,
         AUTOMATION_TYPEFILTER,
+        AUTOMATION_TYPEFILTER_GLOW,
 
         AUTOMATION_CHESTBUFFER,
+        AUTOMATION_CHESTBUFFER_GLOW,
         AUTOMATION_SUPERBUFFER,
+        AUTOMATION_SUPERBUFFER_GLOW,
         AUTOMATION_REGULATOR,
+        AUTOMATION_REGULATOR_GLOW,
         AUTOMATION_ITEMDISTRIBUTOR,
+        AUTOMATION_ITEMDISTRIBUTOR_GLOW,
         CONCRETE_LIGHT_STONE,
         CONCRETE_LIGHT_COBBLE,
         CONCRETE_LIGHT_COBBLE_MOSSY,
@@ -224,6 +237,7 @@ public class Textures {
 
         MACHINE_BRONZEBLASTFURNACE,
         MACHINE_BRONZEBLASTFURNACE_ACTIVE,
+        MACHINE_BRONZEBLASTFURNACE_ACTIVE_GLOW,
         MACHINE_CASING_ROBUST_TUNGSTENSTEEL,
         MACHINE_CASING_CLEAN_STAINLESSSTEEL,
         MACHINE_CASING_STABLE_TITANIUM,
@@ -236,13 +250,19 @@ public class Textures {
         MACHINE_CASING_FUSION,
         MACHINE_CASING_FUSION_GLASS,
         MACHINE_CASING_FUSION_GLASS_YELLOW,
+        MACHINE_CASING_FUSION_GLASS_YELLOW_GLOW,
         MACHINE_CASING_FUSION_2,
 
         MACHINE_CASING_MAGIC,
+        MACHINE_CASING_MAGIC_GLOW,
         MACHINE_CASING_MAGIC_ACTIVE,
+        MACHINE_CASING_MAGIC_ACTIVE_GLOW,
         MACHINE_CASING_MAGIC_FRONT,
+        MACHINE_CASING_MAGIC_FRONT_GLOW,
         MACHINE_CASING_MAGIC_FRONT_ACTIVE,
+        MACHINE_CASING_MAGIC_FRONT_ACTIVE_GLOW,
         MACHINE_CASING_DRAGONEGG,
+        MACHINE_CASING_DRAGONEGG_GLOW,
         MACHINE_CASING_SOLID_STEEL,
 
         MACHINE_CASING_FROST_PROOF,
@@ -288,6 +308,7 @@ public class Textures {
 
         MACHINE_CASING_DENSEBRICKS,
         MACHINE_CASING_BRICKEDBLASTFURNACE_ACTIVE,
+        MACHINE_CASING_BRICKEDBLASTFURNACE_ACTIVE_GLOW,
         MACHINE_CASING_BRICKEDBLASTFURNACE_INACTIVE,
 
         MACHINE_COIL_KANTHAL,
@@ -302,68 +323,120 @@ public class Textures {
         MACHINE_COIL_TRINIUM,
         BOILER_SOLAR,
         BOILER_FRONT,
+        BOILER_FRONT_GLOW,
 
         BOILER_FRONT_ACTIVE,
+        BOILER_FRONT_ACTIVE_GLOW,
         BOILER_LAVA_FRONT,
+        BOILER_LAVA_FRONT_GLOW,
         BOILER_LAVA_FRONT_ACTIVE,
+        BOILER_LAVA_FRONT_ACTIVE_GLOW,
+
         NAQUADAH_REACTOR_SOLID_BACK,
+        NAQUADAH_REACTOR_SOLID_BACK_GLOW,
         NAQUADAH_REACTOR_SOLID_FRONT,
+        NAQUADAH_REACTOR_SOLID_FRONT_GLOW,
         NAQUADAH_REACTOR_SOLID_SIDE,
+        NAQUADAH_REACTOR_SOLID_SIDE_GLOW,
         NAQUADAH_REACTOR_SOLID_BOTTOM,
-
+        NAQUADAH_REACTOR_SOLID_BOTTOM_GLOW,
         NAQUADAH_REACTOR_SOLID_TOP,
+        NAQUADAH_REACTOR_SOLID_TOP_GLOW,
         NAQUADAH_REACTOR_SOLID_BACK_ACTIVE,
+        NAQUADAH_REACTOR_SOLID_BACK_ACTIVE_GLOW,
         NAQUADAH_REACTOR_SOLID_FRONT_ACTIVE,
+        NAQUADAH_REACTOR_SOLID_FRONT_ACTIVE_GLOW,
         NAQUADAH_REACTOR_SOLID_SIDE_ACTIVE,
+        NAQUADAH_REACTOR_SOLID_SIDE_ACTIVE_GLOW,
         NAQUADAH_REACTOR_SOLID_BOTTOM_ACTIVE,
-
+        NAQUADAH_REACTOR_SOLID_BOTTOM_ACTIVE_GLOW,
         NAQUADAH_REACTOR_SOLID_TOP_ACTIVE,
+        NAQUADAH_REACTOR_SOLID_TOP_ACTIVE_GLOW,
+
         NAQUADAH_REACTOR_FLUID_BACK,
+        NAQUADAH_REACTOR_FLUID_BACK_GLOW,
         NAQUADAH_REACTOR_FLUID_FRONT,
+        NAQUADAH_REACTOR_FLUID_FRONT_GLOW,
         NAQUADAH_REACTOR_FLUID_SIDE,
+        NAQUADAH_REACTOR_FLUID_SIDE_GLOW,
         NAQUADAH_REACTOR_FLUID_BOTTOM,
+        NAQUADAH_REACTOR_FLUID_BOTTOM_GLOW,
         NAQUADAH_REACTOR_FLUID_TOP,
-
+        NAQUADAH_REACTOR_FLUID_TOP_GLOW,
         NAQUADAH_REACTOR_FLUID_BACK_ACTIVE,
+        NAQUADAH_REACTOR_FLUID_BACK_ACTIVE_GLOW,
         NAQUADAH_REACTOR_FLUID_FRONT_ACTIVE,
+        NAQUADAH_REACTOR_FLUID_FRONT_ACTIVE_GLOW,
         NAQUADAH_REACTOR_FLUID_SIDE_ACTIVE,
+        NAQUADAH_REACTOR_FLUID_SIDE_ACTIVE_GLOW,
         NAQUADAH_REACTOR_FLUID_BOTTOM_ACTIVE,
+        NAQUADAH_REACTOR_FLUID_BOTTOM_ACTIVE_GLOW,
         NAQUADAH_REACTOR_FLUID_TOP_ACTIVE,
+        NAQUADAH_REACTOR_FLUID_TOP_ACTIVE_GLOW,
 
         DIESEL_GENERATOR_BACK,
+        DIESEL_GENERATOR_BACK_GLOW,
         DIESEL_GENERATOR_FRONT,
+        DIESEL_GENERATOR_FRONT_GLOW,
         DIESEL_GENERATOR_SIDE,
+        DIESEL_GENERATOR_SIDE_GLOW,
         DIESEL_GENERATOR_BOTTOM,
+        DIESEL_GENERATOR_BOTTOM_GLOW,
         DIESEL_GENERATOR_TOP,
+        DIESEL_GENERATOR_TOP_GLOW,
         DIESEL_GENERATOR_BACK_ACTIVE,
+        DIESEL_GENERATOR_BACK_ACTIVE_GLOW,
         DIESEL_GENERATOR_FRONT_ACTIVE,
-
+        DIESEL_GENERATOR_FRONT_ACTIVE_GLOW,
         DIESEL_GENERATOR_SIDE_ACTIVE,
+        DIESEL_GENERATOR_SIDE_ACTIVE_GLOW,
         DIESEL_GENERATOR_BOTTOM_ACTIVE,
+        DIESEL_GENERATOR_BOTTOM_ACTIVE_GLOW,
         DIESEL_GENERATOR_TOP_ACTIVE,
+        DIESEL_GENERATOR_TOP_ACTIVE_GLOW,
+
         GAS_TURBINE_BACK,
+        GAS_TURBINE_BACK_GLOW,
         GAS_TURBINE_FRONT,
+        GAS_TURBINE_FRONT_GLOW,
         GAS_TURBINE_SIDE,
+        GAS_TURBINE_SIDE_GLOW,
         GAS_TURBINE_BOTTOM,
-
+        GAS_TURBINE_BOTTOM_GLOW,
         GAS_TURBINE_TOP,
+        GAS_TURBINE_TOP_GLOW,
         GAS_TURBINE_BACK_ACTIVE,
+        GAS_TURBINE_BACK_ACTIVE_GLOW,
         GAS_TURBINE_FRONT_ACTIVE,
+        GAS_TURBINE_FRONT_ACTIVE_GLOW,
         GAS_TURBINE_SIDE_ACTIVE,
+        GAS_TURBINE_SIDE_ACTIVE_GLOW,
         GAS_TURBINE_BOTTOM_ACTIVE,
+        GAS_TURBINE_BOTTOM_ACTIVE_GLOW,
         GAS_TURBINE_TOP_ACTIVE,
-        STEAM_TURBINE_BACK,
+        GAS_TURBINE_TOP_ACTIVE_GLOW,
 
+        STEAM_TURBINE_BACK,
+        STEAM_TURBINE_BACK_GLOW,
         STEAM_TURBINE_FRONT,
+        STEAM_TURBINE_FRONT_GLOW,
         STEAM_TURBINE_SIDE,
+        STEAM_TURBINE_SIDE_GLOW,
         STEAM_TURBINE_BOTTOM,
+        STEAM_TURBINE_BOTTOM_GLOW,
         STEAM_TURBINE_TOP,
+        STEAM_TURBINE_TOP_GLOW,
         STEAM_TURBINE_BACK_ACTIVE,
+        STEAM_TURBINE_BACK_ACTIVE_GLOW,
         STEAM_TURBINE_FRONT_ACTIVE,
+        STEAM_TURBINE_FRONT_ACTIVE_GLOW,
         STEAM_TURBINE_SIDE_ACTIVE,
-
+        STEAM_TURBINE_SIDE_ACTIVE_GLOW,
         STEAM_TURBINE_BOTTOM_ACTIVE,
+        STEAM_TURBINE_BOTTOM_ACTIVE_GLOW,
         STEAM_TURBINE_TOP_ACTIVE,
+        STEAM_TURBINE_TOP_ACTIVE_GLOW,
+
         BLOCK_BRONZEPREIN,
         BLOCK_STEELPREIN,
         BLOCK_TITANIUMPREIN,
@@ -373,10 +446,10 @@ public class Textures {
         BLOCK_IRREIN,
         BLOCK_PLASCRETE,
         BLOCK_TSREIN,
+
         OVERLAY_LOCKER,
         OVERLAY_LOCKER_000,
         OVERLAY_LOCKER_001,
-
         OVERLAY_LOCKER_002,
         OVERLAY_LOCKER_003,
         OVERLAY_LOCKER_004,
@@ -386,27 +459,35 @@ public class Textures {
         OVERLAY_LOCKER_008,
         OVERLAY_LOCKER_009,
         OVERLAY_LOCKER_010,
-
         OVERLAY_LOCKER_011,
         OVERLAY_LOCKER_012,
         OVERLAY_LOCKER_013,
+
         OVERLAY_LENS,
         OVERLAY_PIPE,
         OVERLAY_PIPE_IN,
         OVERLAY_PIPE_OUT,
         OVERLAY_MUFFLER,
+
         OVERLAY_CONTROLLER,
         OVERLAY_ACTIVITYDETECTOR,
-
+        OVERLAY_ACTIVITYDETECTOR_GLOW,
         OVERLAY_ENERGYDETECTOR,
         OVERLAY_FLUIDDETECTOR,
         OVERLAY_ITEMDETECTOR,
+
         OVERLAY_FUSION1,
+        OVERLAY_FUSION1_GLOW,
         OVERLAY_FUSION2,
+        OVERLAY_FUSION2_GLOW,
         OVERLAY_FUSION3,
+        OVERLAY_FUSION3_GLOW,
         OVERLAY_SCREEN,
+        OVERLAY_SCREEN_GLOW,
         OVERLAY_QTANK,
+        OVERLAY_QTANK_GLOW,
         OVERLAY_QCHEST,
+        OVERLAY_QCHEST_GLOW,
         OVERLAY_SHUTTER,
 
         OVERLAY_CLOSET,
@@ -425,142 +506,260 @@ public class Textures {
         OVERLAY_ENERGY_IN_MULTI,
         OVERLAY_ENERGY_OUT_MULTI,
         OVERLAY_FRONT_LARGE_BOILER,
+        OVERLAY_FRONT_LARGE_BOILER_GLOW,
         OVERLAY_FRONT_LARGE_BOILER_ACTIVE,
+        OVERLAY_FRONT_LARGE_BOILER_ACTIVE_GLOW,
         OVERLAY_FRONT_VACUUM_FREEZER,
+        OVERLAY_FRONT_VACUUM_FREEZER_GLOW,
         OVERLAY_FRONT_VACUUM_FREEZER_ACTIVE,
+        OVERLAY_FRONT_VACUUM_FREEZER_ACTIVE_GLOW,
 
         OVERLAY_FRONT_MULTI_SMELTER,
+        OVERLAY_FRONT_MULTI_SMELTER_GLOW,
         OVERLAY_FRONT_MULTI_SMELTER_ACTIVE,
+        OVERLAY_FRONT_MULTI_SMELTER_ACTIVE_GLOW,
         OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE,
+        OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_GLOW,
         OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_ACTIVE,
+        OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_ACTIVE_GLOW,
         OVERLAY_FRONT_IMPLOSION_COMPRESSOR,
-
+        OVERLAY_FRONT_IMPLOSION_COMPRESSOR_GLOW,
         OVERLAY_FRONT_IMPLOSION_COMPRESSOR_ACTIVE,
+        OVERLAY_FRONT_IMPLOSION_COMPRESSOR_ACTIVE_GLOW,
+
         OVERLAY_TOP_POTIONBREWER,
+        OVERLAY_TOP_POTIONBREWER_GLOW,
         OVERLAY_TOP_REPLICATOR,
+        OVERLAY_TOP_REPLICATOR_GLOW,
         OVERLAY_TOP_MASSFAB,
+        OVERLAY_TOP_MASSFAB_GLOW,
         OVERLAY_TOP_STEAM_HAMMER,
+        OVERLAY_TOP_STEAM_HAMMER_GLOW,
         OVERLAY_TOP_STEAM_FURNACE,
+        OVERLAY_TOP_STEAM_FURNACE_GLOW,
         OVERLAY_TOP_STEAM_ALLOY_SMELTER,
+        OVERLAY_TOP_STEAM_ALLOY_SMELTER_GLOW,
 
         OVERLAY_TOP_STEAM_MACERATOR,
+        OVERLAY_TOP_STEAM_MACERATOR_GLOW,
         OVERLAY_TOP_STEAM_COMPRESSOR,
+        OVERLAY_TOP_STEAM_COMPRESSOR_GLOW,
         OVERLAY_TOP_STEAM_EXTRACTOR,
+        OVERLAY_TOP_STEAM_EXTRACTOR_GLOW,
         OVERLAY_TOP_DISASSEMBLER,
+        OVERLAY_TOP_DISASSEMBLER_GLOW,
         OVERLAY_TOP_BOXINATOR,
+        OVERLAY_TOP_BOXINATOR_GLOW,
         OVERLAY_TOP_ROCK_BREAKER,
+        OVERLAY_TOP_ROCK_BREAKER_GLOW,
         OVERLAY_TOP_SCANNER,
+        OVERLAY_TOP_SCANNER_GLOW,
 
         OVERLAY_FRONT_POTIONBREWER,
+        OVERLAY_FRONT_POTIONBREWER_GLOW,
         OVERLAY_FRONT_REPLICATOR,
+        OVERLAY_FRONT_REPLICATOR_GLOW,
         OVERLAY_FRONT_MASSFAB,
+        OVERLAY_FRONT_MASSFAB_GLOW,
         OVERLAY_FRONT_STEAM_HAMMER,
+        OVERLAY_FRONT_STEAM_HAMMER_GLOW,
+        OVERLAY_FRONT_STEAM_HAMMER_ACTIVE,
+        OVERLAY_FRONT_STEAM_HAMMER_ACTIVE_GLOW,
         OVERLAY_FRONT_STEAM_FURNACE,
+        OVERLAY_FRONT_STEAM_FURNACE_GLOW,
         OVERLAY_FRONT_STEAM_ALLOY_SMELTER,
+        OVERLAY_FRONT_STEAM_ALLOY_SMELTER_GLOW,
 
         OVERLAY_FRONT_STEAM_MACERATOR,
+        OVERLAY_FRONT_STEAM_MACERATOR_GLOW,
+        OVERLAY_FRONT_STEAM_MACERATOR_ACTIVE,
+        OVERLAY_FRONT_STEAM_MACERATOR_ACTIVE_GLOW,
         OVERLAY_FRONT_STEAM_COMPRESSOR,
+        OVERLAY_FRONT_STEAM_COMPRESSOR_GLOW,
         OVERLAY_FRONT_STEAM_EXTRACTOR,
+        OVERLAY_FRONT_STEAM_EXTRACTOR_GLOW,
         OVERLAY_FRONT_DISASSEMBLER,
+        OVERLAY_FRONT_DISASSEMBLER_GLOW,
+        OVERLAY_FRONT_DISASSEMBLER_ACTIVE,
+        OVERLAY_FRONT_DISASSEMBLER_ACTIVE_GLOW,
         OVERLAY_FRONT_BOXINATOR,
+        OVERLAY_FRONT_BOXINATOR_GLOW,
         OVERLAY_FRONT_ROCK_BREAKER,
+        OVERLAY_FRONT_ROCK_BREAKER_GLOW,
 
         OVERLAY_FRONT_SCANNER,
+        OVERLAY_FRONT_SCANNER_GLOW,
         OVERLAY_BOTTOM_POTIONBREWER,
+        OVERLAY_BOTTOM_POTIONBREWER_GLOW,
         OVERLAY_BOTTOM_REPLICATOR,
+        OVERLAY_BOTTOM_REPLICATOR_GLOW,
         OVERLAY_BOTTOM_MASSFAB,
+        OVERLAY_BOTTOM_MASSFAB_GLOW,
         OVERLAY_BOTTOM_STEAM_HAMMER,
+        OVERLAY_BOTTOM_STEAM_HAMMER_GLOW,
         OVERLAY_BOTTOM_STEAM_FURNACE,
+        OVERLAY_BOTTOM_STEAM_FURNACE_GLOW,
 
         OVERLAY_BOTTOM_STEAM_ALLOY_SMELTER,
+        OVERLAY_BOTTOM_STEAM_ALLOY_SMELTER_GLOW,
         OVERLAY_BOTTOM_STEAM_MACERATOR,
+        OVERLAY_BOTTOM_STEAM_MACERATOR_GLOW,
         OVERLAY_BOTTOM_STEAM_COMPRESSOR,
+        OVERLAY_BOTTOM_STEAM_COMPRESSOR_GLOW,
         OVERLAY_BOTTOM_STEAM_EXTRACTOR,
+        OVERLAY_BOTTOM_STEAM_EXTRACTOR_GLOW,
         OVERLAY_BOTTOM_DISASSEMBLER,
+        OVERLAY_BOTTOM_DISASSEMBLER_GLOW,
 
         OVERLAY_BOTTOM_BOXINATOR,
+        OVERLAY_BOTTOM_BOXINATOR_GLOW,
         OVERLAY_BOTTOM_ROCK_BREAKER,
+        OVERLAY_BOTTOM_ROCK_BREAKER_GLOW,
         OVERLAY_BOTTOM_SCANNER,
+        OVERLAY_BOTTOM_SCANNER_GLOW,
         OVERLAY_SIDE_POTIONBREWER,
+        OVERLAY_SIDE_POTIONBREWER_GLOW,
         OVERLAY_SIDE_REPLICATOR,
+        OVERLAY_SIDE_REPLICATOR_GLOW,
         OVERLAY_SIDE_MASSFAB,
+        OVERLAY_SIDE_MASSFAB_GLOW,
         OVERLAY_SIDE_STEAM_HAMMER,
+        OVERLAY_SIDE_STEAM_HAMMER_GLOW,
 
         OVERLAY_SIDE_STEAM_FURNACE,
+        OVERLAY_SIDE_STEAM_FURNACE_GLOW,
         OVERLAY_SIDE_STEAM_ALLOY_SMELTER,
+        OVERLAY_SIDE_STEAM_ALLOY_SMELTER_GLOW,
         OVERLAY_SIDE_STEAM_MACERATOR,
+        OVERLAY_SIDE_STEAM_MACERATOR_GLOW,
         OVERLAY_SIDE_STEAM_COMPRESSOR,
+        OVERLAY_SIDE_STEAM_COMPRESSOR_GLOW,
         OVERLAY_SIDE_STEAM_EXTRACTOR,
+        OVERLAY_SIDE_STEAM_EXTRACTOR_GLOW,
         OVERLAY_SIDE_DISASSEMBLER,
+        OVERLAY_SIDE_DISASSEMBLER_GLOW,
 
         OVERLAY_SIDE_BOXINATOR,
+        OVERLAY_SIDE_BOXINATOR_GLOW,
         OVERLAY_SIDE_ROCK_BREAKER,
+        OVERLAY_SIDE_ROCK_BREAKER_GLOW,
         OVERLAY_SIDE_SCANNER,
+        OVERLAY_SIDE_SCANNER_GLOW,
         OVERLAY_TOP_POTIONBREWER_ACTIVE,
+        OVERLAY_TOP_POTIONBREWER_ACTIVE_GLOW,
         OVERLAY_TOP_REPLICATOR_ACTIVE,
+        OVERLAY_TOP_REPLICATOR_ACTIVE_GLOW,
         OVERLAY_TOP_MASSFAB_ACTIVE,
+        OVERLAY_TOP_MASSFAB_ACTIVE_GLOW,
 
         OVERLAY_TOP_STEAM_HAMMER_ACTIVE,
+        OVERLAY_TOP_STEAM_HAMMER_ACTIVE_GLOW,
         OVERLAY_TOP_STEAM_FURNACE_ACTIVE,
+        OVERLAY_TOP_STEAM_FURNACE_ACTIVE_GLOW,
         OVERLAY_TOP_STEAM_ALLOY_SMELTER_ACTIVE,
+        OVERLAY_TOP_STEAM_ALLOY_SMELTER_ACTIVE_GLOW,
         OVERLAY_TOP_STEAM_MACERATOR_ACTIVE,
+        OVERLAY_TOP_STEAM_MACERATOR_ACTIVE_GLOW,
         OVERLAY_TOP_STEAM_COMPRESSOR_ACTIVE,
+        OVERLAY_TOP_STEAM_COMPRESSOR_ACTIVE_GLOW,
 
         OVERLAY_TOP_STEAM_EXTRACTOR_ACTIVE,
+        OVERLAY_TOP_STEAM_EXTRACTOR_ACTIVE_GLOW,
         OVERLAY_TOP_DISASSEMBLER_ACTIVE,
+        OVERLAY_TOP_DISASSEMBLER_ACTIVE_GLOW,
         OVERLAY_TOP_BOXINATOR_ACTIVE,
+        OVERLAY_TOP_BOXINATOR_ACTIVE_GLOW,
         OVERLAY_TOP_ROCK_BREAKER_ACTIVE,
+        OVERLAY_TOP_ROCK_BREAKER_ACTIVE_GLOW,
         OVERLAY_TOP_SCANNER_ACTIVE,
+        OVERLAY_TOP_SCANNER_ACTIVE_GLOW,
         OVERLAY_FRONT_POTIONBREWER_ACTIVE,
+        OVERLAY_FRONT_POTIONBREWER_ACTIVE_GLOW,
 
         OVERLAY_FRONT_REPLICATOR_ACTIVE,
+        OVERLAY_FRONT_REPLICATOR_ACTIVE_GLOW,
         OVERLAY_FRONT_MASSFAB_ACTIVE,
-        OVERLAY_FRONT_STEAM_HAMMER_ACTIVE,
+        OVERLAY_FRONT_MASSFAB_ACTIVE_GLOW,
         OVERLAY_FRONT_STEAM_FURNACE_ACTIVE,
+        OVERLAY_FRONT_STEAM_FURNACE_ACTIVE_GLOW,
         OVERLAY_FRONT_STEAM_ALLOY_SMELTER_ACTIVE,
+        OVERLAY_FRONT_STEAM_ALLOY_SMELTER_ACTIVE_GLOW,
 
-        OVERLAY_FRONT_STEAM_MACERATOR_ACTIVE,
         OVERLAY_FRONT_STEAM_COMPRESSOR_ACTIVE,
+        OVERLAY_FRONT_STEAM_COMPRESSOR_ACTIVE_GLOW,
         OVERLAY_FRONT_STEAM_EXTRACTOR_ACTIVE,
-        OVERLAY_FRONT_DISASSEMBLER_ACTIVE,
+        OVERLAY_FRONT_STEAM_EXTRACTOR_ACTIVE_GLOW,
         OVERLAY_FRONT_BOXINATOR_ACTIVE,
+        OVERLAY_FRONT_BOXINATOR_ACTIVE_GLOW,
 
         OVERLAY_FRONT_ROCK_BREAKER_ACTIVE,
+        OVERLAY_FRONT_ROCK_BREAKER_ACTIVE_GLOW,
         OVERLAY_FRONT_SCANNER_ACTIVE,
+        OVERLAY_FRONT_SCANNER_ACTIVE_GLOW,
         OVERLAY_BOTTOM_POTIONBREWER_ACTIVE,
+        OVERLAY_BOTTOM_POTIONBREWER_ACTIVE_GLOW,
         OVERLAY_BOTTOM_REPLICATOR_ACTIVE,
+        OVERLAY_BOTTOM_REPLICATOR_ACTIVE_GLOW,
         OVERLAY_BOTTOM_MASSFAB_ACTIVE,
+        OVERLAY_BOTTOM_MASSFAB_ACTIVE_GLOW,
 
         OVERLAY_BOTTOM_STEAM_HAMMER_ACTIVE,
+        OVERLAY_BOTTOM_STEAM_HAMMER_ACTIVE_GLOW,
         OVERLAY_BOTTOM_STEAM_FURNACE_ACTIVE,
+        OVERLAY_BOTTOM_STEAM_FURNACE_ACTIVE_GLOW,
         OVERLAY_BOTTOM_STEAM_ALLOY_SMELTER_ACTIVE,
+        OVERLAY_BOTTOM_STEAM_ALLOY_SMELTER_ACTIVE_GLOW,
         OVERLAY_BOTTOM_STEAM_MACERATOR_ACTIVE,
+        OVERLAY_BOTTOM_STEAM_MACERATOR_ACTIVE_GLOW,
         OVERLAY_BOTTOM_STEAM_COMPRESSOR_ACTIVE,
+        OVERLAY_BOTTOM_STEAM_COMPRESSOR_ACTIVE_GLOW,
 
         OVERLAY_BOTTOM_STEAM_EXTRACTOR_ACTIVE,
+        OVERLAY_BOTTOM_STEAM_EXTRACTOR_ACTIVE_GLOW,
         OVERLAY_BOTTOM_DISASSEMBLER_ACTIVE,
+        OVERLAY_BOTTOM_DISASSEMBLER_ACTIVE_GLOW,
         OVERLAY_BOTTOM_BOXINATOR_ACTIVE,
+        OVERLAY_BOTTOM_BOXINATOR_ACTIVE_GLOW,
         OVERLAY_BOTTOM_ROCK_BREAKER_ACTIVE,
+        OVERLAY_BOTTOM_ROCK_BREAKER_ACTIVE_GLOW,
         OVERLAY_BOTTOM_SCANNER_ACTIVE,
+        OVERLAY_BOTTOM_SCANNER_ACTIVE_GLOW,
 
         OVERLAY_SIDE_POTIONBREWER_ACTIVE,
+        OVERLAY_SIDE_POTIONBREWER_ACTIVE_GLOW,
         OVERLAY_SIDE_REPLICATOR_ACTIVE,
+        OVERLAY_SIDE_REPLICATOR_ACTIVE_GLOW,
         OVERLAY_SIDE_MASSFAB_ACTIVE,
+        OVERLAY_SIDE_MASSFAB_ACTIVE_GLOW,
         OVERLAY_SIDE_STEAM_HAMMER_ACTIVE,
+        OVERLAY_SIDE_STEAM_HAMMER_ACTIVE_GLOW,
         OVERLAY_SIDE_STEAM_FURNACE_ACTIVE,
+        OVERLAY_SIDE_STEAM_FURNACE_ACTIVE_GLOW,
         OVERLAY_SIDE_STEAM_ALLOY_SMELTER_ACTIVE,
+        OVERLAY_SIDE_STEAM_ALLOY_SMELTER_ACTIVE_GLOW,
 
         OVERLAY_SIDE_STEAM_MACERATOR_ACTIVE,
+        OVERLAY_SIDE_STEAM_MACERATOR_ACTIVE_GLOW,
         OVERLAY_SIDE_STEAM_COMPRESSOR_ACTIVE,
+        OVERLAY_SIDE_STEAM_COMPRESSOR_ACTIVE_GLOW,
         OVERLAY_SIDE_STEAM_EXTRACTOR_ACTIVE,
+        OVERLAY_SIDE_STEAM_EXTRACTOR_ACTIVE_GLOW,
         OVERLAY_SIDE_DISASSEMBLER_ACTIVE,
+        OVERLAY_SIDE_DISASSEMBLER_ACTIVE_GLOW,
         OVERLAY_SIDE_BOXINATOR_ACTIVE,
+        OVERLAY_SIDE_BOXINATOR_ACTIVE_GLOW,
 
         OVERLAY_SIDE_ROCK_BREAKER_ACTIVE,
+        OVERLAY_SIDE_ROCK_BREAKER_ACTIVE_GLOW,
         OVERLAY_SIDE_SCANNER_ACTIVE,
+        OVERLAY_SIDE_SCANNER_ACTIVE_GLOW,
         OVERLAY_ADV_PUMP,
         OVERLAY_TELEPORTER,
+        OVERLAY_TELEPORTER_GLOW,
         OVERLAY_TELEPORTER_ACTIVE,
+        OVERLAY_TELEPORTER_ACTIVE_GLOW,
+        OVERLAY_TELEPORTER_SIDES,
+        OVERLAY_TELEPORTER_SIDES_GLOW,
         FUSIONI_1,
         FUSIONI_2,
         FUSIONI_3,
@@ -865,33 +1064,57 @@ public class Textures {
         BASALT_BRICKS_CHISELED,
         BASALT_SMOOTH,
         OVERLAY_FRONT_HEAT_EXCHANGER_ACTIVE,
+        OVERLAY_FRONT_HEAT_EXCHANGER_ACTIVE_GLOW,
         OVERLAY_FRONT_HEAT_EXCHANGER,
+        OVERLAY_FRONT_HEAT_EXCHANGER_GLOW,
         OVERLAY_FRONT_PROCESSING_ARRAY_ACTIVE,
+        OVERLAY_FRONT_PROCESSING_ARRAY_ACTIVE_GLOW,
 
         OVERLAY_FRONT_PROCESSING_ARRAY,
+        OVERLAY_FRONT_PROCESSING_ARRAY_GLOW,
         OVERLAY_FRONT_OIL_DRILL_ACTIVE,
+        OVERLAY_FRONT_OIL_DRILL_ACTIVE_GLOW,
         OVERLAY_FRONT_OIL_DRILL,
+        OVERLAY_FRONT_OIL_DRILL_GLOW,
         OVERLAY_FRONT_DIESEL_ENGINE_ACTIVE,
+        OVERLAY_FRONT_DIESEL_ENGINE_ACTIVE_GLOW,
         OVERLAY_FRONT_DIESEL_ENGINE,
+        OVERLAY_FRONT_DIESEL_ENGINE_GLOW,
         OVERLAY_FRONT_EXTREME_DIESEL_ENGINE_ACTIVE,
+        OVERLAY_FRONT_EXTREME_DIESEL_ENGINE_ACTIVE_GLOW,
         OVERLAY_FRONT_EXTREME_DIESEL_ENGINE,
+        OVERLAY_FRONT_EXTREME_DIESEL_ENGINE_GLOW,
         OVERLAY_FRONT_PYROLYSE_OVEN_ACTIVE,
+        OVERLAY_FRONT_PYROLYSE_OVEN_AC