cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-14 20:22:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
32,601 Commits 74 Branches 23 Tags
779f8a0733d5c8f3499b4400c09117b5bb30a3a6
Commit Graph

2 Commits

Author SHA1 Message Date
Mykhailo Bykhovtsev
779f8a0733 Integrating mapmerge2 checks into Travis (#5616) 
Okay, this update is kinda big. Summary:

- Trimmed unused keys in Exodus telecomms

- Adds script that will run mapmerge2 on Travis to check branch for unused keys or key overflow, etc.

- Fixes matching indentation style in tag-matcher and converts it to use Python 3.6

- Converts mapmerge2 to be used by Python 3.4 and above. Instead of 3.6

- Removes Windows 1252 characters from Communication-blackout.dm that were not able to be seen in UTF-8 format.

Note: the last commit will fail because currently main level is broken

Example of no map issues:
![2018-11-15_li](https://user-images.githubusercontent.com/25555314/48592180-0fd7be80-e8fc-11e8-80b9-cd5af32540e3.jpg)

Example of issues:
![2018-11-15_li 2](https://user-images.githubusercontent.com/25555314/48592190-15cd9f80-e8fc-11e8-99bd-6da4b4c2b9d8.jpg)
 2018-11-20 20:14:21 +01:00
Lohikar
1d335dd9e9 Add mapmerge 2 (#4645) 
Adds TG's mapmerge2, a new TGM-compatible merger that handles things like dictionary expansion much better than the old tool, as well as supporting a git merge hook for map files.

This PR does not remove the old merger as this one is more annoying to setup.
 2018-06-01 23:54:51 +03:00