mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-23 12:07:27 +01:00
Moved map tools into maptools directory.
Also added .bat files to make map cleaning easier.
This commit is contained in:
@@ -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
|
||||
@@ -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
|
||||
@@ -0,0 +1 @@
|
||||
cp ../maps/tgstation.2.0.9.1.dmm ../maps/tgstation.2.0.9.1.dmm.backup
|
||||
Reference in New Issue
Block a user