cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-18 17:46:53 +01:00
Code Issues Packages Projects Releases Wiki Activity
63,724 Commits 17 Branches 2 Tags
dependabot/github_actions/actions/setup-python-7.0.0
Commit Graph
3 Commits
Author SHA1 Message Date
AffectedArc07andGitHub fb41b39a77 Restores mapmerge CLI scripts (#19906) 2022-12-13 16:51:16 +00:00
S34NGitHubAffectedArc07
 		4f5c3376e3 Updates tools to include mapmerge hooks and merge drivers, plus more (#18034) 
* bumps tools to modern versions, adds DMM merge driver hooks for automatic map merging

* mapping guidelines update

* Update .github/CONTRIBUTING.md

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

* aa review

* these somehow got ignored? force adding

* Apply suggestions from code review

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
 2022-06-21 23:53:19 +01:00
Fox McCloud 7d423acc61 Implements Newer Version of Mapmerge 2019-03-17 22:46:24 -04:00