mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-04-04 11:32:22 +01:00
d194ff04be
-Pipe freezer in engi storage and atmos -Pipe painter in engi storage -Fixed ERT access issues -MapMerger tool for mappers -Various tools for coders -Midi2piano for users (Convenience)
10 lines
241 B
Bash
10 lines
241 B
Bash
java -jar tools/mapmerge/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 tools/mapmerge/MapPatcher.jar -clean $1 $2 $2
|
|
|
|
exit 0
|