From 52ec4f7c57604fbea2db0bd140ec352170d89534 Mon Sep 17 00:00:00 2001
From: Lex Manos <LexManos@gmail.com>
Date: Fri, 11 Jul 2014 18:17:50 -0700
Subject: [PATCH] Updated FML:
 MinecraftForge/FML@ab52901b8b47a525e2719cf280327e97bad7f91e Force
 preferIPv4Stack to true early in the load chain to combat netty loopback
 issues. MinecraftForge/FML@11893fbbb76569417a415ae794494b8c1150a716 Add
 system property to skip doing world backups when game registry changes. This
 is SEVERLY ill-advised, if you do this DO NOT ask for any support.
 MinecraftForge/FML@fdb6b34b8fc3f1e0c6beb7bfb940a01a309f1603 Update authlib
 and realms to latest json data.
 MinecraftForge/FML@b3a74882b4d0d704d7061b9d896febb59ab0c269 added slider
 controls for numerics. default control is textbox, but slider can be used as
 a custom list entry class. fixed constructor javadocs in GuiConfig
 MinecraftForge/FML@7c6d1f7568885ff677e34692ff87b1f0826dfd48 Merge pull
 request #468 from bspkrs/master
 MinecraftForge/FML@692d955c1a5b6d0b8601ae88632ef42136d37393 Update tweaker
 login to use authlib.
 MinecraftForge/FML@c2119eb1c1246ba37304d9e565b4430ed7056db1 Update realms
 library to 1.3.1, and implement network latch when connecting to Realms.
 Tested and working.

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

diff --git a/fml b/fml
index ac994e178a..c2119eb1c1 160000
--- a/fml
+++ b/fml
@@ -1 +1 @@
-Subproject commit ac994e178a3533aa3c2ad8359aef9e5852c27a72
+Subproject commit c2119eb1c1246ba37304d9e565b4430ed7056db1
diff --git a/patches/minecraft/net/minecraft/client/Minecraft.java.patch b/patches/minecraft/net/minecraft/client/Minecraft.java.patch
index 9ec8287970..fb443a4c9a 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;
-@@ -1341,7 +1346,7 @@
+@@ -1342,7 +1347,7 @@
  
                      if (this.field_71439_g.func_82246_f(i, j, k))
                      {
@@ -65,7 +65,7 @@
                          this.field_71439_g.func_71038_i();
                      }
                  }
-@@ -1422,11 +1427,12 @@
+@@ -1423,11 +1428,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();
-@@ -1453,7 +1459,8 @@
+@@ -1454,7 +1460,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();
              }
-@@ -1665,6 +1672,8 @@
+@@ -1666,6 +1673,8 @@
  
              while (Mouse.next())
              {
@@ -99,7 +99,7 @@
                  j = Mouse.getEventButton();
                  KeyBinding.func_74510_a(j - 100, Mouse.getEventButtonState());
  
-@@ -2127,6 +2136,11 @@
+@@ -2128,6 +2137,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();
-@@ -2139,6 +2153,18 @@
+@@ -2140,6 +2154,18 @@
              if (this.field_71437_Z != null)
              {
                  this.field_71437_Z.func_71263_m();
@@ -130,7 +130,7 @@
              }
  
              this.field_71437_Z = null;
-@@ -2287,113 +2313,10 @@
+@@ -2288,113 +2314,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;
-@@ -2659,8 +2582,15 @@
+@@ -2660,8 +2583,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);
-@@ -2668,6 +2598,7 @@
+@@ -2669,6 +2599,7 @@
  
              if (j != 0)
              {