diff --git a/build.gradle b/build.gradle index 6158cd0eae..5847a40e97 100644 --- a/build.gradle +++ b/build.gradle @@ -34,7 +34,7 @@ repositories { } minecraft { - version = '1.7.10-pre4' + version = '1.7.10' mcpVersion = '9.05' fmlDir = projectDir.getAbsolutePath() + "/fml"; mainClass = 'cpw.mods.fml.relauncher.ServerLaunchWrapper' diff --git a/fml b/fml index 8f7adced47..79a0c5e559 160000 --- a/fml +++ b/fml @@ -1 +1 @@ -Subproject commit 8f7adced471951c798cfa6844b0abc176c93d19b +Subproject commit 79a0c5e55905f0f08471d026b744a563ea421236 diff --git a/src/main/java/net/minecraftforge/common/ForgeVersion.java b/src/main/java/net/minecraftforge/common/ForgeVersion.java index 3a456d70cd..cc62016052 100644 --- a/src/main/java/net/minecraftforge/common/ForgeVersion.java +++ b/src/main/java/net/minecraftforge/common/ForgeVersion.java @@ -21,9 +21,9 @@ public class ForgeVersion //This number is incremented every time we remove deprecated code/major API changes, never reset public static final int majorVersion = 10; //This number is incremented every minecraft release, never reset - public static final int minorVersion = 12; + public static final int minorVersion = 13; //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 = 2; + public static final int revisionVersion = 0; //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; diff --git a/src/main/java/net/minecraftforge/common/MinecraftForge.java b/src/main/java/net/minecraftforge/common/MinecraftForge.java index 67ead82c07..6d5ccc9ae0 100644 --- a/src/main/java/net/minecraftforge/common/MinecraftForge.java +++ b/src/main/java/net/minecraftforge/common/MinecraftForge.java @@ -1,6 +1,7 @@ package net.minecraftforge.common; import cpw.mods.fml.common.FMLLog; +import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.eventhandler.EventBus; import net.minecraft.crash.CrashReport; import net.minecraft.item.ItemStack; @@ -20,7 +21,7 @@ public class MinecraftForge public static final EventBus EVENT_BUS = new EventBus(); public static final EventBus TERRAIN_GEN_BUS = new EventBus(); public static final EventBus ORE_GEN_BUS = new EventBus(); - public static final String MC_VERSION = "1.7.10"; + public static final String MC_VERSION = Loader.MC_VERSION; static final ForgeInternalHandler INTERNAL_HANDLER = new ForgeInternalHandler();