Initial setup for snapshot- the client compiles, but patches fail to apply.

fml/common/fml_at.cfg

@@ -1,32 +1,32 @@
 #Main FML Access Transformer configuration file
 # TileEntity addMapping
-public any.a(Ljava/lang/Class;Ljava/lang/String;)V #MD:TileEntity/func_70306_a
+public aox.a(Ljava/lang/Class;Ljava/lang/String;)V #MD:TileEntity/func_70306_a
 # EntityList addMappings
-public lv.a(Ljava/lang/Class;Ljava/lang/String;I)V #MD:EntityList/func_75618_a
-public lv.a(Ljava/lang/Class;Ljava/lang/String;III)V #MD:EntityList/func_75614_a
-public lv.b #FD:EntityList/field_75625_b #nameToClassMap
-public lv.c #FD:EntityList/field_75626_c #classToNameMap
-public lv.d #FD:EntityList/field_75623_d #idToClassMap
+public ma.a(Ljava/lang/Class;Ljava/lang/String;I)V #MD:EntityList/func_75618_a
+public ma.a(Ljava/lang/Class;Ljava/lang/String;III)V #MD:EntityList/func_75614_a
+public ma.b #FD:EntityList/field_75625_b #nameToClassMap
+public ma.c #FD:EntityList/field_75626_c #classToNameMap
+public ma.d #FD:EntityList/field_75623_d #idToClassMap
 # RenderEngine
 public bba.h #FD:RenderEngine/field_78367_h #textureList
-public bba.k #FD:RenderEngine/field_78366_k #texturePack
+ # -- MISSING MAPPINGpublic bcd.j #FD:RenderEngine/field_78366_k #texturePack
 # RenderManager
-public bbu.p #FD:RenderManager/field_78729_o #renderers
+public bcx.p #FD:RenderManager/field_78729_o #renderers
 # RenderBlocks - everything
-public bbb.* #FD:RenderBlocks/*
-public bbb.*() #MD:RenderBlocks/*
+public bce.* #FD:RenderBlocks/*
+public bce.*() #MD:RenderBlocks/*
 #RenderPlayer
-public-f bco.h #FD:RenderPlayer/field_77110_j #armorlist
+public-f bdr.h #FD:RenderPlayer/field_77110_j #armorlist
 #RenderBiped
-public-f bcc.k #FD:RenderBiped/field_82424_k #armorlist
+public-f bdf.k #FD:RenderBiped/field_82424_k #armorlist
 #StringTranslate
 public bn.b #FD:StringTranslate/field_74815_b
-public bn.d #FD:StringTranslate/field_74813_d
+public bn.e #FD:StringTranslate/field_74813_d
 # TileEntityRenderer
