Fixes tgstation#11301

AdamAlake · Aug 21, 2015 · d27a736 · d27a736
1 parent e66bf6f
commit d27a736
Show file tree

Hide file tree

Showing 12 changed files with 4 additions and 1 deletion.
diff --git a/tools/mapmerge/dmm2tgm/Source/dmm2tgm.py → tools/dmm2tgm/Source/dmm2tgm.py b/tools/mapmerge/dmm2tgm/Source/dmm2tgm.py → tools/dmm2tgm/Source/dmm2tgm.py
diff --git a/tools/mapmerge/dmm2tgm/_hashlib.pyd → tools/dmm2tgm/_hashlib.pyd b/tools/mapmerge/dmm2tgm/_hashlib.pyd → tools/dmm2tgm/_hashlib.pyd
diff --git a/tools/mapmerge/dmm2tgm/bz2.pyd → tools/dmm2tgm/bz2.pyd b/tools/mapmerge/dmm2tgm/bz2.pyd → tools/dmm2tgm/bz2.pyd
diff --git a/tools/mapmerge/dmm2tgm/dmm2tgm.exe → tools/dmm2tgm/dmm2tgm.exe b/tools/mapmerge/dmm2tgm/dmm2tgm.exe → tools/dmm2tgm/dmm2tgm.exe
diff --git a/tools/mapmerge/dmm2tgm/library.zip → tools/dmm2tgm/library.zip b/tools/mapmerge/dmm2tgm/library.zip → tools/dmm2tgm/library.zip
diff --git a/tools/mapmerge/dmm2tgm/python27.dll → tools/dmm2tgm/python27.dll b/tools/mapmerge/dmm2tgm/python27.dll → tools/dmm2tgm/python27.dll
diff --git a/tools/mapmerge/dmm2tgm/select.pyd → tools/dmm2tgm/select.pyd b/tools/mapmerge/dmm2tgm/select.pyd → tools/dmm2tgm/select.pyd
diff --git a/tools/mapmerge/dmm2tgm/unicodedata.pyd → tools/dmm2tgm/unicodedata.pyd b/tools/mapmerge/dmm2tgm/unicodedata.pyd → tools/dmm2tgm/unicodedata.pyd
diff --git a/tools/mapmerge/dmm2tgm/w9xpopen.exe → tools/dmm2tgm/w9xpopen.exe b/tools/mapmerge/dmm2tgm/w9xpopen.exe → tools/dmm2tgm/w9xpopen.exe
diff --git a/tools/mapmerge/MapMerge.jar b/tools/mapmerge/MapMerge.jar
diff --git a/tools/mapmerge/Source/bin/MapMerge.class b/tools/mapmerge/Source/bin/MapMerge.class
diff --git a/tools/mapmerge/Source/src/MapMerge.java b/tools/mapmerge/Source/src/MapMerge.java
@@ -88,7 +88,9 @@ public static void merge(ArrayList<Path> foundFiles) throws IOException {
 			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 static void merge(ArrayList<Path> foundFiles) throws IOException {
 					System.out.println("Downloads can be found here: https://www.python.org/downloads/");
 				}
 			}
+			*/
 
 		}
 	}