cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-06-07 07:06:57 +01:00
Code Issues Packages Projects Releases Wiki Activity
46,531 Commits 106 Branches 23 Tags
8041bfa1d3be5da22d052d28d5220c4cec4d5346
Commit Graph

3 Commits

Author SHA1 Message Date
DreamySkrell d61970c1ba Updates tools/hooks & Fixes mapmerge2 (#17416) 
* a

* python ver

---------

Co-authored-by: DreamySkrell <>
 2023-09-26 16:47:54 +00:00
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