Merge branch 'experimental' into Boxinator

112 files changed, 1653 insertions, 590 deletions

diff --git a/src/main/java/gregtech/GT_Mod.java b/src/main/java/gregtech/GT_Mod.java
index 5266eb246c..1fff51b4c4 100644
--- a/src/main/java/gregtech/GT_Mod.java
+++ b/src/main/java/gregtech/GT_Mod.java
@@ -81,6 +81,7 @@ import static gregtech.api.enums.GT_Values.MOD_ID_FR;
                 " required-after:" + StructureLib.MOD_ID + ";" +
                 " after:dreamcraft;" +
                 " after:Forestry;" +
+                " after:gendustry;" +
                 " after:PFAAGeologica;" +
                 " after:Thaumcraft;" +
                 " after:Railcraft;" +
@@ -337,6 +338,7 @@ public class GT_Mod implements IGT_Mod {
         gregtechproxy.mRenderTileAmbientOcclusion = GregTech_API.sClientDataFile.get("render", "TileAmbientOcclusion", true);
         gregtechproxy.mRenderGlowTextures = GregTech_API.sClientDataFile.get("render", "GlowTextures", true);
         gregtechproxy.mRenderFlippedMachinesFlipped = GregTech_API.sClientDataFile.get("render", "RenderFlippedMachinesFlipped", true);
+        gregtechproxy.mRenderIndicatorsOnHatch = GregTech_API.sClientDataFile.get("render", "RenderIndicatorsOnHatch", true);
 
         gregtechproxy.mMaxEqualEntitiesAtOneSpot = tMainConfig.get(aTextGeneral, "MaxEqualEntitiesAtOneSpot", 3).getInt(3);
         gregtechproxy.mSkeletonsShootGTArrows = tMainConfig.get(aTextGeneral, "SkeletonsShootGTArrows", 16).getInt(16);
diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java
index 0b47d4681a..8dcf5fe129 100644
--- a/src/main/java/gregtech/api/enums/ItemList.java
+++ b/src/main/java/gregtech/api/enums/ItemList.java
@@ -354,6 +354,7 @@ public enum ItemList implements IItemContainer {
     Schematic_2by2,
     Schematic_3by3,
     Schematic_Dust,
+    
     Circuit_Integrated,
     Circuit_Board_Basic,
     Circuit_Board_Advanced,
@@ -374,14 +375,12 @@ public enum ItemList implements IItemContainer {
     Circuit_Ultimate,
     Circuit_Biowarecomputer,
     Circuit_Biowaresupercomputer,
-    Rotor_LV,
+
+    Rotor_LV,//these aren't actually used
     Rotor_MV,
     Rotor_HV,
     Rotor_EV,
     Rotor_IV,
-    Rotor_LuV,
-    Rotor_ZPM,
-    Rotor_UV,
 
     Electric_Motor_LV,
     Electric_Motor_MV,
@@ -393,6 +392,11 @@ public enum ItemList implements IItemContainer {
     Electric_Motor_UV,
     Electric_Motor_UHV,
     Electric_Motor_UEV,
+    Electric_Motor_UIV,
+    Electric_Motor_UMV,
+    Electric_Motor_UXV,
+    Electric_Motor_OpV,
+    Electric_Motor_MAX,
 
     Electric_Pump_LV,
     Electric_Pump_MV,
@@ -404,12 +408,26 @@ public enum ItemList implements IItemContainer {
     Electric_Pump_UV,
     Electric_Pump_UHV,
     Electric_Pump_UEV,
+    Electric_Pump_UIV,
+    Electric_Pump_UMV,
+    Electric_Pump_UXV,
+    Electric_Pump_OpV,
+    Electric_Pump_MAX,
 
     Steam_Valve_LV,
     Steam_Valve_MV,
     Steam_Valve_HV,
     Steam_Valve_EV,
     Steam_Valve_IV,
+    
+    FluidRegulator_LV,
+    FluidRegulator_MV,
+    FluidRegulator_HV,
+    FluidRegulator_EV,
+    FluidRegulator_IV,
+    FluidRegulator_LuV,
+    FluidRegulator_ZPM,
+    FluidRegulator_UV,
 
     Conveyor_Module_LV,
     Conveyor_Module_MV,
@@ -421,6 +439,11 @@ public enum ItemList implements IItemContainer {
     Conveyor_Module_UV,
     Conveyor_Module_UHV,
     Conveyor_Module_UEV,
+    Conveyor_Module_UIV,
+    Conveyor_Module_UMV,
+    Conveyor_Module_UXV,
+    Conveyor_Module_OpV,
+    Conveyor_Module_MAX,
 
     Electric_Piston_LV,
     Electric_Piston_MV,
@@ -432,17 +455,11 @@ public enum ItemList implements IItemContainer {
     Electric_Piston_UV,
     Electric_Piston_UHV,
     Electric_Piston_UEV,
-
-    Field_Generator_LV,
-    Field_Generator_MV,
-    Field_Generator_HV,
-    Field_Generator_EV,
-    Field_Generator_IV,
-    Field_Generator_LuV,
-    Field_Generator_ZPM,
-    Field_Generator_UV,
-    Field_Generator_UHV,
-    Field_Generator_UEV,
+    Electric_Piston_UIV,
+    Electric_Piston_UMV,
+    Electric_Piston_UXV,
+    Electric_Piston_OpV,
+    Electric_Piston_MAX,
 
     Robot_Arm_LV,
     Robot_Arm_MV,
@@ -454,6 +471,11 @@ public enum ItemList implements IItemContainer {
     Robot_Arm_UV,
     Robot_Arm_UHV,
     Robot_Arm_UEV,
+    Robot_Arm_UIV,
+    Robot_Arm_UMV,
+    Robot_Arm_UXV,
+    Robot_Arm_OpV,
+    Robot_Arm_MAX,
 
     Emitter_LV,
     Emitter_MV,
@@ -465,6 +487,11 @@ public enum ItemList implements IItemContainer {
     Emitter_UV,
     Emitter_UHV,
     Emitter_UEV,
+    Emitter_UIV,
+    Emitter_UMV,
+    Emitter_UXV,
+    Emitter_OpV,
+    Emitter_MAX,
 
     Sensor_LV,
     Sensor_MV,
@@ -476,7 +503,28 @@ public enum ItemList implements IItemContainer {
     Sensor_UV,
     Sensor_UHV,
     Sensor_UEV,
+    Sensor_UIV,
+    Sensor_UMV,
+    Sensor_UXV,
+    Sensor_OpV,
+    Sensor_MAX,
 
+    Field_Generator_LV,
+    Field_Generator_MV,
+    Field_Generator_HV,
+    Field_Generator_EV,
+    Field_Generator_IV,
+    Field_Generator_LuV,
+    Field_Generator_ZPM,
+    Field_Generator_UV,
+    Field_Generator_UHV,
+    Field_Generator_UEV,
+    Field_Generator_UIV,
+    Field_Generator_UMV,
+    Field_Generator_UXV,
+    Field_Generator_OpV,
+    Field_Generator_MAX,
+    
     Battery_Hull_LV,
     Battery_Hull_MV,
     Battery_Hull_HV,
@@ -793,6 +841,9 @@ public enum ItemList implements IItemContainer {
     Casing_Firebox_Titanium,
     Casing_MiningNeutronium,
     Casing_MiningBlackPlutonium,
+    Casing_Advanced_Rhodium_Palladium,
+    Casing_Advanced_Iridium,
+    Casing_Magical,
 
     Hull_ULV,
     Hull_LV,
@@ -1563,14 +1614,6 @@ public enum ItemList implements IItemContainer {