Merge branch '1.9.4' into 1.9.4-ic2

# Conflicts:
#	src/main/java/techreborn/init/ModRecipes.java
This commit is contained in:
modmuss50 2016-06-06 19:02:19 +01:00
commit 973f68496c
34 changed files with 393 additions and 200 deletions

View file

@ -8,4 +8,5 @@ public class MessageIDs
public static int freqTransmitterID = 0;
public static int fluidPipeID = 1;
public static int playerDetectorID = 2;
public static int nanosaberID = 3;
}