From ca79dfe298e7aa3a8ce0e25a195544781aea6935 Mon Sep 17 00:00:00 2001 From: LexManos Date: Mon, 19 Nov 2012 15:35:08 -0800 Subject: [PATCH] Updated to 1.4.5b --- .gitattributes | 6 ++++-- conf/joined.srg | 6 ++---- conf/params.csv | 1 - conf/version.cfg | 2 +- install/fml.py | 2 +- mc_versions.cfg | 6 +++--- updateasmdata.py | 2 +- 7 files changed, 12 insertions(+), 13 deletions(-) diff --git a/.gitattributes b/.gitattributes index 38d313246f..4589cdc5bd 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,7 +1,9 @@ * text eol=lf *.bat text eol=crlf -*.patch text +*.patch text eol=lf *.png binary *.exe binary *.dll binary -*.zip binary \ No newline at end of file +*.zip binary +*.cfg text eol=lf +*.py text eol=lf \ No newline at end of file diff --git a/conf/joined.srg b/conf/joined.srg index 19370bccd6..7d4e36f66f 100644 --- a/conf/joined.srg +++ b/conf/joined.srg @@ -3506,9 +3506,8 @@ FD: aze/i net/minecraft/src/EntityFX/field_70553_i FD: aze/j net/minecraft/src/EntityFX/field_70551_j FD: azf/a net/minecraft/src/EffectRenderer/field_78878_a FD: azf/b net/minecraft/src/EffectRenderer/field_78876_b -FD: azf/c net/minecraft/src/EffectRenderer/field_90038_c -FD: azf/d net/minecraft/src/EffectRenderer/field_78877_c -FD: azf/e net/minecraft/src/EffectRenderer/field_78875_d +FD: azf/c net/minecraft/src/EffectRenderer/field_78877_c +FD: azf/d net/minecraft/src/EffectRenderer/field_78875_d FD: azg/a net/minecraft/src/CallableLastTickedParticle/field_90041_a FD: azg/b net/minecraft/src/CallableLastTickedParticle/field_90040_b FD: azh/a net/minecraft/src/EntityCloudFX/field_70569_a @@ -10404,7 +10403,6 @@ MD: azf/a (Laze;)V net/minecraft/src/EffectRenderer/func_78873_a (Lnet/minecraft MD: azf/a (Llq;F)V net/minecraft/src/EffectRenderer/func_78874_a (Lnet/minecraft/src/Entity;F)V MD: azf/a (Lxv;)V net/minecraft/src/EffectRenderer/func_78870_a (Lnet/minecraft/src/World;)V MD: azf/b ()Ljava/lang/String; net/minecraft/src/EffectRenderer/func_78869_b ()Ljava/lang/String; -MD: azf/b (Laze;)V net/minecraft/src/EffectRenderer/func_90037_b (Lnet/minecraft/src/EntityFX;)V MD: azf/b (Llq;F)V net/minecraft/src/EffectRenderer/func_78872_b (Lnet/minecraft/src/Entity;F)V MD: azg/a ()Ljava/lang/String; net/minecraft/src/CallableLastTickedParticle/func_90039_a ()Ljava/lang/String; MD: azg/call ()Ljava/lang/Object; net/minecraft/src/CallableLastTickedParticle/call ()Ljava/lang/Object; diff --git a/conf/params.csv b/conf/params.csv index ad8f4bd3c3..a6afa1bd3a 100644 --- a/conf/params.csv +++ b/conf/params.csv @@ -7170,7 +7170,6 @@ p_90030_0_,par0EntityRenderer,2 p_90033_1_,par1Str,2 p_90035_0_,par0,2 p_90036_0_,par0EntityLiving,2 -p_90037_1_,par1EntityFX,2 p_90042_0_,par0Str,2 p_accept_1_,par1File,2 p_accept_2_,par2Str,2 diff --git a/conf/version.cfg b/conf/version.cfg index e3ca1027d3..facf1374dc 100644 --- a/conf/version.cfg +++ b/conf/version.cfg @@ -1,4 +1,4 @@ [VERSION] -MCPVersion = 7.22 +MCPVersion = 7.23 ClientVersion = 1.4.5 ServerVersion = 1.4.5 diff --git a/install/fml.py b/install/fml.py index bc9488e8df..e4295688d5 100644 --- a/install/fml.py +++ b/install/fml.py @@ -8,7 +8,7 @@ from pprint import pprint from zipfile import ZipFile from pprint import pprint -mcp_version = '7.22' +mcp_version = '7.23' def download_deps(mcp_path): ret = True diff --git a/mc_versions.cfg b/mc_versions.cfg index 18880f55e1..b369c6278e 100644 --- a/mc_versions.cfg +++ b/mc_versions.cfg @@ -14,6 +14,6 @@ mcp_ver = 7.21 [1.4.5] client_url = http://assets.minecraft.net/1_4_5/minecraft.jar server_url = http://assets.minecraft.net/1_4_5/minecraft_server.jar -client_md5 = 469c9743ba88b7aa498769db75e31b1c -server_md5 = c6f1b976385db8bb502902c57458be00 -mcp_ver = 7.22 +client_md5 = b15e2b2b6b4629f0d99a95b6b44412a0 +server_md5 = 250654ceae7a26ba955a30095d90a475 +mcp_ver = 7.23 diff --git a/updateasmdata.py b/updateasmdata.py index ed0987f68d..56d22f4224 100644 --- a/updateasmdata.py +++ b/updateasmdata.py @@ -38,7 +38,7 @@ def process_file(file, srg): newpart = '%s%s #%s\n' % (parts[0][0], srg['CL:'][target], target) nf.write(newpart) else: - with open(file + '-new', 'w') as nf: + with open(file + '-new', 'wb') as nf: with open(file) as f: for line in f: parts = line.split('#')