Merge branch 'master' into noci-1.8.8

This commit is contained in:
cpw committed 2015-11-13 09:46:50 -05:00
commit 02e6d581d3
7 files changed
+102 -17

No files matched your search

@@ -35,7 +35,7 @@ public class ForgeVersion
//This number is incremented every minecraft release, never reset
public static final int minorVersion = 14;
//This number is incremented every time a interface changes or new major feature is added, and reset every Minecraft version
public static final int revisionVersion = 3;
public static final int revisionVersion = 4;
//This number is incremented every time Jenkins builds Forge, and never reset. Should always be 0 in the repo code.
public static final int buildVersion = 0;
// This is the minecraft version we're building for - used in various places in Forge/FML code