From 3c0048b6d6460aa849376ab909968937423fcf73 Mon Sep 17 00:00:00 2001
From: Christian <cpw@weeksfamily.ca>
Date: Mon, 24 Jun 2013 16:30:18 -0400
Subject: [PATCH] Fixes, so it builds again..

---
 .../cpw/mods/fml/common/asm/transformers/AccessTransformer.java | 2 +-
 fml/install/fml.py                                              | 2 +-
 fml/mcp_merge.cfg                                               | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/fml/common/cpw/mods/fml/common/asm/transformers/AccessTransformer.java b/fml/common/cpw/mods/fml/common/asm/transformers/AccessTransformer.java
index 07997b16e..5daed3f70 100644
--- a/fml/common/cpw/mods/fml/common/asm/transformers/AccessTransformer.java
+++ b/fml/common/cpw/mods/fml/common/asm/transformers/AccessTransformer.java
@@ -154,7 +154,7 @@ public class AccessTransformer implements IClassTransformer
                 return true;
             }
         });
-        FMLRelaunchLog.fine("Loaded %d rules from AccessTransformer config file %s", modifiers.size(), rulesFile);
+        System.out.printf("Loaded %d rules from AccessTransformer config file %s\n", modifiers.size(), rulesFile);
     }
 
     @SuppressWarnings("unchecked")
diff --git a/fml/install/fml.py b/fml/install/fml.py
index 0e2983929..6e12580e0 100644
--- a/fml/install/fml.py
+++ b/fml/install/fml.py
@@ -439,6 +439,7 @@ def cleanup_source(path):
 compile_tools = True
 def setup_fml(fml_dir, mcp_dir, disable_at=False, disable_merge=False, enable_server=False, disable_client=False, disable_assets=False):
     global compile_tools
+    global client_jar
     sys.path.append(mcp_dir)
     from runtime.decompile import decompile
     from runtime.cleanup import cleanup
@@ -554,7 +555,6 @@ def setup_fml(fml_dir, mcp_dir, disable_at=False, disable_merge=False, enable_se
         decompile(None, False, False, True, True, False, True, False, False, False, False, not disable_client, enable_server)
         reset_logger()
         os.chdir(fml_dir)
-        
         post_decompile(mcp_dir, fml_dir, client_jar)
         
     except SystemExit, e:
diff --git a/fml/mcp_merge.cfg b/fml/mcp_merge.cfg
index 5324af656..3966cae0e 100644
--- a/fml/mcp_merge.cfg
+++ b/fml/mcp_merge.cfg
@@ -1,3 +1,4 @@
+!bjy #net/minecraft/src/CodecMus
 ^org/bouncycastle
 ^org/apache
 ^com/google