Commit Graph

4 Commits

Author SHA1 Message Date
Cael Aislinn
d992c1ee27 updates MapPatcher.jar to use JRE8
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
2014-06-29 01:09:37 +10:00
Mloc-Argent
6db1484a80 tools: update MapPatcher.jar, add mapclean helper
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>
2014-05-15 22:00:24 +01:00
Mloc-Argent
073059e0dc tools: adding the patched/fixed MapPatcher.jar
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>
2014-05-07 17:33:05 +01:00
Erthilo
d0c71c8dc2 Moved maptools to tool/mapmerge. Added midi2piano and AddToChangelog. 2013-08-31 19:10:02 +01:00