From 98ced974896cd23e4011357bfb7a85699a58db72 Mon Sep 17 00:00:00 2001
From: Draknyte1 <3060479+draknyte1@users.noreply.github.com>
Date: Sun, 17 Jun 2018 16:26:10 +1000
Subject: + Added the Industrial Mixer.

---
 .../core/entity/monster/EntityStaballoyConstruct.java       | 13 +++++--------
 src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java        |  1 +
 2 files changed, 6 insertions(+), 8 deletions(-)

(limited to 'src/Java/gtPlusPlus/core')

diff --git a/src/Java/gtPlusPlus/core/entity/monster/EntityStaballoyConstruct.java b/src/Java/gtPlusPlus/core/entity/monster/EntityStaballoyConstruct.java
index ff632fe283..bdc239b9ce 100644
--- a/src/Java/gtPlusPlus/core/entity/monster/EntityStaballoyConstruct.java
+++ b/src/Java/gtPlusPlus/core/entity/monster/EntityStaballoyConstruct.java
@@ -4,7 +4,10 @@ import java.lang.reflect.Field;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-
+import gtPlusPlus.core.util.math.MathUtils;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+import gtPlusPlus.core.util.reflect.ReflectionUtils;
+import gtPlusPlus.core.world.explosions.ExplosionHandler;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.*;
@@ -19,12 +22,6 @@ import net.minecraft.util.MathHelper;
 import net.minecraft.village.Village;
 import net.minecraft.world.World;
 
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.util.math.MathUtils;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
-import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import gtPlusPlus.core.world.explosions.ExplosionHandler;
-
 public class EntityStaballoyConstruct extends EntityIronGolem {
 
 	/*
@@ -382,7 +379,7 @@ public class EntityStaballoyConstruct extends EntityIronGolem {
 		super.onEntityUpdate();
 	}
 
-	private Field mFirstUpdateField;
+	private static Field mFirstUpdateField;
 
 	@Override
 	public int getMaxSpawnedInChunk() {
diff --git a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
index 822fca6a26..cafc650352 100644
--- a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
+++ b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
@@ -113,6 +113,7 @@ public class COMPAT_HANDLER {
 			GregtechIndustrialCryogenicFreezer.run();
 			GregtechThaumcraftDevices.run();
 			GregtechThreadedBuffers.run();
+			GregtechIndustrialMixer.run();
 			
 			//New Horizons Content
 			NewHorizonsAccelerator.run();
-- 
cgit