Merge branch 'master' of https://github.com/GTNewHorizons/GTplusplus into gtnh-milling

# Conflicts:
#	build.properties
#	src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechRocketFuelGeneratorBase.java
#	src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_SemiFluidGenerator.java
#	src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityGeothermalGenerator.java
#	src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_NuclearReactor.java

1 files changed, 0 insertions, 61 deletions

diff --git a/src/Java/gtPlusPlus/api/objects/minecraft/ThreadFakeWorldGenerator.java b/src/Java/gtPlusPlus/api/objects/minecraft/ThreadFakeWorldGenerator.java
deleted file mode 100644
index b7462250b1..0000000000
--- a/src/Java/gtPlusPlus/api/objects/minecraft/ThreadFakeWorldGenerator.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package gtPlusPlus.api.objects.minecraft;
-
-import gtPlusPlus.xmod.gregtech.common.helpers.treefarm.TreeGenerator;
-
-public class ThreadFakeWorldGenerator extends Thread {
-
-	public boolean canRun = true;   
-    public boolean isRunning = false;
-    
-    private static final long INIT_TIME;
-    private static long internalTickCounter = 0;
-    
-    public TreeGenerator mGenerator;
-
-	private static final ThreadFakeWorldGenerator mThread;
-    	
-	static {
-		mThread = new ThreadFakeWorldGenerator();
-		INIT_TIME = (System.currentTimeMillis());
-	}
-	
-	public ThreadFakeWorldGenerator() {
-        setName("gtpp.handler.fakeworldtrees");
-        start();
-	}
-	
-	public static ThreadFakeWorldGenerator getInstance() {
-		return mThread;
-	}
-	
-	public static void stopThread() {
-		mThread.canRun = false;
-	}
-	
-	
-	@Override
-	public void run() {
-		
-		if (!isRunning) {
-			isRunning = true;
-		}
-		else {
-			return;
-		}
-
-		if (canRun){
-			if (mGenerator == null) {
-				mGenerator = new TreeGenerator();
-			}
-		}
-		
-		while (mGenerator == null) {
-			if (mGenerator != null) {
-				break;
-			}
-		}
-		stopThread();
-	}		
-	
-	
-}