-public bdw.m #FD:TileEntityRenderer/field_76966_m
+public bfa.m #FD:TileEntityRenderer/field_76966_m
 # CraftingManager - make the add recipe methods public
 public wn.a(Lur;[Ljava/lang/Object;)Lwq; #MD:CraftingManager/func_92051_a
-public wn.b(Lur;[Ljava/lang/Object;)V #MD:CraftingManager/func_77596_b
+ # -- MISSING MAPPINGpublic wy.b(Lvc;[Ljava/lang/Object;)V #MD:CraftingManager/func_77596_b
 # WeightedRandomItem
 public kv.a #FD:WeightedRandomItem/field_76292_a #probability
 # ItemStack
@@ -37,37 +37,37 @@ public jl.a #FD:StatBase/field_75978_a #statName
 public it.a(Lit;Z)Z #MD:NetLoginHandler/func_72531_a #'complete connection'
 public it.h #FD:NetLoginHandler/field_72543_h #userName
 # EntityPlayerMP getNextWindowId
-public iq.cg()V #MD:EntityPlayerMP/func_71117_bO
-public iq.ct #FD:EntityPlayerMP/field_71139_cq
+public iq.cl()V #MD:EntityPlayerMP/func_71117_bO
+public iq.cu #FD:EntityPlayerMP/field_71139_cq
 # EntityAITaskEntry
-public ne #CL:EntityAITaskEntry
+public nk #CL:EntityAITaskEntry
 # EntityAITasks
-public nd.a #FD:EntityAITasks/field_75782_a #taskList
+public nj.a #FD:EntityAITasks/field_75782_a #taskList
 # BlockChest
-public ajk.n(Lyc;III)Z #MD:BlockChest/func_72292_n #isOcelotBlockingChest
+public ajy.m(Lyn;III)Z #MD:BlockChest/func_72292_n #isOcelotBlockingChest
 # EntityLiving
-public md.aT #FD:EntityLiving/field_70736_aM #carryoverDamage
-public md.bn #FD:EntityLiving/field_70714_bg #tasks
-public md.bF #FD:EntityLiving/field_70703_bu #isJumping
+public mj.aT #FD:EntityLiving/field_70736_aM #carryoverDamage
+public mj.bn #FD:EntityLiving/field_70714_bg #tasks
+public mj.bG #FD:EntityLiving/field_70703_bu #isJumping
 # EntityAIOcelotSit
-protected nq.a(Lyc;III)Z #MD:EntityAIOcelotSit/func_75398_a #nearestSittableBlock
-protected nq.f()Z #MD:EntityAIOcelotSit/func_75399_f #isblocksittable
+protected nw.a(Lyn;III)Z #MD:EntityAIOcelotSit/func_75398_a #nearestSittableBlock
+protected nw.f()Z #MD:EntityAIOcelotSit/func_75399_f #isblocksittable
 # CallableMinecraftVersion - sanity check the MC version
 public b #CL:CallableMinecraftVersion
 public b.<init>(La;)V #MD:CallableMinecraftVersion/<init>(Lnet/minecraft/src/CrashReport;) #constructor
 # EntityAnimal
-public ox.d #FD:EntityAnimal/field_70881_d #inLove
+public pd.d #FD:EntityAnimal/field_70881_d #inLove
 # WorldType
-public yn.<init>(ILjava/lang/String;)V #MD:WorldType/<init>(ILjava/lang/String;)
-public yn.<init>(ILjava/lang/String;I)V #MD:WorldType/<init>(ILjava/lang/String;I)
+public yx.<init>(ILjava/lang/String;)V #MD:WorldType/<init>(ILjava/lang/String;)
+public yx.<init>(ILjava/lang/String;I)V #MD:WorldType/<init>(ILjava/lang/String;I)
 # ComponentVillage
-public afs #CL:ComponentVillage
+public agc #CL:ComponentVillage
 # EntityVillager - minmax lists
-public qu.a(Lxu;ILjava/util/Random;F)V #MD:EntityVillager/func_70948_a #addBuy
-public qu.b(Lxu;ILjava/util/Random;F)V #MD:EntityVillager/func_70949_b #addSell
-public qu.bO #FD:EntityVillager/field_70958_bB
-public qu.bP #FD:EntityVillager/field_70960_bC
+public re.a(Lyf;ILjava/util/Random;F)V #MD:EntityVillager/func_70948_a #addBuy
+public re.b(Lyf;ILjava/util/Random;F)V #MD:EntityVillager/func_70949_b #addSell
+public re.bP #FD:EntityVillager/field_70958_bB
+public re.bQ #FD:EntityVillager/field_70960_bC
 # GuiButtonMerchant
-public awb #CL:GuiButtonMerchant
+public axd #CL:GuiButtonMerchant
 
-protected atf.a #FD:GuiYesNo/field_73942_a #guiScreen
+protected aug.a #FD:GuiYesNo/field_73942_a #guiScreen

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
-qx cpw/mods/fml/common/network/Player
+rh cpw/mods/fml/common/network/Player
 net.minecraft.entity.player.EntityPlayer cpw/mods/fml/common/network/Player
 # block -> blockproxy
-amq cpw/mods/fml/common/registry/BlockProxy
+ank cpw/mods/fml/common/registry/BlockProxy
 net.minecraft.block.Block cpw/mods/fml/common/registry/BlockProxy
 # item -> itemproxy
-up cpw/mods/fml/common/registry/ItemProxy
+va cpw/mods/fml/common/registry/ItemProxy
 net.minecraft.item.Item cpw/mods/fml/common/registry/ItemProxy

fml/conf/fields.csv

@@ -238,6 +238,7 @@ field_70482_c,inventoryContents,2,
 field_70483_a,inventoryTitle,2,
 field_70484_a,container,2,The brewing stand this slot belongs to.
 field_70488_a,associatedChest,2,
+field_70499_f,isInReverse,2,
 field_70500_g,matrix,2,Minecart rotational logic matrix
 field_70501_d,cargoItems,2,Array of item stacks stored in minecart (for storage minecarts).
 field_70502_e,fuel,2,
@@ -686,6 +687,154 @@ field_71585_d,offsetsZForSide,2,gives the offset required for this axis to get t
 field_71586_b,offsetsXForSide,2,gives the offset required for this axis to get the block at that side.
 field_71587_c,offsetsYForSide,2,gives the offset required for this axis to get the block at that side.
 field_71588_a,faceToSide,2,Converts a face to a side.
+field_71589_f,bc_pbe_sha512,2,
+field_71590_g,bc_pbe_sha224,2,
+field_71591_d,bc_pbe_sha256,2,
+field_71592_e,bc_pbe_sha384,2,
+field_71593_b,bc_pbe,2,
+field_71594_c,bc_pbe_sha1,2,
+field_71595_a,bc,2,
+field_71596_n,bc_pbe_sha1_pkcs12_aes256_cbc,2,
+field_71597_o,bc_pbe_sha256_pkcs12_aes128_cbc,2,
+field_71598_l,bc_pbe_sha1_pkcs12_aes128_cbc,2,
+field_71599_m,bc_pbe_sha1_pkcs12_aes192_cbc,2,
+field_71600_j,bc_pbe_sha256_pkcs5,2,
+field_71601_k,bc_pbe_sha256_pkcs12,2,
+field_71602_h,bc_pbe_sha1_pkcs5,2,
+field_71603_i,bc_pbe_sha1_pkcs12,2,
+field_71604_q,bc_pbe_sha256_pkcs12_aes256_cbc,2,
+field_71605_p,bc_pbe_sha256_pkcs12_aes192_cbc,2,
+field_71610_b,cache,2,
+field_71611_a,identifier,2,
+field_71613_D,digestAlgorithm,2,
+field_71614_E,md2,2,
+field_71615_F,md4,2,
+field_71616_G,md5,2,
+field_71617_A,encryptionAlgorithm,2,
+field_71618_B,des_EDE3_CBC,2,
+field_71619_C,RC2_CBC,2,
+field_71620_L,id_hmacWithSHA512,2,
+field_71621_M,data,2,
+field_71622_N,signedData,2,
+field_71623_O,envelopedData,2,
+field_71624_H,id_hmacWithSHA1,2,
+field_71625_I,id_hmacWithSHA224,2,
+field_71626_J,id_hmacWithSHA256,2,
+field_71627_K,id_hmacWithSHA384,2,
+field_71628_U,pkcs_9_at_unstructuredName,2,
+field_71629_T,pkcs_9_at_emailAddress,2,
+field_71630_W,pkcs_9_at_messageDigest,2,
+field_71631_V,pkcs_9_at_contentType,2,
+field_71632_Q,digestedData,2,
+field_71633_P,signedAndEnvelopedData,2,
+field_71634_S,pkcs_9,2,
+field_71635_R,encryptedData,2,
+field_71636_Y,pkcs_9_at_counterSignature,2,
+field_71637_X,pkcs_9_at_signingTime,2,
+field_71638_Z,pkcs_9_at_challengePassword,2,
+field_71639_f,sha1WithRSAEncryption,2,
+field_71640_g,srsaOAEPEncryptionSET,2,
+field_71641_d,md4WithRSAEncryption,2,
+field_71642_e,md5WithRSAEncryption,2,
+field_71643_b,rsaEncryption,2,
+field_71644_c,md2WithRSAEncryption,2,
+field_71645_a,pkcs_1,2,
+field_71646_n,sha512WithRSAEncryption,2,
+field_71647_o,sha224WithRSAEncryption,2,
+field_71648_l,sha256WithRSAEncryption,2,
+field_71649_m,sha384WithRSAEncryption,2,
+field_71650_j,id_pSpecified,2,
+field_71651_k,id_RSASSA_PSS,2,
+field_71652_h,id_RSAES_OAEP,2,
+field_71653_i,id_mgf1,2,
+field_71654_w,pbeWithSHA1AndDES_CBC,2,
+field_71655_v,pbeWithMD5AndRC2_CBC,2,
+field_71656_u,pbeWithMD5AndDES_CBC,2,
+field_71657_t,pbeWithMD2AndRC2_CBC,2,
+field_71658_s,pbeWithMD2AndDES_CBC,2,
+field_71659_r,pkcs_5,2,
+field_71660_q,dhKeyAgreement,2,
+field_71661_p,pkcs_3,2,
+field_71662_z,id_PBKDF2,2,
+field_71663_y,id_PBES2,2,
+field_71664_x,pbeWithSHA1AndRC2_CBC,2,
+field_71665_bw,pbewithSHAAnd40BitRC2_CBC,2,
+field_71666_bv,pbeWithSHAAnd40BitRC2_CBC,2,
+field_71667_by,id_alg_CMSRC2wrap,2,
+field_71668_bx,id_alg_CMS3DESwrap,2,
+field_71669_bs,pbeWithSHAAnd3_KeyTripleDES_CBC,2,
+field_71670_br,pbeWithSHAAnd40BitRC4,2,
+field_71671_bu,pbeWithSHAAnd128BitRC2_CBC,2,
+field_71672_bt,pbeWithSHAAnd2_KeyTripleDES_CBC,2,
+field_71673_bn,secretBag,2,
+field_71674_bo,safeContentsBag,2,
+field_71675_bp,pkcs_12PbeIds,2,
+field_71676_bq,pbeWithSHAAnd128BitRC4,2,
+field_71677_bj,keyBag,2,
+field_71678_bk,pkcs8ShroudedKeyBag,2,
+field_71679_bl,certBag,2,
+field_71680_bm,crlBag,2,
+field_71681_bf,id_spq_ets_uri,2,
+field_71682_bg,id_spq_ets_unotice,2,
+field_71683_bh,pkcs_12,2,
+field_71684_bi,bagtypes,2,
+field_71685_bb,id_aa_sigPolicyId,2,
+field_71686_bc,id_aa_commitmentType,2,
+field_71687_bd,id_aa_signerLocation,2,
+field_71688_be,id_aa_otherSigCert,2,
+field_71689_aZ,id_aa_ets_certCRLTimestamp,2,
+field_71690_aY,id_aa_ets_escTimeStamp,2,
+field_71691_aR,id_aa_ets_signerAttr,2,
+field_71692_aQ,id_aa_ets_signerLocation,2,
+field_71693_aT,id_aa_ets_contentTimestamp,2,
+field_71694_aS,id_aa_ets_otherSigCert,2,
+field_71695_aV,id_aa_ets_revocationRefs,2,
+field_71696_aU,id_aa_ets_certificateRefs,2,
+field_71697_aX,id_aa_ets_revocationValues,2,
+field_71698_aW,id_aa_ets_certValues,2,
+field_71699_aI,id_aa_contentReference,2,
+field_71700_aJ,id_aa_encrypKeyPref,2,
+field_71701_aK,id_aa_signingCertificate,2,
+field_71702_aL,id_aa_signingCertificateV2,2,
+field_71703_aM,id_aa_contentIdentifier,2,
+field_71704_aN,id_aa_signatureTimeStampToken,2,
+field_71705_aO,id_aa_ets_sigPolicyId,2,
+field_71706_aP,id_aa_ets_commitmentType,2,
+field_71707_aA,id_cti_ets_proofOfDelivery,2,
+field_71708_aB,id_cti_ets_proofOfSender,2,
+field_71709_aC,id_cti_ets_proofOfApproval,2,
+field_71710_aD,id_cti_ets_proofOfCreation,2,
+field_71711_aE,id_aa,2,
+field_71712_aF,id_aa_receiptRequest,2,
+field_71713_aG,id_aa_contentHint,2,
+field_71714_aH,id_aa_msgSigDigest,2,
+field_71715_az,id_cti_ets_proofOfReceipt,2,
+field_71716_ay,id_cti_ets_proofOfOrigin,2,
+field_71717_ba,id_aa_ets_archiveTimestamp,2,
+field_71718_at,id_ct_TSTInfo,2,
+field_71719_as,id_ct_authData,2,
+field_71720_ar,id_ct,2,
+field_71721_aq,sMIMECapabilitiesVersions,2,
+field_71722_ax,id_cti,2,
+field_71723_aw,id_ct_timestampedData,2,
+field_71724_av,id_ct_authEnvelopedData,2,
+field_71725_au,id_ct_compressedData,2,
+field_71726_ak,sdsiCertificate,2,
+field_71727_al,crlTypes,2,
+field_71728_ai,certTypes,2,
+field_71729_aj,x509Certificate,2,
+field_71730_ao,preferSignedData,2,
+field_71731_ap,canNotDecryptAny,2,
+field_71732_am,x509Crl,2,
+field_71733_an,id_alg_PWRI_KEK,2,
+field_71734_ac,pkcs_9_at_signingDescription,2,
+field_71735_ad,pkcs_9_at_extensionRequest,2,
+field_71736_aa,pkcs_9_at_unstructuredAddress,2,
+field_71737_ab,pkcs_9_at_extendedCertificateAttributes,2,
+field_71738_ag,pkcs_9_at_localKeyId,2,
+field_71739_ah,x509certType,2,
+field_71740_ae,pkcs_9_at_smimeCapabilities,2,
+field_71741_af,pkcs_9_at_friendlyName,2,
 field_71743_a,theDecitatedServer,2,Reference to the DecitatedServer object.
 field_71748_d,connections,2,
 field_71749_b,isListening,2,Whether the network listener object is listening.
@@ -708,6 +857,36 @@ field_71782_a,iv,2,
 field_71784_a,key,2,
 field_71787_b,strength,2,
 field_71788_a,random,2,
+field_71796_f,pgpCFB,2,
+field_71797_d,cipher,2,
+field_71798_e,partialBlockOkay,2,
+field_71799_b,bufOff,2,
+field_71800_c,forEncryption,2,
+field_71801_a,buf,2,
+field_71809_f,encrypting,2,
+field_71810_d,blockSize,2,
+field_71811_e,cipher,2,
+field_71812_b,cfbV,2,
+field_71813_c,cfbOutV,2,
+field_71814_a,IV,2,
+field_71824_f,T2,2,
+field_71825_g,T3,2,
+field_71826_d,T0,2,
+field_71827_e,T1,2,
+field_71828_b,Si,2,
+field_71829_c,rcon,2,
+field_71830_a,S,2,
+field_71831_n,C0,2,
+field_71832_o,C1,2,
+field_71833_l,ROUNDS,2,
+field_71834_m,WorkingKey,2,
+field_71835_j,Tinv2,2,
+field_71836_k,Tinv3,2,
+field_71837_h,Tinv0,2,
+field_71838_i,Tinv1,2,
+field_71839_r,forEncryption,2,
+field_71840_q,C3,2,
+field_71841_p,C2,2,
 field_71844_b,strength,2,
 field_71845_a,random,2,
 field_71938_D,lavaStill,2,Stationary lava source block
@@ -1637,6 +1816,7 @@ field_73812_e,height,2,
 field_73813_b,xPos,2,
 field_73814_c,yPos,2,
 field_73815_a,fontRenderer,2,Have the font renderer from GuiScreen to render the textbox text into the screen.
+field_73816_n,lineScrollOffset,2,The current character index that should be used as start of the rendered text.
 field_73817_o,cursorPosition,2,
 field_73818_l,isFocused,2,"If this value is true along isEnabled, keyTyped will process the keys."
 field_73819_m,isEnabled,2,"If this value is true along isFocused, keyTyped will process the keys."
@@ -1886,7 +2066,7 @@ field_74263_b,workingMessage,2,
 field_74264_c,currentProgress,2,
 field_74265_a,progressMessage,2,
 field_74267_a,mcServer,2,Reference to the MinecraftServer object.
-field_74268_a,simpleDateFormatLogFormatter,2,Date Formatter of Log/Console.
+field_74268_a,dateFormat,2,The date format to use in the console log.
 field_74270_a,mcServer,2,Reference to the MinecraftServer object.
 field_74272_a,mcServer,2,Reference to the MinecraftServer object.
 field_74274_a,mcServer,2,Reference to the MinecraftServer object.
@@ -2092,15 +2272,20 @@ field_74756_a,data,2,The byte value for the tag.
 field_74784_a,tagMap,2,"The key-value pairs for the tag. Each key is a UTF string, each value is a tag."
 field_74790_a,enumJsonNodeTypeMappingArray,2,A mapping helper array for EnumJsonNodeType's values.
 field_74791_a,escapedString,2,
+field_74801_a,theBouncyCastleProvider,2,
 field_74813_d,currentLanguage,2,
 field_74814_e,isUnicode,2,
 field_74815_b,translateTable,2,Contains all key/value pairs to be translated - is loaded from '/lang/en_US.lang' when the StringTranslate is created.
 field_74816_c,languageList,2,
 field_74817_a,instance,2,Is the private singleton instance of StringTranslate.
+field_74822_f,ASYMMETRIC_GENERIC,2,
+field_74823_g,ASYMMETRIC_CIPHERS,2,
 field_74824_d,keyInfoConverters,2,
+field_74825_e,SYMMETRIC_CIPHERS,2,
 field_74826_b,CONFIGURATION,2,
 field_74827_c,info,2,
 field_74828_a,PROVIDER_NAME,2,
+field_74829_h,DIGESTS,2,
 field_74831_f,dhThreadSpec,2,
 field_74832_d,BC_DH_PERMISSION,2,
 field_74833_e,ecThreadSpec,2,
@@ -2111,6 +2296,17 @@ field_74839_a,localizedName,2,
 field_74842_b,permissionMask,2,
 field_74843_a,actions,2,
 field_74845_a,errorObjects,2,
+field_74846_d,buf,2,
+field_74847_b,theStreamCipher,2,
+field_74848_c,oneByte,2,
+field_74849_a,theBufferedBlockCipher,2,
+field_74853_f,maxBuf,2,
+field_74854_g,finalized,2,
+field_74855_d,inBuf,2,
+field_74856_e,bufOff,2,
+field_74857_b,theStreamCipher,2,
+field_74858_c,buf,2,
+field_74859_a,theBufferedBlockCipher,2,
 field_74885_f,coordBaseMode,2,switches the Coordinate System base off the Bounding Box
 field_74886_g,componentType,2,The type ID of this component.
 field_74887_e,boundingBox,2,
@@ -2486,6 +2682,7 @@ field_75624_e,classToIDMapping,2,provides a mapping between an Entity Class and
 field_75625_b,stringToClassMapping,2,Provides a mapping between entity classes and a string
 field_75626_c,classToStringMapping,2,Provides a mapping between a string and an entity classes
 field_75627_a,entityEggs,2,This is a HashMap of the Creative Entity Eggs/Spawners.
+field_75643_f,update,2,
 field_75644_d,posZ,2,
 field_75645_e,speed,2,The speed at which the entity should move
 field_75646_b,posX,2,
@@ -2505,6 +2702,7 @@ field_75675_d,watched,2,
 field_75676_b,dataValueId,2,id of max 31
 field_75677_c,watchedObject,2,
 field_75678_a,objectType,2,
+field_75694_d,lock,2,
 field_75695_b,watchedObjects,2,
 field_75696_c,objectChanged,2,true if one or more object was changed
 field_75697_a,dataTypes,2,
@@ -4186,6 +4384,7 @@ field_82134_g,secondaryEffect,2,Secondary potion effect given by this beacon.
 field_82136_e,levels,2,Level of this beacon's pyramid.
 field_82139_a,effectsList,2,List of effects that Beacon can apply
 field_82140_h,payment,2,Item given to this beacon as payment.
+field_82153_h,timeInPortal,2,
 field_82155_f,isAnvil,2,
 field_82156_g,fallHurtMax,2,Maximum amount of damage dealt to entities hit by falling block
 field_82157_e,isBreakingAnvil,2,
@@ -4257,6 +4456,7 @@ field_82374_e,facings,2,
 field_82387_b,intListPattern,2,"This matches things like ""-1,,4"", and is used for getting x,y,z,range from the token's argument list."
 field_82388_c,keyValueListPattern,2,"This matches things like ""rm=4,c=2"" and is used for handling named token arguments."
 field_82389_a,tokenPattern,2,"This matches the at-tokens introduced for command blocks, including their arguments, if any."
+field_82391_c,instance,2,
 field_82397_a,skullRenderer,2,
 field_82401_a,skeletonHeadModel,2,The Skeleton's head model.
 field_82405_a,renderBlocksInstance,2,
@@ -4265,9 +4465,17 @@ field_82446_a,renderedBatSize,2,"not actually sure this is size, is not used as
 field_82453_b,createFlatWorldGui,2,
 field_82458_b,flatPresetsGui,2,
 field_82470_g,playingSounds,2,Identifiers of all currently playing sounds. Type: HashSet<String>
+field_82471_f,minecartIsMoving,2,
+field_82472_g,silent,2,
+field_82473_d,playerSPRidingMinecart,2,
+field_82474_e,minecartIsDead,2,
 field_82475_b,theMinecart,2,Minecart which sound is being updated.
 field_82476_c,thePlayer,2,The player that is getting the minecart sound updates.
 field_82477_a,theSoundManager,2,
+field_82478_j,minecartRideSoundVolume,2,
+field_82479_k,minecartSpeed,2,
+field_82480_h,minecartSoundPitch,2,
+field_82481_i,minecartMoveSoundVolume,2,
 field_82483_a,itemDispenseBehaviorProvider,2,
 field_82484_c,defaultItemDispenseBehavior,2,Reference to the BehaviorDefaultDispenseItem object.
 field_82490_b,mcServer,2,
@@ -4311,10 +4519,16 @@ field_82587_b,theNBTTagCompound,2,
 field_82592_a,vec3dPool,2,
 field_82596_a,registryObjects,2,Objects registered on this registry.
 field_82597_b,defaultObject,2,"Default object for this registry, returned when an object is not found."
+field_82611_j,frontOffsetY,2,
+field_82612_k,frontOffsetZ,2,
+field_82614_i,frontOffsetX,2,
 field_82624_d,zPos,2,
 field_82625_b,xPos,2,
 field_82626_c,yPos,2,
 field_82627_a,worldObj,2,
+field_82628_b,y,2,
+field_82629_c,z,2,
+field_82630_a,x,2,
 field_82635_f,maxSpeedBoostTime,2,Maximum time the entity's speed should be boosted for.
 field_82636_d,speedBoosted,2,Whether the entity's speed is boosted.
 field_82637_e,speedBoostTime,2,"Counter for speed boosting, upon reaching maxSpeedBoostTime the speed boost will be disabled"
@@ -4338,6 +4552,9 @@ field_82681_h,cropTypeD,2,Fourth crop type for this field.
 field_82682_h,hasWitch,2,Whether this swamp hut has a witch.
 field_82693_j,playerReputation,2,List of player reputations with this village
 field_82694_i,noBreedTicks,2,Timestamp of tick count when villager last bred
+field_82696_f,structureGenerators,2,
+field_82701_j,lavaLakeGenerator,2,
+field_82703_i,waterLakeGenerator,2,
 field_82707_i,isAnimal,2,Whether this creature type is an animal.
 field_82717_g,anvil,2,
 field_82723_d,isSplashPotion,2,Whether the potion is a splash potion
@@ -4390,7 +4607,10 @@ field_82860_h,theWorld,2,
 field_82862_h,thePlayer,2,
 field_82864_f,beaconSlot,2,"This beacon's slot where you put in Emerald, Diamond, Gold or Iron Ingot."
 field_82866_e,theBeacon,2,
+field_82871_d,blockPosZ,2,
 field_82872_e,anvil,2,The anvil this slot belongs to.
+field_82873_b,blockPosX,2,
+field_82874_c,blockPosY,2,
 field_82875_a,theWorld,2,
 field_82876_a,beacon,2,The beacon this slot belongs to.
 field_82880_z,showCape,2,Whether to show your cape
@@ -4418,14 +4638,40 @@ field_83024_j,renderMaxY,2,The maximum Y value for rendering (default 1.0).
 field_83025_k,renderMinZ,2,The minimum Z value for rendering (default 0.0).
 field_83026_h,renderMaxX,2,The maximum X value for rendering (default 1.0).
 field_83027_i,renderMinY,2,The minimum Y value for rendering (default 0.0).
+field_85037_d,aiArrowAttack,2,
+field_85038_e,aiAttackOnCollide,2,
 field_85045_v,returningStack,2,Used when touchscreen is enabled
 field_85046_u,returningStackTime,2,
 field_85047_t,returningStackDestSlot,2,
 field_85050_q,draggedStack,2,Used when touchscreen is enabled
 field_85051_p,clickedSlot,2,Used when touchscreen is enabled
 field_85053_h,throwerName,2,
+field_85075_d,stackTrace,2,
+field_85109_a,worldInfoInstance,2,
+field_85111_a,worldInfoInstance,2,
+field_85113_a,worldInfoInstance,2,
+field_85115_a,worldInfoInstance,2,
+field_85135_a,worldInfoInstance,2,
+field_85137_a,worldInfoInstance,2,
+field_85139_a,worldInfoInstance,2,
+field_85141_a,worldInfoInstance,2,
+field_85143_a,worldInfoInstance,2,
 field_85180_cf,recordWait,2,
 field_85185_A,touchscreen,2,
+field_85192_a,worldServerInstance,2,
 field_90017_e,isMacOs,2,
 field_90018_r,isRightMouseClick,2,Used when touchscreen is enabled
 field_90044_b,records,2,List of all record items and their names.
+field_92009_j,explosionStrength,2,The explosion radius of spawned fireballs.
+field_92010_b,lifetime,2,The lifetime of the firework in ticks. When the age reaches the lifetime the firework explodes.
+field_92011_a,fireworkAge,2,The age of the firework in ticks.
+field_92014_j,explosionStrength,2,The explosion radius of spawned fireballs.
+field_92017_j,spawnedMob,2,
+field_92052_bU,firework,2,
+field_92053_bW,enchantedBook,2,
+field_92054_bV,fireworkCharge,2,
+field_92055_b,lifetime,2,The lifetime of the firework in ticks. When the age reaches the lifetime the firework explodes.
+field_92056_a,fireworkAge,2,The age of the firework in ticks.
+field_92104_bU,firework,2,
+field_92105_bW,enchantedBook,2,
+field_92106_bV,fireworkCharge,2,

fml/conf/methods.csv

@@ -237,6 +237,10 @@ func_70487_g,saveInventoryToNBT,2,
 func_70490_h,isMinecartPowered,2,Is this minecart powered (Fuel > 0)
 func_70491_i,getDamage,2,Gets the current amount of damage the minecart has taken. Decreases over time. The cart breaks when this is over 40.
 func_70492_c,setDamage,2,Sets the current amount of damage the minecart has taken. Decreases over time. The cart breaks when this is over 40.
+func_70493_k,getRollingDirection,2,Gets the rolling direction the cart rolls while being attacked. Can be 1 or -1.
+func_70494_i,setRollingDirection,2,Sets the rolling direction the cart rolls while being attacked. Can be 1 or -1.
+func_70496_j,getRollingAmplitude,2,Gets the rolling amplitude the cart rolls while being attacked.
+func_70497_h,setRollingAmplitude,2,Sets the rolling amplitude the cart rolls while being attacked.
 func_70498_d,setMinecartPowered,2,Set if this minecart is powered (Fuel > 0)
 func_70515_d,explode,2,
 func_70518_d,onValidSurface,2,checks to make sure painting can be placed there
@@ -376,9 +380,11 @@ func_70814_o,isValidLightLevel,2,Checks to make sure the light is not too bright
 func_70816_c,teleportToEntity,2,Teleport the enderman to another entity
 func_70817_b,setCarryingData,2,Set the metadata of the block an enderman carries
 func_70818_a,setCarried,2,Set the id of the block an enderman carries
+func_70819_e,setScreaming,2,
 func_70820_n,teleportRandomly,2,Teleport the enderman to a random nearby position
 func_70821_d,shouldAttackPlayer,2,Checks to see if this enderman should be attacking this player
 func_70822_p,getCarried,2,Get the id of the block an enderman carries
+func_70823_r,isScreaming,2,
 func_70824_q,getCarryingData,2,Get the metadata of the block an enderman carries
 func_70825_j,teleportTo,2,Teleport the enderman
 func_70829_a,setCreeperState,2,"Sets the state of creeper, -1 to idle and 1 to be 'in fuse'"
@@ -632,7 +638,7 @@ func_71269_o,setTexturePack,2,
 func_71270_I,getFolderName,2,
 func_71272_O,deleteWorldAndStopServer,2,WARNING : directly calls  getActiveAnvilConverter().deleteWorldDirectory(theWorldServer[0].getSaveHandler().getSaveDirectoryName());
 func_71273_Y,getMOTD,2,
-func_71274_v,getServerMOTD,2,minecraftServer.getMOTD is used in 2 places instead (it is a non-virtual function which returns the same thing)
+func_71274_v,getServerMOTD,2,Returns the server message of the day
 func_71275_y,getMaxPlayers,2,Returns the maximum number of players allowed on the server.
 func_71276_C,getServer,2,Gets mcServer.
 func_71277_t,getHostname,2,Returns the server's hostname.
@@ -779,6 +785,9 @@ func_71571_b,set,2,
 func_71575_a,getCrashReport,2,Gets the CrashReport wrapped by this exception.
 func_71606_a,toASN1Primitive,2,
 func_71607_a,asn1Equals,2,
+func_71608_a,isValidIdentifier,2,
+func_71609_b,getId,2,
+func_71612_a,branch,2,
 func_71742_a,getType,2,
 func_71744_a,stopListening,2,
 func_71745_a,addPlayer,2,adds this connection to the list of currently connected players
@@ -795,8 +804,28 @@ func_71770_b,isLocalHost,2,
 func_71779_a,getIV,2,
 func_71780_b,getParameters,2,
 func_71783_a,getKey,2,
+func_71789_b,getOutputSize,2,
+func_71790_a,doFinal,2,
+func_71791_a,processByte,2,
+func_71792_a,getBlockSize,2,
+func_71793_a,getUpdateOutputSize,2,
+func_71794_b,reset,2,
 func_71802_a,getAlgorithmName,2,Return the name of the algorithm the cipher implements.
+func_71803_c,reset,2,
 func_71804_b,getBlockSize,2,Return the block size for this cipher (in bytes).
+func_71805_a,init,2,
+func_71806_a,processBlock,2,
+func_71807_b,encryptBlock,2,
+func_71808_c,decryptBlock,2,
+func_71815_c,subWord,2,
+func_71816_a,unpackBlock,2,
+func_71817_a,FFmulX,2,
+func_71818_a,encryptBlock,2,
+func_71819_a,shift,2,
+func_71820_b,inv_mcol,2,
+func_71821_b,packBlock,2,
+func_71822_b,decryptBlock,2,
+func_71823_a,generateWorkingKey,2,
 func_71842_b,getStrength,2,Return the bit strength for keys produced by this generator.
 func_71843_a,getRandom,2,Return the random source associated with this generator.
 func_71846_a,onBlockHarvested,2,Called when the block is attempted to be harvested
@@ -1408,7 +1437,7 @@ func_72896_J,isRaining,2,Returns true if the current rain strength is greater th
 func_72897_h,joinEntityInSurroundings,2,spwans an entity and loads surrounding chunks
 func_72898_h,notifyBlocksOfNeighborChange,2,"Notifies neighboring blocks that this specified block changed  Args: x, y, z, blockID"
 func_72899_e,blockExists,2,"Returns whether a block exists at world coordinates x, y, z"
-func_72900_e,setEntityDead,2,"Dismounts the entity (and anything riding the entity), sets the dead flag, and removes the player entity from the player entity list. Called by the playerLoggedOut function."
+func_72900_e,removeEntity,2,Schedule the entity for removal during the next tick. Marks the entity dead in anticipation.
 func_72901_a,rayTraceBlocks_do,2,
 func_72902_n,markBlockForRenderUpdate,2,"On the client, re-renders this block. On the server, does nothing. Used for lighting updates."
 func_72903_x,setActivePlayerChunksAndCheckLight,2,
@@ -1480,7 +1509,7 @@ func_72969_x,updateAllLightTypes,2,
 func_72970_h,createChunkProvider,2,Creates the chunk provider for this world. Called in the constructor. Retrieves provider from worldProvider?
 func_72971_b,getSunBrightness,2,"Returns the sun brightness - checks time of day, rain and thunder"
 func_72972_b,getSavedLightValue,2,Returns saved light value without taking into account the time of day.  Either looks in the sky light map or block light map based on the enumSkyBlock arg.
-func_72973_f,removeEntity,2,remove dat player from dem servers
+func_72973_f,removePlayerEntityDangerously,2,Do NOT use this method to remove normal entities- use normal removeEntity
 func_72974_f,setSpawnLocation,2,"Sets a new spawn location by finding an uncovered block at a random (x,z) location in the chunk."
 func_72975_g,markBlocksDirtyVertical,2,marks a vertical line of blocks as dirty
 func_72976_f,getHeightValue,2,"Returns the y coordinate with a block in it at this x, z coordinate"
@@ -1705,7 +1734,7 @@ func_73730_a,drawHorizontalLine,2,
 func_73731_b,drawString,2,Renders the specified text to the screen.
 func_73732_a,drawCenteredString,2,"Renders the specified text to the screen, center-aligned."
 func_73733_a,drawGradientRect,2,Draws a rectangle with a vertical gradient between the specified colors.
-func_73734_a,drawRect,2,Draws a solid color rectangle with the specified coordinates and color.
+func_73734_a,drawRect,2,"Draws a solid color rectangle with the specified coordinates and color. Args: x1, y1, x2, y2, color"
 func_73736_c,mousePressed,2,Returns true if the mouse has been pressed on this control. Equivalent of MouseListener.mousePressed(MouseEvent e).
 func_73737_a,drawButton,2,Draws this button to the screen.
 func_73738_a,getHoverState,2,"Returns 0 if the button is disabled, 1 if the mouse is NOT hovering over this button and 2 if it IS hovering over this button."
@@ -1866,6 +1895,7 @@ func_74191_a,handleMouseClick,2,
 func_74192_a,drawSlotInventory,2,Draws an inventory slot
 func_74199_h,getIMerchant,2,Gets the Instance of IMerchant interface.
 func_74221_h,displayDebuffEffects,2,Displays debuff/potion effects that are currently being applied to the player
+func_74223_a,drawPlayerOnGui,2,
 func_74226_k,needsScrollBars,2,returns (if you are not on the inventoryTab) and (the flag isn't set) and( you have more than 1 page of items)
 func_74227_b,setCurrentCreativeTab,2,
 func_74228_j,updateCreativeSearch,2,
@@ -2112,13 +2142,19 @@ func_74809_c,translateNamedKey,2,"Translate a key with a extra '.name' at end ad
 func_74810_a,setLanguage,2,
 func_74811_c,getCurrentLanguage,2,
 func_74812_a,loadLanguage,2,
+func_74818_a,setup,2,
+func_74819_a,loadAlgorithms,2,
+func_74820_b,addMacAlgorithms,2,
+func_74821_a,doSetup,2,
 func_74830_a,toLowerCase,2,A locale independent version of toLowerCase that returns a US ASCII lowercase String.
 func_74837_a,translateToLocalFormatted,2,Translates a Stat name with format args
 func_74838_a,translateToLocal,2,Translates a Stat name
 func_74840_a,configure,2,
 func_74841_a,calculateMask,2,
 func_74844_a,getErrorOjbects,2,
+func_74850_a,processBytes,2,
 func_74851_a,returnByte,2,"Encrypt/decrypt a single byte, returning the result."
+func_74852_a,nextChunk,2,
 func_74860_a,isLiquidInStructureBoundingBox,2,checks the entire StructureBoundingBox for Liquids
 func_74861_a,buildComponent,2,"Initiates construction of the Structure Component picked, at the current Location of StructGen"
 func_74862_a,getYWithOffset,2,
@@ -2400,6 +2436,8 @@ func_75620_a,createEntityByName,2,Create a new instance of an entity in the worl
 func_75621_b,getEntityString,2,Gets the string representation of a specific entity.
 func_75630_a,multiplyBy32AndRound,2,
 func_75638_b,getSpeed,2,
+func_75639_a,limitAngle,2,Limits the given angle to a upper and lower limit.
+func_75640_a,isUpdating,2,
 func_75641_c,onUpdateMoveHelper,2,
 func_75642_a,setMoveTo,2,Sets the speed and location to move to
 func_75649_a,onUpdateLook,2,Updates look
@@ -3312,7 +3350,7 @@ func_77642_a,setContainerItem,2,
 func_77643_m_,isMap,2,false for all Items except sub-classes of ItemMapBase
 func_77644_a,hitEntity,2,Current implementations of this method in child classes do not use the entry argument beside ev. They just raise the damage on the stack.
 func_77645_m,isDamageable,2,
-func_77646_a,itemInteractionForEntity,2,"dye sheep, place saddles, etc ..."
+func_77646_a,itemInteractionForEntity,2,Called when a player right clicks an entity with an item.
 func_77647_b,getMetadata,2,Returns the metadata of the block which this Item (ItemBlock) can place
 func_77648_a,onItemUse,2,"Callback for item usage. If the item does something special on right clicking, he will have one of those. Return True if something happen and false if it don't. This is for ITEMS, not BLOCKS"
 func_77649_a,getDamageVsEntity,2,Returns the damage against a given entity.
@@ -3334,6 +3372,7 @@ func_77665_c,setIconIndex,2,Sets the icon index for this item. Returns the item.
 func_77666_t,getPotionEffect,2,Returns a string representing what this item does to a potion.
 func_77667_c,getItemNameIS,2,
 func_77668_q,getContainerItem,2,
+func_77825_f,getToolMaterialName,2,Return the name for this tool's material.
 func_77828_a,validBookTagContents,2,
 func_77829_a,validBookTagPages,2,
 func_77831_g,isSplash,2,returns wether or not a potion is a throwable splash potion based on damage value
@@ -3535,6 +3574,8 @@ func_78440_a,renderItemInFirstPerson,2,Renders the active item in the player's h
 func_78441_a,updateEquippedItem,2,
 func_78442_d,renderFireInFirstPerson,2,Renders the fire on the screen for first person mode. Arg: partialTickTime
 func_78443_a,renderItem,2,Renders the item stack for being in an entity's hand Args: itemStack
+func_78444_b,resetEquippedProgress,2,Resets equippedProgress
+func_78445_c,resetEquippedProgress2,2,Resets equippedProgress
 func_78446_a,renderInsideOfBlock,2,"Renders the texture of the block the player is inside as an overlay. Args: partialTickTime, blockTextureIndex"
 func_78447_b,renderOverlays,2,Renders all the overlays that are in first person mode. Args: partialTickTime
 func_78448_c,renderWarpedTextureOverlay,2,Renders a texture that warps around based on the direction the player is looking. Texture needs to be bound before being called. Used for the water overlay. Args: parialTickTime
@@ -3736,11 +3777,12 @@ func_79006_b,getStatsComponent,2,Returns a new JPanel with a new GuiStatsCompone
 func_79007_c,getPlayerListComponent,2,Returns a new JScrollPane with a new PlayerListBox inside.
 func_79013_a,update,2,Public static accessor to call updateStats.
 func_79014_a,updateStats,2,Updates the stat values and calls paint to redraw the component.
+func_79015_a,calcArrayAverage,2,Calculates the avarage value of the given long array.
 func_80003_ah,getPlayerUsageSnooper,2,
 func_80006_f,getUniqueID,2,
 func_80007_l,getDimensionName,2,"Returns the dimension's name, e.g. ""The End"", ""Nether"", or ""Overworld""."
 func_82011_an,enableGui,2,
-func_82114_b,getPlayerCoordinates,2,Return the coordinates for this player as ChunkCoordinates.
+func_82114_b,getPlayerCoordinates,2,Return the position for this command sender.
 func_82116_a,setSkullRotation,2,Set the skull's rotation
 func_82117_a,getSkullType,2,Get the entity type for the skull
 func_82118_a,setSkullType,2,Set the entity type for the skull
@@ -3780,6 +3822,7 @@ func_82205_o,isArmored,2,Returns whether the wither is armored with its boss arm
 func_82227_f,setChild,2,Set whether this zombie is a child.
 func_82228_a,startConversion,2,Starts converting this zombie into a villager. The zombie converts into a villager after the specified time in ticks.
 func_82229_g,setVillager,2,Set whether this zombie is a villager.
+func_82230_o,isConverting,2,Returns whether this zombie is in the process of converting to a villager
 func_82231_m,isVillager,2,Return whether this zombie is a villager.
 func_82232_p,convertToVillager,2,Convert this zombie into a villager.
 func_82233_q,getConversionTimeBoost,2,Return the amount of time decremented from conversionTime every tick.
@@ -3827,6 +3870,7 @@ func_82366_d,getGameRules,2,Return the game rule set this command should be able
 func_82369_d,getAllOnlineUsernames,2,Return all usernames currently connected to the server.
 func_82370_a,getUsernameIndex,2,Return a command's first parameter index containing a valid username.
 func_82371_e,getDistanceSquaredToChunkCoordinates,2,Return the squared distance between this coordinates and the ChunkCoordinates given as argument.
+func_82372_a,getMovementDirection,2,Returns the movement direction from a velocity vector.
 func_82375_f,getDefaultMinimumLevel,2,Gets the default minimum experience level (argument lm)
 func_82376_e,getDefaultMaximumLevel,2,Gets the default maximum experience level (argument l)
 func_82377_a,matchesMultiplePlayers,2,Returns whether the given pattern can match more than one player.
@@ -3884,6 +3928,9 @@ func_82582_d,hasNoTags,2,Return whether this compound has no tags.
 func_82591_c,getPoolSize,2,
 func_82593_b,getPlaceSound,2,Used when a player places a block.
 func_82595_a,putObject,2,Register an object on this registry.
+func_82599_e,getFrontOffsetZ,2,Returns a offset that addresses the block in front of this facing.
+func_82600_a,getFront,2,Returns the facing that represents the block in front of it.
+func_82601_c,getFrontOffsetX,2,Returns a offset that addresses the block in front of this facing.
 func_82615_a,getX,2,
 func_82616_c,getZ,2,
 func_82617_b,getY,2,
@@ -4030,10 +4077,12 @@ func_85104_a,onBlockPlaced,2,"Called when a block is placed using its ItemBlock.
 func_85105_g,onPostBlockPlaced,2,Called after a block is placed
 func_85106_a,insertRecord,2,Insert the specified music disc in the jukebox at the given coordinates
 func_85107_d,updateLadderBounds,2,Update the ladder block bounds based on the given metadata value.
+func_85118_a,addToCrashReport,2,Adds this WorldInfo instance to the crash report.
 func_85128_b,getMapFeaturesEnabled,2,Return the map feautures enabled of a world
 func_85132_a,getTerrainTypeOfWorld,2,Return the terrain type of a world
 func_85151_d,getLowerChestInventory,2,Return this chest container's lower chest inventory.
 func_85173_a,playSoundToNearExcept,2,Plays sound to all near players except the player reference given
+func_85175_e,blockGetRenderType,2,Returns the render type of the block at the given coordinate.
 func_85187_a,drawString,2,"Draws the specified string. Args: string, x, y, color, dropShadow"
 func_90010_a,isPartOfLargeChest,2,Return whether the given inventory is part of this large chest.
 func_90011_a,createChild,2,
@@ -4046,3 +4095,10 @@ func_90036_a,getFireAspectModifier,2,
 func_90042_d,getRecord,2,Return the record item corresponding to the given name.
 func_90043_g,getRecordTitle,2,Return the title for this record.
 func_90999_ad,canRenderOnFire,2,Return whether this entity should be rendered as on fire.
+func_92013_a,setEntityItem,2,Sets the ItemStack corresponding to this Entity (and updates the DataWatcher for it)
+func_92014_d,getEntityItem,2,"Returns the ItemStack corresponding to the Entity (Note: if no item exists, will log an error but still return an ItemStack containing Block.stone)"
+func_92015_a,getMobID,2,
+func_92027_k,sendChatMsg,2,Sends the given string to every player as chat message.
+func_92059_d,getEntityItem,2,"Returns the ItemStack corresponding to the Entity (Note: if no item exists, will log an error but still return an ItemStack containing Block.stone)"
+func_92062_k,sendChatMsg,2,Sends the given string to every player as chat message.
+func_92103_a,addRecipe,2,

fml/conf/packages.csv

@@ -1,17 +1,45 @@
 class,package
-EntityFireworkOverlayFX,net/minecraft/client/particle
-EntityFireworkSparkFX,net/minecraft/client/particle
-EntityFireworkStarterFX,net/minecraft/client/particle
-ScheduledSound,net/minecraft/client/audio
-BehaviorDispenseFirework,net/minecraft/dispenser
-EnchantmentThorns,net/minecraft/enchantment
-EntityFireworkRocket,net/minecraft/entity/item
-ItemBook,net/minecraft/item
-ItemEnchantedBook,net/minecraft/item
-ItemFirework,net/minecraft/item
-ItemFireworkCharge,net/minecraft/item
-RecipeFireworks,net/minecraft/item/crafting
-TileEntityMobSpawnerSpawnData,net/minecraft/tileentity
+IconRegister,net/minecraft/client/renderer
+Rect2i,net/minecraft/client/renderer
+RenderTntMinecart,net/minecraft/client/renderer/entity
+ScreenHopper,net/minecraft/client/gui
+StitchHolder,net/minecraft/client/renderer
+StitchSlot,net/minecraft/client/renderer
+Stitcher,net/minecraft/client/renderer
+Texture,net/minecraft/client/renderer
+TextureClock,net/minecraft/client/renderer
+TextureCompass,net/minecraft/client/renderer
+TextureManager,net/minecraft/client/renderer
+TextureMap,net/minecraft/client/renderer
+TextureStitched,net/minecraft/client/renderer
+BlockBasePressurePlate,net/minecraft/block
+BlockBaseRail,net/minecraft/block
+BlockBaseRailLogic,net/minecraft/block
+BlockComparator,net/minecraft/block
+BlockDaylightDetector,net/minecraft/block
+BlockHopper,net/minecraft/block
+BlockPoweredMetal,net/minecraft/block
+BlockPoweredRail,net/minecraft/block
+BlockQuartz,net/minecraft/block
+BlockRepeater,net/minecraft/block
+BlockStoneButton,net/minecraft/block
+BlockWeightedPressurePlate,net/minecraft/block
+BlockWoodButton,net/minecraft/block
+CallableTileEntityData,net/minecraft/tileentity
+CallableTileEntityID,net/minecraft/tileentity
+CombatEntry,net/minecraft/util
+CombatTracker,net/minecraft/util
+ContainerWorldly,net/minecraft/inventory
+EntitySelectorAlive,net/minecraft/command
+EntitySelectorHopperInventory,net/minecraft/tileentity
+Icon,net/minecraft/item
+ItemChestMinecart,net/minecraft/item
+ItemFurnaceMinecart,net/minecraft/item
+ItemRideableMinecart,net/minecraft/item
+ItemTntMinecart,net/minecraft/item
+MenuHopper,net/minecraft/inventory
+TileEntityDaylightDetector,net/minecraft/tileentity
+TileEntityHopper,net/minecraft/tileentity
 Block,net/minecraft/block
 BlockAnvil,net/minecraft/block
 BlockBeacon,net/minecraft/block
@@ -158,6 +186,7 @@ ThreadClientSleep,net/minecraft/client
 ThreadShutdown,net/minecraft/client
 CodecMus,net/minecraft/client/audio
 MusInputStream,net/minecraft/client/audio
+ScheduledSound,net/minecraft/client/audio
 SoundManager,net/minecraft/client/audio
 SoundPool,net/minecraft/client/audio
 SoundPoolEntry,net/minecraft/client/audio
@@ -325,6 +354,9 @@ EntityDropParticleFX,net/minecraft/client/particle
 EntityEnchantmentTableParticleFX,net/minecraft/client/particle
 EntityExplodeFX,net/minecraft/client/particle
 EntityFX,net/minecraft/client/particle
+EntityFireworkOverlayFX,net/minecraft/client/particle
+EntityFireworkSparkFX,net/minecraft/client/particle
+EntityFireworkStarterFX,net/minecraft/client/particle
 EntityFlameFX,net/minecraft/client/particle
 EntityFootStepFX,net/minecraft/client/particle
 EntityHeartFX,net/minecraft/client/particle
@@ -538,6 +570,7 @@ BehaviorBucketFullDispense,net/minecraft/dispenser
 BehaviorDefaultDispenseItem,net/minecraft/dispenser
 BehaviorDispenseBoat,net/minecraft/dispenser
 BehaviorDispenseFireball,net/minecraft/dispenser
+BehaviorDispenseFirework,net/minecraft/dispenser
 BehaviorDispenseItemProvider,net/minecraft/dispenser
 BehaviorDispenseMinecart,net/minecraft/dispenser
 BehaviorEggDispense,net/minecraft/dispenser
@@ -574,6 +607,7 @@ EnchantmentModifierDamage,net/minecraft/enchantment
 EnchantmentModifierLiving,net/minecraft/enchantment
 EnchantmentOxygen,net/minecraft/enchantment
 EnchantmentProtection,net/minecraft/enchantment
+EnchantmentThorns,net/minecraft/enchantment
 EnchantmentUntouching,net/minecraft/enchantment
 EnchantmentWaterWorker,net/minecraft/enchantment
 EnumEnchantmentType,net/minecraft/enchantment
@@ -669,6 +703,7 @@ EntityEnderEye,net/minecraft/entity/item
 EntityEnderPearl,net/minecraft/entity/item
 EntityExpBottle,net/minecraft/entity/item
 EntityFallingSand,net/minecraft/entity/item
+EntityFireworkRocket,net/minecraft/entity/item
 EntityItem,net/minecraft/entity/item
 EntityItemFrame,net/minecraft/entity/item
 EntityMinecart,net/minecraft/entity/item
@@ -771,6 +806,7 @@ ItemAxe,net/minecraft/item
 ItemBed,net/minecraft/item
 ItemBlock,net/minecraft/item
 ItemBoat,net/minecraft/item
+ItemBook,net/minecraft/item
 ItemBow,net/minecraft/item
 ItemBucket,net/minecraft/item
 ItemBucketMilk,net/minecraft/item
@@ -783,10 +819,13 @@ ItemDye,net/minecraft/item
 ItemEditableBook,net/minecraft/item
 ItemEgg,net/minecraft/item
 ItemEmptyMap,net/minecraft/item
+ItemEnchantedBook,net/minecraft/item
 ItemEnderEye,net/minecraft/item
 ItemEnderPearl,net/minecraft/item
 ItemExpBottle,net/minecraft/item
 ItemFireball,net/minecraft/item
+ItemFirework,net/minecraft/item
+ItemFireworkCharge,net/minecraft/item
 ItemFishingRod,net/minecraft/item
 ItemFlintAndSteel,net/minecraft/item
 ItemFood,net/minecraft/item
@@ -825,6 +864,7 @@ ItemWritableBook,net/minecraft/item
 CraftingManager,net/minecraft/item/crafting
 FurnaceRecipes,net/minecraft/item/crafting
 IRecipe,net/minecraft/item/crafting
+RecipeFireworks,net/minecraft/item/crafting
 RecipeSorter,net/minecraft/item/crafting
 RecipesArmor,net/minecraft/item/crafting
 RecipesArmorDyes,net/minecraft/item/crafting
@@ -1034,6 +1074,7 @@ TileEntityEndPortal,net/minecraft/tileentity
 TileEntityEnderChest,net/minecraft/tileentity
 TileEntityFurnace,net/minecraft/tileentity
 TileEntityMobSpawner,net/minecraft/tileentity
+TileEntityMobSpawnerSpawnData,net/minecraft/tileentity
 TileEntityNote,net/minecraft/tileentity
 TileEntityPiston,net/minecraft/tileentity
 TileEntitySign,net/minecraft/tileentity

fml/conf/patches/minecraft_ff.patch

@@ -1,7 +1,7 @@
 diff -r -U 3 minecraft\net\minecraft\client\Minecraft.java minecraft_patched\net\minecraft\client\Minecraft.java
---- minecraft\net\minecraft\client\Minecraft.java	Mon Dec 17 22:49:48 2012
-+++ minecraft_patched\net\minecraft\client\Minecraft.java	Mon Dec 17 22:51:37 2012
-@@ -546,9 +546,8 @@
+--- minecraft\net\minecraft\client\Minecraft.java	Sat Jan 12 02:17:55 2013
++++ minecraft_patched\net\minecraft\client\Minecraft.java	Sat Jan 12 02:24:09 2013
+@@ -532,9 +532,8 @@
           return;
        }
  
@@ -12,7 +12,7 @@ diff -r -U 3 minecraft\net\minecraft\client\Minecraft.java minecraft_patched\net
                 if(this.field_71434_R && this.field_71433_S != null) {
                    this.func_71377_b(this.field_71433_S);
                    return;
-@@ -566,7 +565,6 @@
+@@ -552,7 +551,6 @@
                    this.func_71373_a(new GuiMemoryErrorScreen());
                    System.gc();
                 }
@@ -20,7 +20,7 @@ diff -r -U 3 minecraft\net\minecraft\client\Minecraft.java minecraft_patched\net
              }
           } catch (MinecraftError var12) {
              ;
-@@ -584,8 +582,6 @@
+@@ -570,8 +568,6 @@
              this.func_71405_e();
           }
  
