From 39d6ef64c221cae1297894fa54b10f44b5c55b80 Mon Sep 17 00:00:00 2001 From: Christian Date: Wed, 24 Oct 2012 15:12:06 -0400 Subject: [PATCH] Update for MC 1.4.2 --- fml/conf/joined.srg | 2 ++ fml/conf/mcp.cfg | 4 ++-- fml/conf/params.csv | 5 ----- fml/conf/version.cfg | 6 +++--- fml/install/fml.py | 4 ++-- 5 files changed, 9 insertions(+), 12 deletions(-) diff --git a/fml/conf/joined.srg b/fml/conf/joined.srg index b737aa42ac..5446a7b7c0 100644 --- a/fml/conf/joined.srg +++ b/fml/conf/joined.srg @@ -7602,6 +7602,7 @@ MD: ais/c (Lxo;III)Z net/minecraft/src/BlockFenceGate/func_71918_c (Lnet/minecra MD: ais/d ()I net/minecraft/src/BlockFenceGate/func_71857_b ()I MD: ais/e (Lxe;III)Lamr; net/minecraft/src/BlockFenceGate/func_71872_e (Lnet/minecraft/src/World;III)Lnet/minecraft/src/AxisAlignedBB; MD: ait/a (Lxo;III)V net/minecraft/src/BlockFence/func_71902_a (Lnet/minecraft/src/IBlockAccess;III)V +MD: ait/a (Lxo;IIII)Z net/minecraft/src/BlockFence/func_71877_c (Lnet/minecraft/src/IBlockAccess;IIII)Z MD: ait/b ()Z net/minecraft/src/BlockFence/func_71886_c ()Z MD: ait/c ()Z net/minecraft/src/BlockFence/func_71926_d ()Z MD: ait/c (I)Z net/minecraft/src/BlockFence/func_72249_c (I)Z @@ -8362,6 +8363,7 @@ MD: als/o ()I net/minecraft/src/BlockVine/func_71933_m ()I MD: alt/a (II)I net/minecraft/src/BlockWall/func_71858_a (II)I MD: alt/a (ILsq;Ljava/util/List;)V net/minecraft/src/BlockWall/func_71879_a (ILnet/minecraft/src/CreativeTabs;Ljava/util/List;)V MD: alt/a (Lxo;III)V net/minecraft/src/BlockWall/func_71902_a (Lnet/minecraft/src/IBlockAccess;III)V +MD: alt/a (Lxo;IIII)Z net/minecraft/src/BlockWall/func_71877_c (Lnet/minecraft/src/IBlockAccess;IIII)Z MD: alt/b ()Z net/minecraft/src/BlockWall/func_71886_c ()Z MD: alt/b (I)I net/minecraft/src/BlockWall/func_71899_b (I)I MD: alt/c ()Z net/minecraft/src/BlockWall/func_71926_d ()Z diff --git a/fml/conf/mcp.cfg b/fml/conf/mcp.cfg index d66aa82477..5f2e9d5567 100644 --- a/fml/conf/mcp.cfg +++ b/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 = 542621a5298659dc65f383f35170fc4c -MD5Server = 736ffcb0d9f36d47de96a6923ec82699 +MD5Client = 771175c01778ea67395bc6919a5a9dc5 +MD5Server = a726380b5546635662d8706dae0586c7 [RETROGUARD] Location = %(DirRuntime)s/bin/retroguard.jar diff --git a/fml/conf/params.csv b/fml/conf/params.csv index c6d74cf7bd..a26988b49d 100644 --- a/fml/conf/params.csv +++ b/fml/conf/params.csv @@ -7046,11 +7046,6 @@ 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 diff --git a/fml/conf/version.cfg b/fml/conf/version.cfg index c1b8a9a057..015efa9206 100644 --- a/fml/conf/version.cfg +++ b/fml/conf/version.cfg @@ -1,4 +1,4 @@ [VERSION] -MCPVersion = 7.18 -ClientVersion = 1.4.1 -ServerVersion = 1.4.1 +MCPVersion = 7.19 +ClientVersion = 1.4.2 +ServerVersion = 1.4.2 diff --git a/fml/install/fml.py b/fml/install/fml.py index 303ca05e6e..8d431a007d 100644 --- a/fml/install/fml.py +++ b/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 = "542621a5298659dc65f383f35170fc4c" - clean_s = "736ffcb0d9f36d47de96a6923ec82699" + clean_c = "771175c01778ea67395bc6919a5a9dc5" + clean_s = "a726380b5546635662d8706dae0586c7" if not md5_c == clean_c: print 'Warning, Modified Client jar detected'