Fixes airless turf in Fore Starboard Solar Control causing minor atmos alert at roundstart
Fixes clean_map_git.sh being set non-executable and using non-sh-compatible features with #!/bin/sh
There are now two basic bat scripts in dmitool and mapmerge which painlessly inserts the necessary lines for the commit tools to work into .git/config.
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>
Allows for easier map conflict resolution.
Prompts the user for confirmation on a tile conflict instead of dying.
Signed-off-by: Mloc-Argent <colmohici@gmail.com>