From ebf0e7617ac62a937857e6852e68d57c245dfba1 Mon Sep 17 00:00:00 2001
From: cpw <cpw@weeksfamily.ca>
Date: Thu, 26 Jun 2014 15:06:07 -0400
Subject: [PATCH] Update to MC 1.7.10, bump to 10.13.0

MinecraftForge/FML@bc420dcb0b086899e2aaa218a6f5bd7e91091a90 Fix Eclipse launching attribute
MinecraftForge/FML@1e0134a1ca97a1107ebbe604e5318e6f350fe9c4 Merge pull request #455 from rumickon/feature
MinecraftForge/FML@1c5db211afc9962fedb7fd8450abc45d07807634 Update for release 1.7.10
MinecraftForge/FML@79a0c5e55905f0f08471d026b744a563ea421236 Merge branch 'mc179'
---
 build.gradle                                                | 2 +-
 fml                                                         | 2 +-
 src/main/java/net/minecraftforge/common/ForgeVersion.java   | 4 ++--
 src/main/java/net/minecraftforge/common/MinecraftForge.java | 3 ++-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/build.gradle b/build.gradle
index 6158cd0ea..5847a40e9 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 8f7adced4..79a0c5e55 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 3a456d70c..cc6201605 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 67ead82c0..6d5ccc9ae 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();