cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-24 17:22:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
57,254 Commits 26 Branches 2 Tags
73eb77412571faba29c21b51a306a2758cbee28f
Commit Graph

18 Commits

Author SHA1 Message Date
warriorstar-orion
8898e3ab6c mapmerge: one last fix for diff size (#22746) 2023-10-06 19:46:50 +01:00
warriorstar-orion
ee2737378b mapmerge: fix bidict.KeyAndValueDuplicationError (#22737) 2023-10-05 22:17:47 -05:00
warriorstar-orion
a0019cfac6 mapmerge: Improve three-way merge output. (#22362) 
* Improve three-way merge output.

Prior to this PR, even if the three way merge found a matching tile
definition from one side of the merge, it would receive a new key. Now
an attempt is made to also preserve the key from that side of the merge
when possible.

* lewc review
 2023-09-19 16:53:08 +01:00
Contrabang
899f259ef4 updates mapmerge (#21898) 2023-08-05 02:04:16 -05:00
AffectedArc07
fb41b39a77 Restores mapmerge CLI scripts (#19906) 2022-12-13 16:51:16 +00:00
warriorstar-orion
274ef027dc Add required configuration for automated map merge script. (#19484) 
* Update merge_driver script.

* Actually tick and compile new files.

* Improve marker description.
 2022-11-05 15:58:35 +00:00
S34N
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
S34N
1910d4cb37 Removes instances of rusty turfs (#17980) 
* removes instances of rusty turfs

* and this
 2022-06-16 20:52:06 +01:00
dependabot[bot]
d3ee2eb11a Bump pillow from 9.0.0 to 9.0.1 in /tools/mapmerge2 (#17474) 
Bumps [pillow](https://github.com/python-pillow/Pillow) from 9.0.0 to 9.0.1.
- [Release notes](https://github.com/python-pillow/Pillow/releases)
- [Changelog](https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst)
- [Commits](https://github.com/python-pillow/Pillow/compare/9.0.0...9.0.1)

---
updated-dependencies:
- dependency-name: pillow
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-03-11 23:47:45 +00:00
S34N
fda697e2b5 [MDB Ignore] Makes maps comply with "[dir]_bump" standards (#17259) 2022-01-17 21:18:00 +01:00
dependabot[bot]
dc7b8bcc8f Bump pillow from 8.3.2 to 9.0.0 in /tools/mapmerge2 (#17320) 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-01-13 08:11:30 +01:00
dependabot[bot]
1548d5ec04 Bump pillow from 8.2.0 to 8.3.2 in /tools/mapmerge2 (#16656) 
Bumps [pillow](https://github.com/python-pillow/Pillow) from 8.2.0 to 8.3.2.
- [Release notes](https://github.com/python-pillow/Pillow/releases)
- [Changelog](https://github.com/python-pillow/Pillow/blob/master/CHANGES.rst)
- [Commits](https://github.com/python-pillow/Pillow/compare/8.2.0...8.3.2)

---
updated-dependencies:
- dependency-name: pillow
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-09-08 20:19:51 +01:00
dependabot[bot]
0c66d089a2 Bump pillow from 8.1.1 to 8.2.0 in /tools/mapmerge2 (#16138) 
Bumps [pillow](https://github.com/python-pillow/Pillow) from 8.1.1 to 8.2.0.
- [Release notes](https://github.com/python-pillow/Pillow/releases)
- [Changelog](https://github.com/python-pillow/Pillow/blob/master/CHANGES.rst)
- [Commits](https://github.com/python-pillow/Pillow/compare/8.1.1...8.2.0)

---
updated-dependencies:
- dependency-name: pillow
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-06-10 16:06:42 +01:00
dependabot[bot]
e201eb05c1 Bump pillow from 7.1.1 to 8.1.1 in /tools/mapmerge2 (#15732) 
Bumps [pillow](https://github.com/python-pillow/Pillow) from 7.1.1 to 8.1.1.
- [Release notes](https://github.com/python-pillow/Pillow/releases)
- [Changelog](https://github.com/python-pillow/Pillow/blob/master/CHANGES.rst)
- [Commits](https://github.com/python-pillow/Pillow/compare/7.1.1...8.1.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-03-19 09:47:05 +00:00
Kyep
22977cac15 Fixes MapMerge Requirements (#13257) 
* pygit 1.0.1

* Pillow 7.1.1

Co-authored-by: Kyep <Kyep@users.noreply.github.com>
 2020-04-09 23:24:22 -06:00
dependabot[bot]
26c45be670 Bump pillow from 5.1.0 to 6.2.0 in /tools/mapmerge2 
Bumps [pillow](https://github.com/python-pillow/Pillow) from 5.1.0 to 6.2.0.
- [Release notes](https://github.com/python-pillow/Pillow/releases)
- [Changelog](https://github.com/python-pillow/Pillow/blob/master/CHANGES.rst)
- [Commits](https://github.com/python-pillow/Pillow/compare/5.1.0...6.2.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2019-10-22 22:33:21 +00:00
Fox McCloud
7d423acc61 Implements Newer Version of Mapmerge 2019-03-17 22:46:24 -04:00
AffectedArc07
433a22bb81 Mapmerge2-2 2019-03-03 01:02:32 +00:00