@@ -30,8 +30,8 @@ diff -r -U 3 minecraft\net\minecraft\client\Minecraft.java minecraft_patched\net
  
     private void func_71411_J() {
 diff -r -U 3 minecraft\net\minecraft\src\CallableSuspiciousClasses.java minecraft_patched\net\minecraft\src\CallableSuspiciousClasses.java
---- minecraft\net\minecraft\src\CallableSuspiciousClasses.java	Mon Dec 17 22:49:49 2012
-+++ minecraft_patched\net\minecraft\src\CallableSuspiciousClasses.java	Mon Dec 17 22:51:37 2012
+--- minecraft\net\minecraft\src\CallableSuspiciousClasses.java	Sat Jan 12 02:17:56 2013
++++ minecraft_patched\net\minecraft\src\CallableSuspiciousClasses.java	Sat Jan 12 02:24:09 2013
 @@ -21,9 +21,14 @@
  
     public String func_85085_a() {
@@ -51,8 +51,8 @@ diff -r -U 3 minecraft\net\minecraft\src\CallableSuspiciousClasses.java minecraf
        boolean var5 = !CrashReport.class.getCanonicalName().equals("net.minecraft.CrashReport");
        HashMap var6 = new HashMap();
 diff -r -U 3 minecraft\net\minecraft\src\CodecMus.java minecraft_patched\net\minecraft\src\CodecMus.java
---- minecraft\net\minecraft\src\CodecMus.java	Mon Dec 17 22:49:49 2012
-+++ minecraft_patched\net\minecraft\src\CodecMus.java	Mon Dec 17 22:51:37 2012
+--- minecraft\net\minecraft\src\CodecMus.java	Sat Jan 12 02:17:56 2013
++++ minecraft_patched\net\minecraft\src\CodecMus.java	Sat Jan 12 02:24:09 2013
 @@ -1,5 +1,6 @@
  package net.minecraft.src;
  
@@ -73,8 +73,8 @@ diff -r -U 3 minecraft\net\minecraft\src\CodecMus.java minecraft_patched\net\min
     }
  }
 diff -r -U 3 minecraft\net\minecraft\src\ComponentStrongholdRightTurn.java minecraft_patched\net\minecraft\src\ComponentStrongholdRightTurn.java
