Merge remote-tracking branch 'upstream/Fixes' into experimental

Conflicts:
	src/main/java/gregtech/GT_Mod.java
This commit is contained in:
Dream-Master 2016-07-27 17:19:10 +02:00
commit da213797ac

View file

@ -1,11 +1,5 @@
package gregtech;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.PrintStream;
import java.util.*;
import java.util.Map.Entry;
import cpw.mods.fml.common.*;
import cpw.mods.fml.common.event.*;
import cpw.mods.fml.common.registry.EntityRegistry;