cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-21 23:52:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
45,737 Commits 74 Branches 23 Tags
f56cb42fab8b51a5142f99135a989d4fda9551e9
Commit Graph

2 Commits

Author SHA1 Message Date
Wowzewow (Wezzy)
7766368069 Replaces DMItool with contemporary /tg/station version. (#10624) 2020-12-04 02:21:40 +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