Merge pull request #11315 from CorruptComputer/why

Removes dmm2tgm from map merger
This commit is contained in:
Cheridan
2015-08-27 16:50:33 -05:00
12 changed files with 4 additions and 1 deletions

Binary file not shown.

View File

@@ -88,7 +88,9 @@ public class MapMerge {
String to_save = selected_map;
String[] passInto = { "-clean", backup_map, edited_map, to_save };
MapPatcher.main(passInto);
try{
// Will try to fix when I have time ~CorruptComputer
/*try{
Process process = new ProcessBuilder("dmm2tgm\\dmm2tgm.exe", selected_map).start();
}catch(Exception e1){
System.out.println("You are not on a windows machine, trying the .py");
@@ -99,6 +101,7 @@ public class MapMerge {
System.out.println("Downloads can be found here: https://www.python.org/downloads/");
}
}
*/
}
}