From 63a205c043e2197e69999e4f8edc645a27f7610d Mon Sep 17 00:00:00 2001 From: Christian Date: Mon, 28 Apr 2014 15:59:19 -0400 Subject: [PATCH] No, this is not me modding either. I'm doing this as a favour for Lex, who's a bit computerless at the minute. MinecraftForge/FML@77c254a6d9658a38768d53425291e93557fddc85 I am not modding, I am fixing an annoyance. The MCP version has long since been 9.03. Also, the JSON from MC updated.. MinecraftForge/FML@7f01cf549b88f8d5f4dfae7bc17d08f8c5e525c8 I'm still not modding. Player has contributed greatly to the 1.7 release of FML. He needs authorship credit. MinecraftForge/FML@2b8d0f6680de6257583912f3159cce38ce2bf08c Fix SimpleNetworkWrapper - this is not me modding, I didn't realize it was broken until Pahimar told me. MinecraftForge/FML@ddee7eb117a50d190d6e987d94076f53b3b6807b Fix vanilla bug causing integrated server saving from 2 threads concurrently after a crash MinecraftForge/FML@59a5adfdb3ffdffe0df206109dd59a3d4d023afe Registry: Fix Block-before-ItemBlock allocation when loading 1.6 world saves, more validation MinecraftForge/FML@d88b2aa0c5401c9b2b48cb451f1ab9bbee52bec1 prevent the world from getting saved twice at shutdown MinecraftForge/FML@9b1cbab03b75fc15905c8ce02f401f48b174782c Registry: Crash earlier with conflicting name/object registrations. MinecraftForge/FML@7ba167c500cbccc05ce5104e9b26eb6a799aaaa8 Registry: Misc tweaks MinecraftForge/FML@78248da399c04a438586d1a5d7f36d6d752dd5c3 Registry: Treat all 1.6 entries as items. --- build.gradle | 2 +- fml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 9362e6cb0..26bf64d45 100644 --- a/build.gradle +++ b/build.gradle @@ -35,7 +35,7 @@ repositories { minecraft { version = '1.7.2' - mcpVersion = '9.01-pre' + mcpVersion = '9.03' fmlDir = projectDir.getAbsolutePath() + "/fml"; mainClass = 'cpw.mods.fml.relauncher.ServerLaunchWrapper' tweakClass = 'cpw.mods.fml.common.launcher.FMLTweaker' diff --git a/fml b/fml index 3b42b33b6..78248da39 160000 --- a/fml +++ b/fml @@ -1 +1 @@ -Subproject commit 3b42b33b6ec4020b5032cae06760053ed135fae8 +Subproject commit 78248da399c04a438586d1a5d7f36d6d752dd5c3