mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 18:22:39 +00:00
6db1484a80
MapPatcher.jar can now take a user-defined tile line when conflicted. Added a clean_map_git.sh file that will automatically clean maps without needing a prepare_map.bat call beforehand. Needs to be run in git bash, or have .sh associated with something that has git. Fixed line endings in install.txt to show up right in notepad. Signed-off-by: Mloc-Argent <colmohici@gmail.com>
10 lines
254 B
Bash
10 lines
254 B
Bash
#!/bin/sh
|
|
|
|
MAPFILE='tgstation.2.1.3.dmm'
|
|
|
|
git show HEAD:_maps/map_files/$MAPFILE > tmp.dmm
|
|
java -jar MapPatcher.jar -clean tmp.dmm '../../_maps/map_files/'$MAPFILE '../../_maps/map_files/'$MAPFILE
|
|
dos2unix -U '../../_maps/map_files/'$MAPFILE
|
|
rm tmp.dmm
|
|
|