Merge branch 'master' into snapshot15

Conflicts:
	client/cpw/mods/fml/client/TextureFXManager.java
This commit is contained in:
Christian committed 2013-02-25 21:18:08 -05:00
commit c056f49796
20 files changed
+297 -151

No files matched your search

@@ -40,12 +40,14 @@ public class FMLRenderAccessLibrary
{
public static Logger getLogger()
{
return FMLLog.getLogger();
Logger l = Logger.getLogger("FMLRenderAccessLibrary");
l.setParent(FMLLog.getLogger());
return l;
}
public static void log(Level level, String message)
{
FMLLog.log(level, message);
FMLLog.log("FMLRenderAccessLibrary", level, message);
}
public static void log(Level level, String message, Throwable throwable)