---- minecraft\net\minecraft\src\ComponentStrongholdRightTurn.java	Mon Dec 17 22:49:49 2012
-+++ minecraft_patched\net\minecraft\src\ComponentStrongholdRightTurn.java	Mon Dec 17 22:51:37 2012
+--- minecraft\net\minecraft\src\ComponentStrongholdRightTurn.java	Sat Jan 12 02:17:57 2013
++++ minecraft_patched\net\minecraft\src\ComponentStrongholdRightTurn.java	Sat Jan 12 02:24:09 2013
 @@ -11,6 +11,10 @@
  
  public class ComponentStrongholdRightTurn extends ComponentStrongholdLeftTurn {
@@ -87,8 +87,8 @@ diff -r -U 3 minecraft\net\minecraft\src\ComponentStrongholdRightTurn.java minec
        if(this.field_74885_f != 2 && this.field_74885_f != 3) {
           this.func_74989_b((ComponentStrongholdStairs2)p_74861_1_, p_74861_2_, p_74861_3_, 1, 1);
 diff -r -U 3 minecraft\net\minecraft\src\DedicatedServer.java minecraft_patched\net\minecraft\src\DedicatedServer.java
---- minecraft\net\minecraft\src\DedicatedServer.java	Mon Dec 17 22:49:49 2012
-+++ minecraft_patched\net\minecraft\src\DedicatedServer.java	Mon Dec 17 22:51:37 2012
+--- minecraft\net\minecraft\src\DedicatedServer.java	Sat Jan 12 02:17:57 2013
++++ minecraft_patched\net\minecraft\src\DedicatedServer.java	Sat Jan 12 02:24:09 2013
 @@ -202,7 +202,7 @@
        System.exit(0);
     }
@@ -98,27 +98,9 @@ diff -r -U 3 minecraft\net\minecraft\src\DedicatedServer.java minecraft_patched\
        super.func_71190_q();
        this.func_71333_ah();
     }
