From de8a4c8855c38cb62a5e84d620e996117c21ce6c Mon Sep 17 00:00:00 2001
From: Christian <cpw@weeksfamily.ca>
Date: Sun, 21 Apr 2013 16:43:24 -0400
Subject: [PATCH] Updated FML:
 MinecraftForge/FML@a3b5eaacfdd9218ef68d3dc064bba729b797cb3d Fix a small
 modloader compatibility derp: closes #222
 MinecraftForge/FML@677a6e578e84109702365da4a784f9a57d8c9957 Fix scala
 supporting SidedProxy. It should work now.
 MinecraftForge/FML@334a76de75f2b417f04c23526c7e66ceb48e0de2 Update
 FMLDeobfuscatingRemapper.java
 MinecraftForge/FML@42f1d8795599e0d1a516a1fdd7488a09b77e4565 Merge pull
 request #224 from Glought/master
 MinecraftForge/FML@2dcabe01232b48009acbca6724565598761f561b Add a to string
 to fmlmodcontainer: should mean less derpy cyclic dependency data
 MinecraftForge/FML@11ac46daebe901a6012a09ba5f6fe44af5b1be06 Fixing the
 GameRegistry. Now it is possible to register a Block with a BlockItem using
 following code: MyBlock myBlock = new MyBlock();
 GameRegistry.registerBlock(myBlock, MyBlockItem.class, "myBlock"); where
 MyBlockItem class has one constructor with signature: public MyBlockItem(int
 id, Block block) MinecraftForge/FML@c3fda11d100f9db7c32ef212ac37eade3e35d701
 Merge pull request #225 from MarcinSc/master

---
 fml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fml b/fml
index b3d4ea05e..c3fda11d1 160000
--- a/fml
+++ b/fml
@@ -1 +1 @@
-Subproject commit b3d4ea05ec633fb1898e97febf786f1a3e420986
+Subproject commit c3fda11d100f9db7c32ef212ac37eade3e35d701