cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-22 03:27:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #624 from GinjaNinja32/pl-mapmerge

Browse Source 
fix clean_map_git.sh, fix mapfiles being saved with LF endings
This commit is contained in:
Neerti
2015-12-19 16:37:57 -05:00
parent 6e16e0e29f c9cc842e51
commit 904b573ef0
6 changed files with 15542 additions and 15542 deletions
Download Patch File Download Diff File Expand all files Collapse all files
maps/polaris-1.dmm
+9842 -9842
View File
File diff suppressed because it is too large Load Diff
maps/polaris-2.dmm
+2626 -2626
View File
File diff suppressed because it is too large Load Diff
maps/polaris-3.dmm
+688 -688
View File
File diff suppressed because it is too large Load Diff
maps/polaris-4.dmm
+561 -561
View File
File diff suppressed because it is too large Load Diff
maps/polaris-5.dmm
+1823 -1823
View File
File diff suppressed because it is too large Load Diff
tools/mapmerge/clean_map_git.sh
+2 -2
View File
@@ -1,8 +1,8 @@
#!/bin/bash
for i in {1..6}
for i in {1..5}
do
MAPFILE="exodus-$i.dmm"
MAPFILE="polaris-$i.dmm"
git show HEAD:maps/$MAPFILE > tmp.dmm
java -jar MapPatcher.jar -clean tmp.dmm '../../maps/'$MAPFILE '../../maps/'$MAPFILE