-diff -r -U 3 minecraft\net\minecraft\src\EntityMooshroom.java minecraft_patched\net\minecraft\src\EntityMooshroom.java
---- minecraft\net\minecraft\src\EntityMooshroom.java	Mon Dec 17 22:49:50 2012
-+++ minecraft_patched\net\minecraft\src\EntityMooshroom.java	Mon Dec 17 22:51:37 2012
-@@ -56,10 +56,10 @@
-       return new EntityMooshroom(this.field_70170_p);
-    }
- 
--   // $FF: synthetic method
--   public EntityCow func_70879_a(EntityAgeable p_70879_1_) {
--      return this.func_70879_a(p_70879_1_);
--   }
-+//   // $FF: synthetic method
-+//   public EntityCow func_70879_a(EntityAgeable p_70879_1_) {
-+//      return this.func_70879_a(p_70879_1_);
-+//   }
- 
-    // $FF: synthetic method
-    public EntityAgeable func_90011_a(EntityAgeable p_90011_1_) {
 diff -r -U 3 minecraft\net\minecraft\src\FontRenderer.java minecraft_patched\net\minecraft\src\FontRenderer.java
---- minecraft\net\minecraft\src\FontRenderer.java	Mon Dec 17 22:49:50 2012
-+++ minecraft_patched\net\minecraft\src\FontRenderer.java	Mon Dec 17 22:51:37 2012
+--- minecraft\net\minecraft\src\FontRenderer.java	Sat Jan 12 02:17:58 2013
++++ minecraft_patched\net\minecraft\src\FontRenderer.java	Sat Jan 12 02:24:09 2013
 @@ -611,8 +611,6 @@
           case 10:
              --var5;
@@ -138,8 +120,8 @@ diff -r -U 3 minecraft\net\minecraft\src\FontRenderer.java minecraft_patched\net
              var4 += this.func_78263_a(var8);
              if(var7) {
 diff -r -U 3 minecraft\net\minecraft\src\IntegratedServer.java minecraft_patched\net\minecraft\src\IntegratedServer.java
---- minecraft\net\minecraft\src\IntegratedServer.java	Mon Dec 17 22:49:50 2012
-+++ minecraft_patched\net\minecraft\src\IntegratedServer.java	Mon Dec 17 22:51:37 2012
+--- minecraft\net\minecraft\src\IntegratedServer.java	Sat Jan 12 02:17:58 2013
++++ minecraft_patched\net\minecraft\src\IntegratedServer.java	Sat Jan 12 02:24:09 2013
 @@ -98,7 +98,7 @@
        return true;
     }
@@ -150,9 +132,9 @@ diff -r -U 3 minecraft\net\minecraft\src\IntegratedServer.java minecraft_patched
        this.field_71348_o = this.field_71347_n.func_71752_f();
        if(!var1 && this.field_71348_o) {
 diff -r -U 3 minecraft\net\minecraft\src\RenderGlobal.java minecraft_patched\net\minecraft\src\RenderGlobal.java
---- minecraft\net\minecraft\src\RenderGlobal.java	Mon Dec 17 22:49:52 2012
-+++ minecraft_patched\net\minecraft\src\RenderGlobal.java	Mon Dec 17 22:51:37 2012
-@@ -1447,7 +1447,7 @@
+--- minecraft\net\minecraft\src\RenderGlobal.java	Sat Jan 12 02:17:59 2013
++++ minecraft_patched\net\minecraft\src\RenderGlobal.java	Sat Jan 12 02:24:09 2013
+@@ -1450,7 +1450,7 @@
           double var15 = this.field_72777_q.field_71451_h.field_70165_t - p_72726_2_;
           double var17 = this.field_72777_q.field_71451_h.field_70163_u - p_72726_4_;
           double var19 = this.field_72777_q.field_71451_h.field_70161_v - p_72726_6_;
@@ -162,8 +144,8 @@ diff -r -U 3 minecraft\net\minecraft\src\RenderGlobal.java minecraft_patched\net
              this.field_72777_q.field_71452_i.func_78873_a(var21 = new EntityHugeExplodeFX(this.field_72769_h, p_72726_2_, p_72726_4_, p_72726_6_, p_72726_8_, p_72726_10_, p_72726_12_));
           } else if(p_72726_1_.equals("largeexplode")) {
 diff -r -U 3 minecraft\net\minecraft\src\TcpMasterThread.java minecraft_patched\net\minecraft\src\TcpMasterThread.java
---- minecraft\net\minecraft\src\TcpMasterThread.java	Mon Dec 17 22:49:52 2012
-+++ minecraft_patched\net\minecraft\src\TcpMasterThread.java	Mon Dec 17 22:51:37 2012
+--- minecraft\net\minecraft\src\TcpMasterThread.java	Sat Jan 12 02:18:00 2013
++++ minecraft_patched\net\minecraft\src\TcpMasterThread.java	Sat Jan 12 02:24:09 2013
 @@ -11,6 +11,7 @@
        this.field_74504_a = p_i3285_1_;
     }
@@ -173,8 +155,8 @@ diff -r -U 3 minecraft\net\minecraft\src\TcpMasterThread.java minecraft_patched\
        try {
           Thread.sleep(5000L);
 diff -r -U 3 minecraft\net\minecraft\src\ThreadedFileIOBase.java minecraft_patched\net\minecraft\src\ThreadedFileIOBase.java
---- minecraft\net\minecraft\src\ThreadedFileIOBase.java	Mon Dec 17 22:49:52 2012
-+++ minecraft_patched\net\minecraft\src\ThreadedFileIOBase.java	Mon Dec 17 22:51:37 2012
+--- minecraft\net\minecraft\src\ThreadedFileIOBase.java	Sat Jan 12 02:18:00 2013
++++ minecraft_patched\net\minecraft\src\ThreadedFileIOBase.java	Sat Jan 12 02:24:09 2013
 @@ -20,7 +20,8 @@
     }
  

fml/conf/patches/minecraft_server_ff.patch

@@ -1,6 +1,6 @@
 diff -r -U 3 minecraft_server\net\minecraft\src\CallableSuspiciousClasses.java minecraft_server_patched\net\minecraft\src\CallableSuspiciousClasses.java
---- minecraft_server\net\minecraft\src\CallableSuspiciousClasses.java	Mon Dec 17 22:50:59 2012
-+++ minecraft_server_patched\net\minecraft\src\CallableSuspiciousClasses.java	Mon Dec 17 22:52:18 2012
+--- minecraft_server\net\minecraft\src\CallableSuspiciousClasses.java	Sat Jan 12 02:19:06 2013
++++ minecraft_server_patched\net\minecraft\src\CallableSuspiciousClasses.java	Sat Jan 12 02:24:29 2013
 @@ -21,9 +21,14 @@
  
     public String func_85085_a() {
@@ -20,8 +20,8 @@ diff -r -U 3 minecraft_server\net\minecraft\src\CallableSuspiciousClasses.java m
        boolean var5 = !CrashReport.class.getCanonicalName().equals("net.minecraft.CrashReport");
        HashMap var6 = new HashMap();
 diff -r -U 3 minecraft_server\net\minecraft\src\ComponentStrongholdRightTurn.java minecraft_server_patched\net\minecraft\src\ComponentStrongholdRightTurn.java
---- minecraft_server\net\minecraft\src\ComponentStrongholdRightTurn.java	Mon Dec 17 22:50:59 2012
-+++ minecraft_server_patched\net\minecraft\src\ComponentStrongholdRightTurn.java	Mon Dec 17 22:52:18 2012
+--- minecraft_server\net\minecraft\src\ComponentStrongholdRightTurn.java	Sat Jan 12 02:19:06 2013
++++ minecraft_server_patched\net\minecraft\src\ComponentStrongholdRightTurn.java	Sat Jan 12 02:24:29 2013
 @@ -11,6 +11,10 @@
  
  public class ComponentStrongholdRightTurn extends ComponentStrongholdLeftTurn {
@@ -34,8 +34,8 @@ diff -r -U 3 minecraft_server\net\minecraft\src\ComponentStrongholdRightTurn.jav
        if(this.field_74885_f != 2 && this.field_74885_f != 3) {
           this.func_74989_b((ComponentStrongholdStairs2)p_74861_1_, p_74861_2_, p_74861_3_, 1, 1);
 diff -r -U 3 minecraft_server\net\minecraft\src\DedicatedServer.java minecraft_server_patched\net\minecraft\src\DedicatedServer.java
---- minecraft_server\net\minecraft\src\DedicatedServer.java	Mon Dec 17 22:50:59 2012
-+++ minecraft_server_patched\net\minecraft\src\DedicatedServer.java	Mon Dec 17 22:52:18 2012
+--- minecraft_server\net\minecraft\src\DedicatedServer.java	Sat Jan 12 02:19:06 2013
++++ minecraft_server_patched\net\minecraft\src\DedicatedServer.java	Sat Jan 12 02:24:29 2013
 @@ -203,7 +203,7 @@
        System.exit(0);
     }
@@ -45,27 +45,9 @@ diff -r -U 3 minecraft_server\net\minecraft\src\DedicatedServer.java minecraft_s
        super.func_71190_q();
        this.func_71333_ah();
     }
-diff -r -U 3 minecraft_server\net\minecraft\src\EntityMooshroom.java minecraft_server_patched\net\minecraft\src\EntityMooshroom.java
---- minecraft_server\net\minecraft\src\EntityMooshroom.java	Mon Dec 17 22:51:00 2012
-+++ minecraft_server_patched\net\minecraft\src\EntityMooshroom.java	Mon Dec 17 22:52:18 2012
-@@ -56,10 +56,10 @@
-       return new EntityMooshroom(this.field_70170_p);
-    }
- 
--   // $FF: synthetic method
--   public EntityCow func_70879_a(EntityAgeable p_70879_1_) {
--      return this.func_70879_a(p_70879_1_);
--   }
-+//   // $FF: synthetic method
-+//   public EntityCow func_70879_a(EntityAgeable p_70879_1_) {
-+//      return this.func_70879_a(p_70879_1_);
-+//   }
- 
-    // $FF: synthetic method
-    public EntityAgeable func_90011_a(EntityAgeable p_90011_1_) {
 diff -r -U 3 minecraft_server\net\minecraft\src\TcpMasterThread.java minecraft_server_patched\net\minecraft\src\TcpMasterThread.java
---- minecraft_server\net\minecraft\src\TcpMasterThread.java	Mon Dec 17 22:51:01 2012
-+++ minecraft_server_patched\net\minecraft\src\TcpMasterThread.java	Mon Dec 17 22:52:18 2012
+--- minecraft_server\net\minecraft\src\TcpMasterThread.java	Sat Jan 12 02:19:08 2013
++++ minecraft_server_patched\net\minecraft\src\TcpMasterThread.java	Sat Jan 12 02:24:29 2013
 @@ -11,6 +11,7 @@
        this.field_74504_a = p_i3285_1_;
     }
@@ -75,8 +57,8 @@ diff -r -U 3 minecraft_server\net\minecraft\src\TcpMasterThread.java minecraft_s
        try {
           Thread.sleep(5000L);
 diff -r -U 3 minecraft_server\net\minecraft\src\ThreadedFileIOBase.java minecraft_server_patched\net\minecraft\src\ThreadedFileIOBase.java
---- minecraft_server\net\minecraft\src\ThreadedFileIOBase.java	Mon Dec 17 22:51:01 2012
-+++ minecraft_server_patched\net\minecraft\src\ThreadedFileIOBase.java	Mon Dec 17 22:52:18 2012
+--- minecraft_server\net\minecraft\src\ThreadedFileIOBase.java	Sat Jan 12 02:19:08 2013
++++ minecraft_server_patched\net\minecraft\src\ThreadedFileIOBase.java	Sat Jan 12 02:24:29 2013
 @@ -20,7 +20,8 @@
     }
  

fml/conf/version.cfg

@@ -1,4 +1,4 @@
 [VERSION]
-MCPVersion = 7.26
-ClientVersion = 1.4.7
-ServerVersion = 1.4.7
+MCPVersion = 7.30
+ClientVersion = 13w02b
+ServerVersion = 13w02b

fml/mc_versions.cfg

@@ -1,5 +1,5 @@
 [default]
-current_ver = 1.4.7
+current_ver = s13w02b
 base_url    = http://s3.amazonaws.com/MinecraftDownload/
 libraries   = lwjgl.jar lwjgl_util.jar jinput.jar
 natives     = windows_natives.jar macosx_natives.jar linux_natives.jar
@@ -40,3 +40,12 @@ mcp_ver    = 7.26
 mcp_url    = http://mcp.ocean-labs.de/files/archive/mcp726.zip
 mcp_md5    = 5320353829c2906bd032649085721d1d
 
+[s13w02b]
+client_url = http://assets.minecraft.net/13w02b/minecraft.jar
+server_url = http://assets.minecraft.net/13w02b/minecraft_server.jar
+client_md5 = 13891f6610b6739ac79f40147cca31d5
+server_md5 = b2200cfa5d6535f177d291066d2ed3a8
+mcp_ver    = 7.30
+mcp_url    = http://mcp.ocean-labs.de/files/archive/mcp730.zip
+mcp_md5    = d89c2cd4db5cfafe4049c082c1d3349c
+

fml/mcp_merge.cfg

@@ -1 +1 @@
-!ber #net/minecraft/src/CodecMus
+!bfv #net/minecraft/src/CodecMus