Merge branch 'experimental' of https://github.com/GTNewHorizons/GT5-Unofficial into experimental

1 files changed, 14 insertions, 0 deletions

diff --git a/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java b/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java
index 4c75abddcd..bf0afcf7ab 100644
--- a/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java
+++ b/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java
@@ -1931,6 +1931,8 @@ public class BaseMetaTileEntity extends BaseTileEntity implements IGregTechTileE
              }
              newInputSize = 6;
              newOutputSize = 1;
+
+
          } else if (mID >= 421 && mID <= 428){//Chemical Reactor
              if (nbtVersion < chemistryUpdateVersion) {
                  oldInputSize = 2;
@@ -1940,6 +1942,7 @@ public class BaseMetaTileEntity extends BaseTileEntity implements IGregTechTileE
              }
              newInputSize = 2;
              newOutputSize = 2;
+
          } else if (mID >= 531 && mID <= 538) {//Distillery
              if (nbtVersion < chemistryUpdateVersion) {
                  oldInputSize = 1;
@@ -1949,9 +1952,20 @@ public class BaseMetaTileEntity extends BaseTileEntity implements IGregTechTileE
              }
              newInputSize = 1;
              newOutputSize = 1;
+         } else if (mID >= 581 && mID <=588){//Mixer
+             if (nbtVersion < chemistryUpdateVersion) {
+                 oldInputSize = 4;
+                 oldOutputSize = 1;
+             }else{
+                 return slotIndex;
+             }
+             newInputSize = 6;
+             newOutputSize = 1;
+
          } else {
              return slotIndex;
          }
+
          int indexShift = 0;
          if (slotIndex >= GT_MetaTileEntity_BasicMachine.OTHER_SLOT_COUNT + oldInputSize) {indexShift += newInputSize - oldInputSize;
                 	}