shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
41,098 Commits 5 Branches 0 Tags
a9170aae93f228551d83147677da8ee918db9b97
Commit Graph

18 Commits

Author SHA1 Message Date
dependabot[bot]
b786392e79 Bump pillow from 7.0.0 to 7.1.0 in /tools/mapmerge2 
Bumps [pillow](https://github.com/python-pillow/Pillow) from 7.0.0 to 7.1.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/7.0.0...7.1.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-11-19 07:10:29 +00:00
Ghom
e24f36bc14 bumping up mapmerge requirements.txt 2020-05-01 21:08:50 +02:00
Ghommie
86898cc451 Force pushed updates 2020-03-22 01:43:19 +01:00
dependabot[bot]
22c87b0791 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-29 14:09:47 +00:00
Poojawa
dcbcf704da I accidentally all the maps. whoops 2019-08-04 06:27:28 -05:00
Poojawa
bc619ae7d9 Tool folder and backend TG sync 2019-04-13 22:56:51 -05:00
deathride58
2d818a6dd8 what kind of sadist uses spaces anyways - fixes indentation inconsistency in dmm.py (#7663) 2018-10-19 00:37:37 -07:00
Poojawa
91620218e4 some cherrypicked TG fixes and tweaks 2018-10-12 05:37:36 -05:00
Poojawa
fa70720cc1 Map Conversions 2018-09-11 08:58:34 -05:00
Poojawa
9b376dac92 Adds a fuckload of tool updates 
also updates tgui
 2018-09-05 06:38:33 -05:00
Tad Hardesty
c1fcc0a86e Fix typo in Python dependencies file (#38080) 2018-05-27 11:40:31 -05:00
Jordan Brown
e37a9a36ed Merge pull request #37976 from AutomaticFrenzy/patch/dmi-merger 
Add a Python script to fix DMI conflicts
 2018-05-25 10:55:33 -05:00
CitadelStationBot
bcc360d0d9 [MIRROR] Fixes omega detective office + prepare_maps change (#6110) 
* Fixes omega detective office + prepare_maps change (#36691)

* Fixes Omega Detectives office

* Mentions mapmerge isntead of run map merge

* Fixes omega detective office + prepare_maps change
 2018-03-26 04:31:41 -05:00
Jordan Brown
d1fea8e4f7 Removes Map Merge 1 2018-02-11 13:03:47 -06:00
CitadelStationBot
0bb8649794 [MIRROR] Fix map keys overflowing earlier than expected (#5259) 
* Merge pull request #35133 from AutomaticFrenzy/patch/key-overflow-fix

Fix map keys overflowing earlier than expected

* Fix map keys overflowing earlier than expected
 2018-02-04 22:35:52 -06:00
Tad Hardesty
f62aa9e21f Add READMEs to hooks and mapmerge2 directories (#34511) 2018-01-18 21:27:04 -06:00
Tad Hardesty
12da7d5dec Fix the batch file method of mapmerge2 and save a .before (#34361) 2018-01-12 09:44:00 -06:00
Tad Hardesty
61f00cbfb0 Add a new and improved mapmerge (#33869) 
Key benefits of the new mapmerge include: multi-Z support, effective
reuse of deleted keys, automatic handling of key overflow, and utilizing
a git pre-commit hook to eliminate the need to run batch files manually.
 2017-12-29 00:28:25 -06:00