MinecraftForge/FML@adcf2247c6 Loading screen: moved config file to the standard config directory; added the option to load textures from the custom resource pack

MinecraftForge/FML@91338433fa Add classloader exclusion for ASM
MinecraftForge/FML@7c10b93a2d Synchronize the available libraries. Turns out we've been forcing a newer apache commons-lang(3.2.1) for a long time, also sync the dev guava - we've been forcing 17 for a long time too. Bumping commons-lang to 3.3.2 since that's what Mojang are shipping with 1.8. It has no observable ill effects Closes #651
MinecraftForge/FML@8ccfa24764 Merge pull request #650 from luacs1998/1.7.10
MinecraftForge/FML@b2650a0bdb Optifine can tell us when they're ready for the new splash screen.
MinecraftForge/FML@02a5a58a1c Fix the ordering of the messages, so they make sense now.

fml

@@ -1 +1 @@
-Subproject commit d14d1a8fea4c9242c944079ab8e4cdd516dfce4c
+Subproject commit 02a5a58a1cbb25cd3baecf1535950e4780b7810f

patches/minecraft/net/minecraft/client/Minecraft.java.patch

@@ -17,8 +17,8 @@
          }
          catch (LWJGLException lwjglexception)
          {
-@@ -541,7 +540,7 @@
-         this.field_71452_i = new EffectRenderer(this.field_71441_e, this.field_71446_o);
+@@ -552,7 +551,7 @@
+         cpw.mods.fml.common.ProgressManager.pop(bar);
          FMLClientHandler.instance().finishMinecraftLoading();
          this.func_71361_d("Post startup");
 -        this.field_71456_v = new GuiIngame(this);
@@ -26,7 +26,7 @@
  
          if (this.field_71475_ae != null)
          {
-@@ -761,11 +760,6 @@
+@@ -772,11 +771,6 @@
  
      public void func_147108_a(GuiScreen p_147108_1_)
      {
@@ -38,7 +38,7 @@
          if (p_147108_1_ == null && this.field_71441_e == null)
          {
              p_147108_1_ = new GuiMainMenu();
-@@ -775,6 +769,17 @@
+@@ -786,6 +780,17 @@
              p_147108_1_ = new GuiGameOver();
          }
  
@@ -56,7 +56,7 @@
          if (p_147108_1_ instanceof GuiMainMenu)
          {
              this.field_71474_y.field_74330_P = false;
-@@ -1341,7 +1346,7 @@
+@@ -1352,7 +1357,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 @@
+@@ -1433,11 +1438,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 @@
+@@ -1464,7 +1470,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 @@
+@@ -1676,6 +1683,8 @@
  
              while (Mouse.next())
              {
@@ -99,7 +99,7 @@
                  j = Mouse.getEventButton();
                  KeyBinding.func_74510_a(j - 100, Mouse.getEventButtonState());
  
-@@ -2127,6 +2136,11 @@
+@@ -2138,6 +2147,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 @@
+@@ -2150,6 +2164,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 @@
+@@ -2298,113 +2324,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 @@
+@@ -2670,8 +2593,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 @@
+@@ -2679,6 +2609,7 @@
  
              if (j != 0)
              {

patches/minecraft/net/minecraft/client/renderer/texture/TextureMap.java.patch

@@ -20,12 +20,12 @@
          this.field_94258_i.clear();
          int j = Integer.MAX_VALUE;
 +        ForgeHooksClient.onTextureStitchedPre(this);
+         cpw.mods.fml.common.ProgressManager.ProgressBar bar = cpw.mods.fml.common.ProgressManager.push("Texture stitching", this.field_110574_e.size());
          Iterator iterator = this.field_110574_e.entrySet().iterator();
          TextureAtlasSprite textureatlassprite;
- 
-@@ -106,6 +110,16 @@
-             textureatlassprite = (TextureAtlasSprite)entry.getValue();
+@@ -108,6 +112,16 @@
              ResourceLocation resourcelocation1 = this.func_147634_a(resourcelocation, 0);
+             bar.step(resourcelocation1.func_110623_a());
  
 +            if (textureatlassprite.hasCustomLoader(p_110571_1_, resourcelocation))
 +            {
@@ -40,15 +40,15 @@
              try
              {
                  IResource iresource = p_110571_1_.func_110536_a(resourcelocation1);
-@@ -276,6 +290,7 @@
+@@ -286,6 +300,7 @@
              textureatlassprite = (TextureAtlasSprite)iterator2.next();
              textureatlassprite.func_94217_a(this.field_94249_f);
          }
 +        ForgeHooksClient.onTextureStitchedPost(this);
+         cpw.mods.fml.common.ProgressManager.pop(bar);
      }
  
-     private ResourceLocation func_147634_a(ResourceLocation p_147634_1_, int p_147634_2_)
-@@ -349,7 +364,7 @@
+@@ -360,7 +375,7 @@
          {
              throw new IllegalArgumentException("Name cannot be null!");
          }
@@ -57,7 +57,7 @@
          {
              Object object = (TextureAtlasSprite)this.field_110574_e.get(p_94245_1_);
  
-@@ -405,4 +420,37 @@
+@@ -416,4 +431,37 @@
      {
          this.field_147637_k = p_147632_1_;
      }