Moved map tools into maptools directory.

Also added .bat files to make map cleaning easier.
This commit is contained in:
cib
2012-11-11 13:04:29 +01:00
parent 6f792b99e5
commit 9cf5266e10
4 changed files with 4 additions and 2 deletions
+1
View File
@@ -0,0 +1 @@
java -jar MapPatcher.jar ../maps/tgstation.2.0.9.1.dmm.backup ../maps/tgstation.2.0.9.1.dmm ../maps/tgstation.2.0.9.1.dmm
+2 -2
View File
@@ -1,9 +1,9 @@
java -jar MapPatcher.jar -merge $1 $2 $3 $2
java -jar maptools/MapPatcher.jar -merge $1 $2 $3 $2
if [ "$?" -gt 0 ]
then
echo "Unable to automatically resolve map conflicts, please merge manually."
exit 1
fi
java -jar MapPatcher.jar -clean $1 $2 $2
java -jar maptools/MapPatcher.jar -clean $1 $2 $2
exit 0
+1
View File
@@ -0,0 +1 @@
cp ../maps/tgstation.2.0.9.1.dmm ../maps/tgstation.2.0.9.1.dmm.backup