From b721a51bc4aa970ea64f22e683de3edcb6c7d36f Mon Sep 17 00:00:00 2001 From: Christian Date: Wed, 18 Sep 2013 17:54:01 -0400 Subject: [PATCH] Update mc_versions data and commands patch and eclipse workspace --- fml/commands.patch | 29 +++++++++-------------------- fml/eclipse-workspace-dev.zip | Bin 24560 -> 24397 bytes fml/mc_versions.cfg | 4 ++-- 3 files changed, 11 insertions(+), 22 deletions(-) diff --git a/fml/commands.patch b/fml/commands.patch index 3cf59aa3c8..9b9702de58 100644 --- a/fml/commands.patch +++ b/fml/commands.patch @@ -1,17 +1,6 @@ --- commands.py +++ commands.py -@@ -126,8 +126,8 @@ - - - def truncate(text, length): -- if len(text) > length: -- return text[:length] + '...' -+ #if len(text) > length: -+ # return text[:length] + '...' - return text - - -@@ -139,6 +139,8 @@ +@@ -141,6 +141,8 @@ fieldnames = csvreader.fieldnames return set(fieldnames) @@ -20,7 +9,7 @@ class Commands(object): """Contains the commands and initialisation for a full mcp run""" -@@ -950,6 +952,8 @@ +@@ -952,6 +954,8 @@ binlk = {CLIENT: self.binclient, SERVER: self.binserver} testlk = {CLIENT: self.testclient, SERVER: self.testserver} @@ -29,7 +18,7 @@ if not os.path.exists(os.path.join(binlk[side], os.path.normpath(testlk[side] + '.class'))): return False return True -@@ -1281,23 +1285,34 @@ +@@ -1283,23 +1287,34 @@ pathbinlk = {CLIENT: self.binclient, SERVER: self.binserver} pathsrclk = {CLIENT: self.srcclient, SERVER: self.srcserver} pathlog = {CLIENT: self.clientrecomplog, SERVER: self.serverrecomplog} @@ -66,7 +55,7 @@ classpath = os.pathsep.join(cplk[side]) forkcmd = self.cmdrecompscala.format(classpath=classpath, sourcepath=pathsrclk[side], outpath=pathbinlk[side], pkgs=dirs) try: -@@ -1317,7 +1332,15 @@ +@@ -1319,7 +1334,15 @@ self.logger.error('================================') self.logger.error('') raise @@ -83,7 +72,7 @@ classpath = os.pathsep.join(cplk[side]) forkcmd = self.cmdrecomp.format(classpath=classpath, sourcepath=pathsrclk[side], outpath=pathbinlk[side], pkgs=dirs) -@@ -1336,9 +1359,10 @@ +@@ -1338,9 +1361,10 @@ self.logger.error('==================') self.logger.error('') raise @@ -95,7 +84,7 @@ classpath = [os.path.join('..', p) for p in classpath] classpath = os.pathsep.join(classpath) os.chdir(self.dirjars) -@@ -1703,7 +1727,7 @@ +@@ -1705,7 +1729,7 @@ self.runcmd(forkcmd) return True @@ -104,7 +93,7 @@ if not reobf: md5lk = {CLIENT: self.md5client, SERVER: self.md5server} else: -@@ -1718,6 +1742,9 @@ +@@ -1720,6 +1744,9 @@ class_path = '' else: class_path += '/' @@ -114,7 +103,7 @@ for class_file in fnmatch.filter(filelist, '*.class'): class_name = class_path + os.path.splitext(class_file)[0] bin_file = os.path.normpath(os.path.join(path, class_file)) -@@ -1890,6 +1917,9 @@ +@@ -1892,6 +1919,9 @@ sys.exit(1) for entry in newfiles: @@ -124,7 +113,7 @@ if entry[3] == 'U': self.logger.info('Retrieving file from server : %s', entry[0]) cur_file = os.path.normpath(entry[0]) -@@ -1910,6 +1940,9 @@ +@@ -1912,6 +1942,9 @@ md5reoblk = {CLIENT: self.md5reobfclient, SERVER: self.md5reobfserver} outpathlk = {CLIENT: self.srcmodclient, SERVER: self.srcmodserver} src = {CLIENT: self.srcclient, SERVER: self.srcserver} diff --git a/fml/eclipse-workspace-dev.zip b/fml/eclipse-workspace-dev.zip index 0bdd7624b9183e5d44f2fa8a1526dab8d5e9c6e2..485982d40529e9cdbd492346815fca184f28fbd5 100644 GIT binary patch delta 1822 zcmZvdc{JPU9>(*dEo~E9V;fa65hZF%lp?70HZ+Qc(wh)%kdTR5TJ&C0Emf^GKN^gK z)>c~kGGo`$np%QVDH(%1+FM&G6>B;-dfS~swtaJba?Lf7o z`9X2W-buySg6GYViXtWXMG5Bh&pj4{K;obfh!O-eAbrQG@ECUH8^ELeUwuaOwk&D> zAOZHeB$&av-;7=ZBg=EU_etFhVYSsrL|H#`jH{3Ap(+;CkuK6-};AM-N?{;Bj`N!2%C4I z#IaE)lgl!6+OH4mviGkk$UM7zTGfXe@OW*C*Ejcko#8CS3!!Jc zK9|$x&f9t&UbBfMetAFvjX~)4^FnReaxrZH4QLm-gqpL71 zf{shKI1lVrIMSZy2eJ`tuS-n)1IK$%AI{CC=SZBuP;9YL+o1fF_CliENyZCT zFf}8+{G>J=1^r}*hR%2Dn#nWuqR$_X85DE)N9j@ zIPb(34smLgRCd&8?T}fNi31WxvtbbvVgOZIGrz**?tQrT*@oGR_>sKy0*o3Pks`oK zV%mkr=q;QPx6roE_p@AmT=7r?tpk|H3c(=8vKjrNpU3r{rh4A@pTUtPe_ zF3nz=TJ4G2rllyxdknGKbDUZ!ZE7zz6ds@tN0e6}XI|+F+MNKQM4hK)w)lVZ4NDW{ zd)pcz{UzUfiu$Y;x+w;tZPZ1%CI?T5a{Zx5D3KAt*C?Cv6G zRr6X^t)2BX2`|`ubBdiT*P`d6>4uq!h9c)2YN6r|k+|Xu?}`~k;^dXzZW(MF?m)SP zeW}Y+vl@sHLgHaqQ7^A4qj8HWc|@F(O8BFEM0k% z>fGgcluW5WkwUEv| zz`~H{lJDME%|TL5l4a!)`9~)3z0;F6(v$uTcJYslTv+u_l*SV!Ry4Xhr>ot~*o-ON zGA-Bmpc1!qS!zPPOsKWI<93ZH`}eecu<^2)@2YG}2E&HR6N_t3AH`x5`_UCaW|=U>?)$i4l^P?&0?2bh^ch<2MVHq_~1pl&0!9=XgGc z8XTo($Hc8ogs)yplBiy`rF2!_P{1sWG^oVu%SNr z2xtF?;IGAoKOd49)S!<@Ky%zdZPgx*x>C4{0yr21OSVosVqWpJcJZ|hvWAw F{{ehO8883< delta 1871 zcmZWq2{hDe8~=~EWNZ;*qU4sreDH zYjnxJB-w|!yw7`{-}8H)-#NeMyuD43kIj&BG%BfG6m&zu z1ONcw0ef(86(RsPy&vivFnCu{r%<^L+lxtYJaF{+(3nrB-~%pWo8L zOk@wn-dRgMc%I!pKRgZjT&`zX{q6yb-w)KR2YNSk!VjHs&bo&OYKzFrmnz(CXkIqa?ssX^Cdl zA=i@S1~vOwC?KCZp7<$QoMU~qoS?e(IsScHBK9c>Htxv_81f zaYsGfa^W(JiOB8jZ6I$^%RE5|rn8+b&{204LxZ*H(XdUpcG*i7xc|rrmP(KHRfX+R zG~Q;we@>HGNWmd%UVk)F8cmt%h(H)qy1iLcQm-MN=#2wd`uR zzh#E}aesqWS0E^O_}1fblFdtQ#vQv*mZVEDt4vKUG*u&wjG;kH*S52Z7iWgvOPk;C zg8TH_H3SK7XDu1rX6DRyKk4amtoCEXAJi@xR&DOz!xR(~^d$urYW9+3WQ-*yOAor& zoX;ah1(rmnAjKy>m~n~-mAMlXR!Zdhs<4k0>I8p6w`vYuoZgULoJemCjjk`4Ptm@F zqWDLgaNoa4f`1;t3`|ljcL+Ko2?@WLI`~MPdvKaDhu5vVNjqUE_po!B131+KEhuhevrRfyQKSk7{%`&wD zaVVSZ<)BR6!-WyLsXu3gCd?7nZkHY>lJqLA;^npk)Fn;%2h zcQ-o(f6d8m#|`U55MQuTD?_G3X4M!hsz77Pp|S>b!caGP=K|3Mn=d1J-hEEHUDJ(Nes&q!xJd0eB5|v zzwZc=S-4>>?n$4?Mu7IMys@2&7R$Az?ABX9ZbLc!NnJRZ-A&T>cRB5(7*C5Aay+<`~--j*BRentdCc0l_RO;#o4ujr3 zSvMBZ^(fao)=3yjR~_x(-Pkr72rCd&{2DLgb{fCX{$hAZYj+d*FlA=;9;Tz%heI+W z9T1r_8`r{KG{(Dpomr;eXIYR z%6xgIyd-*3TV|*0dY=0Ll~_1$v>fDLuby-!2w{_uPpb8O>}5O)wdy()=`@{`t+tjZ zu>J1HaM72lsjO;}mN~k#*n?6p3Jb446V4zT_8J5}RrFs!+o=fiAZ_NDjzhV_?Q=Z{ zXEX#Ec8`7^5tESVMzr{eB9J|qw(klEC$dooRGZi$(txj`XjUEp ziq7(@uRJoU(UptnC-Vk#eyXu?hQ#TUf8Fphdw5Y^QKDvRuhsB=U99~dV$%mSXkbtG zHyph}DVPkY&^E$~fhaUgN&q;`o|*4Uh`o(a0D!;lWC)s&_6c~p(Cc+DRzW@M)ordD1xh+HcK#H>% zDDENyaRhZ-JRww2=!yjR(!~nW%8pz?vK<$wixxi4_b=V|wpR51*OsxR1(@inD)s+E z{*RE8> diff --git a/fml/mc_versions.cfg b/fml/mc_versions.cfg index 5f78524a5c..fe93b03cf0 100644 --- a/fml/mc_versions.cfg +++ b/fml/mc_versions.cfg @@ -119,5 +119,5 @@ mcp_md5 = ebcecfa00aae07548e67787044410a11 client_md5 = 233effe2110d40a0519cf1489e4ccb1c server_md5 = 8ed981ab6030412f586bfe38ff0aaa82 mcp_ver = 8.09 -mcp_url = -mcp_md5 = +mcp_url = http://mcp.ocean-labs.de/files/archive/mcp809.zip +mcp_md5 = 19133b5915dc26a90d84f587172c6692