Fix up some small things, merging into mainline

fml/commands.patch

@@ -27,7 +27,7 @@
          if not os.path.exists(os.path.join(binlk[side], os.path.normpath(testlk[side] + '.class'))):
              return False
          return True
-@@ -1037,6 +1043,10 @@
+@@ -1037,6 +1043,9 @@
          pathsrclk = {CLIENT: self.srcclient, SERVER: self.srcserver}
          pathlog = {CLIENT: self.clientrecomplog, SERVER: self.serverrecomplog}
  
@@ -37,7 +37,7 @@
          if not os.path.exists(pathbinlk[side]):
              os.makedirs(pathbinlk[side])
  
-@@ -1070,7 +1080,7 @@
+@@ -1070,7 +1079,7 @@
              raise
  
      def startserver(self):
@@ -46,7 +46,7 @@
          classpath = [os.path.join('..', p) for p in classpath]
          classpath = os.pathsep.join(classpath)
          os.chdir(self.dirjars)
-@@ -1078,7 +1088,7 @@
+@@ -1078,7 +1087,7 @@
          self.runmc(forkcmd)
  
      def startclient(self):
@@ -55,7 +55,7 @@
          classpath = [os.path.join('..', p) for p in classpath]
          classpath = os.pathsep.join(classpath)
          natives = os.path.join('..', self.dirnatives)
-@@ -1205,20 +1215,20 @@
+@@ -1205,20 +1214,20 @@
          with open(self.csvmethods, 'rb') as fh:
              methodsreader = csv.DictReader(fh)
              for row in methodsreader:
@@ -79,7 +79,7 @@
                          names['params'][row['param']] = row['name']
  
          regexps = {
-@@ -1352,13 +1362,13 @@
+@@ -1352,13 +1361,13 @@
          methods = {}
          for row in methodsreader:
              #HINT: Only include methods that have a non-empty description
@@ -95,7 +95,7 @@
                  fields[row['searge']] = row['desc'].replace('*/', '* /')
  
          regexps = {
-@@ -1435,7 +1445,7 @@
+@@ -1435,7 +1444,7 @@
          self.runcmd(forkcmd)
          return True
  
@@ -104,7 +104,7 @@
          if not reobf:
              md5lk = {CLIENT: self.md5client, SERVER: self.md5server}
          else:
-@@ -1450,6 +1460,9 @@
+@@ -1450,6 +1459,9 @@
                      class_path = ''
                  else:
                      class_path += '/'
@@ -114,7 +114,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))
-@@ -1546,6 +1559,8 @@
+@@ -1546,6 +1558,8 @@
          if not os.path.exists(outpathlk[side]):
              os.makedirs(outpathlk[side])
  
@@ -123,7 +123,7 @@
          # HINT: We extract the modified class files
          with closing(zipfile.ZipFile(jarlk[side])) as zipjar:
              for in_class in trgclasses:
-@@ -1559,6 +1574,23 @@
+@@ -1559,6 +1573,23 @@
                      out_class = out_class.replace(self.nullpkg, '')
                      if out_class[0] == '/':
                          out_class = out_class[1:]
@@ -147,7 +147,7 @@
                  try:
                      zipjar.extract(out_class, outpathlk[side])
                      self.logger.info('> Outputted %s to %s as %s', in_class.ljust(35), outpathlk[side], out_class)
-@@ -1605,6 +1637,9 @@
+@@ -1605,6 +1636,9 @@
                  sys.exit(1)
  
          for entry in newfiles:
@@ -157,7 +157,7 @@
              if entry[3] == 'U':
                  self.logger.info('Retrieving file from server : %s', entry[0])
                  cur_file = os.path.normpath(entry[0])
-@@ -1625,6 +1660,9 @@
+@@ -1625,6 +1659,9 @@
          md5reoblk = {CLIENT: self.md5reobfclient, SERVER: self.md5reobfserver}
          outpathlk = {CLIENT: self.srcmodclient, SERVER: self.srcmodserver}
          src = {CLIENT: self.srcclient, SERVER: self.srcserver}

fml/install/fml.py

@@ -8,7 +8,7 @@ from pprint import pprint
 from zipfile import ZipFile
 from pprint import pprint
 
-mcp_version = '7.23'
+mcp_version = '7.42'
 
 def download_deps(mcp_path):
     ret = True