First update to 1.4.1, patches need updating.

fml/common/cpw/mods/fml/common/asm/transformers/MCPMerger.java

@@ -288,7 +288,7 @@ public class MCPMerger
 
         reader.accept(classNode, 0);
 
-        if (!classNode.name.equals("bcs")) //Special case CodecMus so I dont have to make a new patch, anyone who uses this in production code is.. bad.
+        if (!classNode.name.equals("bct")) //Special case CodecMus so I dont have to make a new patch, anyone who uses this in production code is.. bad.
         {
             if (classNode.visibleAnnotations == null) classNode.visibleAnnotations = new ArrayList<AnnotationNode>();
             classNode.visibleAnnotations.add(getSideAnn(isClientOnly));

fml/common/fml_at.cfg

@@ -1,73 +1,71 @@
 #Main FML Access Transformer configuration file
 # TileEntity addMapping
-public aml.a(Ljava/lang/Class;Ljava/lang/String;)V
+public amm.a(Ljava/lang/Class;Ljava/lang/String;)V # TileEntity/func_70306_a
 # EntityList addMappings
-public le.a(Ljava/lang/Class;Ljava/lang/String;I)V
+public lf.a(Ljava/lang/Class;Ljava/lang/String;I)V # EntityList/func_75618_a
-public le.a(Ljava/lang/Class;Ljava/lang/String;III)V
+public lf.a(Ljava/lang/Class;Ljava/lang/String;III)V # EntityList/func_75614_a 
-# EntityList nameToClassMap and idToClassMap and classToNameMap
+public le.b # EntityList/field_75625_b nameToClassMap
-public le.b
+public le.c # EntityList/field_75626_c classToNameMap
-public le.d
+public le.d # EntityList/field_75623_d idToClassMap
-public le.c
 # RenderEngine
-public azb.h # textureList
+public azc.h # RenderEngine/field_78367_h textureList
-public azb.k # texturePack
+public azc.k # RenderEngine/field_78366_k texturePack
-# RenderManager renderers
+# RenderManager
-public azv.o
+public azw.o # RenderManager/field_78729_o renderers
 # RenderBlocks - everything
-public azc.*
+public azd.*
-public azc.*()
+public azd.*()
-#RenderPlayer - make armorlist public and not final
+#RenderPlayer
-public-f bap.h
+public-f baq.h # RenderPlayer/field_77110_j armorlist
-#RenderBiped - armorlist again
+#RenderBiped
-public-f bad.k
+public-f bae.k # RenderBiped/field_82424_k armorlist
-#StringTranslate - make the current table and language public
+#StringTranslate
-public bd.b
+public be.b # StringTranslate/field_74815_b
-public bd.d
+public be.d # StringTranslate/field_74813_d
-# TileEntityRenderer - make the list of renderers public
+# TileEntityRenderer
-public bbx.m
+public bby.m # TileEntityRenderer/field_76966_m
 # CraftingManager - make the add recipe methods public
-public vp.a(Ltu;[Ljava/lang/Object;)V
+public vq.a(Ltv;[Ljava/lang/Object;)V # CraftingManager/func_77595_a 
-public vp.b(Ltu;[Ljava/lang/Object;)V
+public vq.b(Ltv;[Ljava/lang/Object;)V # CraftingManager/func_77596_b
-# WeightedRandomItem - make the "probability" public
+# WeightedRandomItem
-public kf.a
+public kg.a # WeightedRandomItem/field_76292_a probability
-# ItemStack - make itemId final
+# ItemStack
-#public+f tu.c
+#public+f tv.c # ItemStack/field_77993_c itemId
-# StatBase - Make statName public, no server side getter
+# StatBase
-public jb.a
+public jc.a # StatBase/field_75978_a statName
-# NetLoginHandler make the "complete connection" callback public so I can reset it during FML negotiation
+# NetLoginHandler
-public ij.a(Lij;Z)Z
+public ik.a(Lik;Z)Z # NetLoginHandler/func_72531_a 'complete connection'
-# NetLoginHandler userName field
+public ij.h # NetLoginHandler/field_72543_h userName
-public ij.h
 # EntityPlayerMP getNextWindowId
-public ig.cd()V
+public ih.cd()V # EntityPlayerMP/func_71117_bO
-public ig.cu
+public ih.cv # EntityPlayerMP/field_71139_cq
-# EntityAITaskEntry class -> public
+# EntityAITaskEntry
-public mn
+public mo
-# EntityAITasks taskList
+# EntityAITasks
-public mm.a
+public mmn.a # EntityAITasks/field_75782_a taskList
-# BlockChest isOcelotBlockingChest (a bounding box check actually)
+# BlockChest
-public ahy.n(Lxd;III)Z
+public ahy.n(Lxd;III)Z # BlockChest/func_72292_n isOcelotBlockingChest
 # EntityLiving
-public lm.aS # carryoverDamage
+public ln.aS # EntityLiving/field_70736_aM carryoverDamage
-public lm.bn # tasks
+public ln.bn # EntityLiving/field_70714_bg tasks
-public lm.bF # isJumping
+public ln.bG # EntityLiving/field_70703_bu isJumping
 # EntityAIOcelotSit
-protected mz.a(Lxd;III)Z # nearestSittableBlock
+protected na.a(Lxe;III)Z # EntityAIOcelotSit/func_75398_a nearestSittableBlock
-protected mz.f()Z # isblocksittable
+protected na.f()Z # EntityAIOcelotSit/func_75399_f isblocksittable
 # CallableMinecraftVersion - sanity check the MC version
 public b
 public b.<init>(La;)V # constructor
 # EntityAnimal
-public og.d # inLove
+public oh.d # EntityAnimal/field_70881_d inLove
 # WorldType
-public xo.<init>(ILjava/lang/String;)V
+public xp.<init>(ILjava/lang/String;)V
-public xo.<init>(ILjava/lang/String;I)V
+public xp.<init>(ILjava/lang/String;I)V
 # ComponentVillage
-public aep
+public aeq
-# EntityVillager - addbuy and addsell and minmax lists
+# EntityVillager - minmax lists
-public qc.a(Lwv;ILjava/util/Random;F)V
+public qd.a(Lww;ILjava/util/Random;F)V # EntityVillager/func_70948_a addBuy
-public qc.b(Lwv;ILjava/util/Random;F)V
+public qd.b(Lww;ILjava/util/Random;F)V # EntityVillager/func_70949_b addSell
-public qc.bO
+public qd.bP # EntityVillager/field_70958_bB
-public qc.bP
+public qd.bQ # EntityVillager/field_70960_bC
 # GuiButtonMerchant
-public aul
+public aum

fml/common/fml_marker.cfg

@@ -2,11 +2,11 @@
 # Only runs at runtime because it's not necessary at compile time
 # has deobf and obf mappings so it runs OK in mcp
 # entityplayer -> network/player
-qf cpw/mods/fml/common/network/Player
+qg cpw/mods/fml/common/network/Player
 net.minecraft.src.EntityPlayer cpw/mods/fml/common/network/Player
 # block -> blockproxy
-ale cpw/mods/fml/common/registry/BlockProxy
+alf cpw/mods/fml/common/registry/BlockProxy
 net.minecraft.src.Block cpw/mods/fml/common/registry/BlockProxy
 # item -> itemproxy
-ts cpw/mods/fml/common/registry/ItemProxy
+tt cpw/mods/fml/common/registry/ItemProxy
 net.minecraft.src.Item cpw/mods/fml/common/registry/ItemProxy

fml/conf/mcp.cfg

@@ -36,8 +36,8 @@ DirNatives = %(DirJars)s/bin/natives
 Client     = %(DirJars)s/bin/minecraft.jar
 Server     = %(DirJars)s/minecraft_server.jar
 LWJGL      = %(DirJars)s/bin/jinput.jar,%(DirJars)s/bin/lwjgl.jar,%(DirJars)s/bin/lwjgl_util.jar
-MD5Client  = 32a654388b54d3e4bb29c1a46e7d6a12
+MD5Client  = 542621a5298659dc65f383f35170fc4c
-MD5Server  = 99f84541e184979c5b0312e9afc56ce1
+MD5Server  = 736ffcb0d9f36d47de96a6923ec82699
 
 [RETROGUARD]
 Location       = %(DirRuntime)s/bin/retroguard.jar

fml/conf/params.csv

@@ -41,10 +41,6 @@ p_70038_1_,par1,2
 p_70038_3_,par3,2
 p_70038_5_,par5,2
 p_70039_1_,par1NBTTagCompound,2
-p_70041_1_,par1,2
-p_70041_2_,par2,2
-p_70041_3_,par3,2
-p_70041_4_,par4,2
 p_70048_1_,par1,2
 p_70048_3_,par3,2
 p_70048_5_,par5,2
@@ -132,11 +128,6 @@ p_70227_1_,par1MovingObjectPosition,2
 p_70239_1_,par1,2
 p_70240_1_,par1,2
 p_70243_1_,par1,2
-p_70244_1_,par1,2
-p_70244_3_,par3,2
-p_70244_5_,par5,2
-p_70244_7_,par7,2
-p_70244_8_,par8,2
 p_70265_1_,par1,2
 p_70266_1_,par1,2
 p_70269_1_,par1,2
@@ -2010,7 +2001,6 @@ p_72874_1_,par1,2
 p_72874_2_,par2,2
 p_72875_1_,par1AxisAlignedBB,2
 p_72875_2_,par2Material,2
-p_72876_10_,par10,2
 p_72876_1_,par1Entity,2
 p_72876_2_,par2,2
 p_72876_4_,par4,2
@@ -7056,6 +7046,29 @@ p_82869_1_,par1EntityPlayer,2
 p_82870_1_,par1EntityPlayer,2
 p_82870_2_,par2ItemStack,2
 p_82877_1_,par1,2
+p_83010_1_,par1World,2
+p_83010_2_,par2,2
+p_83010_3_,par3,2
+p_83010_4_,par4,2
+p_83010_5_,par5,2
+p_83011_1_,par1World,2
+p_83011_2_,par2,2
+p_83011_3_,par3,2
+p_83011_4_,par4,2
+p_83011_5_,par5,2
+p_83018_1_,par1Block,2
+p_83019_11_,par11,2
+p_83019_1_,par1,2
+p_83019_3_,par3,2
+p_83019_5_,par5,2
+p_83019_7_,par7,2
+p_83019_9_,par9,2
+p_83020_11_,par11,2
+p_83020_1_,par1,2
+p_83020_3_,par3,2
+p_83020_5_,par5,2
+p_83020_7_,par7,2
+p_83020_9_,par9,2
 p_accept_1_,par1File,2
 p_accept_2_,par2Str,2
 p_actionPerformed_1_,par1ActionEvent,2
@@ -9864,6 +9877,7 @@ p_i5109_1_,par1Vec3Pool,2
 p_i5109_2_,par2,2
 p_i5109_4_,par4,2
 p_i5109_6_,par6,2
+p_i6000_1_,par1CrashReport,2
 p_implies_1_,par1Permission,2
 p_init_1_,par1,2
 p_init_2_,par2CipherParameters,2

fml/conf/version.cfg

@@ -1,4 +1,4 @@
 [VERSION]
-MCPVersion = 7.17
+MCPVersion = 7.18
-ClientVersion = 1.4
+ClientVersion = 1.4.1
-ServerVersion = 1.4
+ServerVersion = 1.4.1

fml/install/fml.py

@@ -61,8 +61,8 @@ def pre_decompile(mcp_dir, fml_dir):
     with open(server_jar, 'rb') as fh:
         md5_s = md5(fh.read()).hexdigest()
         
-    clean_c = "32a654388b54d3e4bb29c1a46e7d6a12"
+    clean_c = "542621a5298659dc65f383f35170fc4c"
-    clean_s = "99f84541e184979c5b0312e9afc56ce1"
+    clean_s = "736ffcb0d9f36d47de96a6923ec82699"
     
     if not md5_c == clean_c:
         print 'Warning, Modified Client jar detected'

fml/mcp_merge.cfg

@@ -1,15 +1,14 @@
->ot
+>ou
->iy
+>iZ
->xc
+>xD
->wz
+>xa
->ang
+>anh
->anl
+>anm
->jm
->ue
->agy
 >jn
-<fn
+>uf
-<hl
+>agz
+>jo
+<fo
 <hm
 <hn
 <ho
@@ -18,3 +17,4 @@
 <hr
 <hs
 <ht
+<hu