From de521cf53116b5ef12f01ca0ec02688e1d492b9a Mon Sep 17 00:00:00 2001
From: cpw <cpw@weeksfamily.ca>
Date: Sun, 31 Aug 2014 21:59:47 -0400
Subject: [PATCH] MinecraftForge/FML@4ce3e73bfe36c02b10f504f93eff1bc94d640e32
 Add overloaded version of SimpleNetworkWrapper#registerMessage that takes the
 MessageHandler instance directly, allowing to specify the same handler for
 multiple messages.
 MinecraftForge/FML@cbe2ccbda461ec0ecf4d776fcd19ab31930cc3f1 Add in ModType to
 the jar manifest. If it's present, and doesn't have value "FML" it will be
 skipped from the modloading cycle. This should let liteloader mods have a
 .jar extension. MinecraftForge/FML@37cf0174fc62a842d132b2c2cc31e477acfba205
 OK, lets make that a csv list. It'll let you be liteloader and fml in one jar
 file! MinecraftForge/FML@0475b15eb1a7c35bf4959f1af40606e6ee8a9d03 Change the
 mods and modListFile argument handling a bit. Other tweakers will get a
 chance at looking at them now - they're only removed right before launch.
 MinecraftForge/FML@abeac06a2e9bf8825b058fa35291165b4d1f1fb3 Two new features.
 ModLists can have a "parent" mod list. Circularity will result in a crash, so
 be careful. Mods specified in a child will override ones from a parent (using
 the maven group:name:classifier triple to identify - ignoring the version
 component) MinecraftForge/FML@7fcfedcfef9b5fd85cd1c17aa2013fca1bacd871
 Canonicalized file paths in modListFile handling with the minecraftDirectory.
 MinecraftForge/FML@633fce19d4b367aed56d79e916f17296842f675c Make Keyevent
 also fire for key releases
 MinecraftForge/FML@57ba2339b630afa22c0fdf060bf28edbf7b34d0f Merge branch
 'keyup-event' of github.com:diesieben07/FML
 MinecraftForge/FML@1ff048062c7f122731619258a9e5a68a6111d5dd Merge branch
 'simple-netw-improve' of github.com:diesieben07/FML

---
 fml                                            |  2 +-
 .../net/minecraft/client/Minecraft.java.patch  | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/fml b/fml
index 4852de81e..1ff048062 160000
--- a/fml
+++ b/fml
@@ -1 +1 @@
-Subproject commit 4852de81e02e2b6c6d006abe20d8497499fdf51f
+Subproject commit 1ff048062c7f122731619258a9e5a68a6111d5dd
diff --git a/patches/minecraft/net/minecraft/client/Minecraft.java.patch b/patches/minecraft/net/minecraft/client/Minecraft.java.patch
index fb443a4c9..9ec828797 100644
--- a/patches/minecraft/net/minecraft/client/Minecraft.java.patch
+++ b/patches/minecraft/net/minecraft/client/Minecraft.java.patch
@@ -56,7 +56,7 @@
          if (p_147108_1_ instanceof GuiMainMenu)
          {
              this.field_71474_y.field_74330_P = false;
-@@ -1342,7 +1347,7 @@
+@@ -1341,7 +1346,7 @@
  
                      if (this.field_71439_g.func_82246_f(i, j, k))
                      {
@@ -65,7 +65,7 @@
                          this.field_71439_g.func_71038_i();
                      }
                  }
-@@ -1423,11 +1428,12 @@
+@@ -1422,11 +1427,12 @@
                      int j = this.field_71476_x.field_72312_c;
                      int k = this.field_71476_x.field_72309_d;
  
@@ -80,7 +80,7 @@
                          {
                              flag = false;
                              this.field_71439_g.func_71038_i();
-@@ -1454,7 +1460,8 @@
+@@ -1453,7 +1459,8 @@
          {
              ItemStack itemstack1 = this.field_71439_g.field_71071_by.func_70448_g();
  
@@ -90,7 +90,7 @@
              {
                  this.field_71460_t.field_78516_c.func_78445_c();
              }
-@@ -1666,6 +1673,8 @@
+@@ -1665,6 +1672,8 @@
  
              while (Mouse.next())
              {
@@ -99,7 +99,7 @@
                  j = Mouse.getEventButton();
                  KeyBinding.func_74510_a(j - 100, Mouse.getEventButtonState());
  
-@@ -2128,6 +2137,11 @@
+@@ -2127,6 +2136,11 @@
  
      public void func_71353_a(WorldClient p_71353_1_, String p_71353_2_)
      {
@@ -111,7 +111,7 @@
          if (p_71353_1_ == null)
          {
              NetHandlerPlayClient nethandlerplayclient = this.func_147114_u();
-@@ -2140,6 +2154,18 @@
+@@ -2139,6 +2153,18 @@
              if (this.field_71437_Z != null)
              {
                  this.field_71437_Z.func_71263_m();
@@ -130,7 +130,7 @@
              }
  
              this.field_71437_Z = null;
-@@ -2288,113 +2314,10 @@
+@@ -2287,113 +2313,10 @@
          if (this.field_71476_x != null)
          {
              boolean flag = this.field_71439_g.field_71075_bZ.field_75098_d;
@@ -246,7 +246,7 @@
              if (flag)
              {
                  j = this.field_71439_g.field_71069_bz.field_75151_b.size() - 9 + this.field_71439_g.field_71071_by.field_70461_c;
-@@ -2660,8 +2583,15 @@
+@@ -2659,8 +2582,15 @@
          p_70001_1_.func_152767_b("gl_max_texture_size", Integer.valueOf(func_71369_N()));
      }
  
@@ -262,7 +262,7 @@
          for (int i = 16384; i > 0; i >>= 1)
          {
              GL11.glTexImage2D(GL11.GL_PROXY_TEXTURE_2D, 0, GL11.GL_RGBA, i, i, 0, GL11.GL_RGBA, GL11.GL_UNSIGNED_BYTE, (ByteBuffer)null);
-@@ -2669,6 +2599,7 @@
+@@ -2668,6 +2598,7 @@
  
              if (j != 0)
              {