cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
73,371 Commits 6 Branches 0 Tags
be56ab7289c56d5f69b790a9e584c74cfaaea2c5
Commit Graph

27 Commits

Author SHA1 Message Date
Razgriz
b07168de7c Fix bungled mamperge2 requirements.txt 2022-11-22 13:30:23 -07:00
Casey
85f88fa6ed Bump pillow from 9.0.1 to 9.3.0 in /tools/mapmerge2 2022-11-22 01:48:50 +00:00
dependabot[bot]
ae899d2573 Bump pillow from 9.0.0 to 9.0.1 in /tools/mapmerge2 
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>
 2022-03-12 00:08:52 +00:00
dependabot[bot]
ea6d567916 Bump pillow from 8.3.2 to 9.0.0 in /tools/mapmerge2 
Bumps [pillow](https://github.com/python-pillow/Pillow) from 8.3.2 to 9.0.0.
- [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/8.3.2...9.0.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-01-13 01:57:48 +00:00
dependabot[bot]
c97565ccd8 Bump pillow from 8.2.0 to 8.3.2 in /tools/mapmerge2 
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>
 2021-09-08 01:31:11 +00:00
dependabot[bot]
383abf51fe Bump pillow from 8.1.1 to 8.2.0 in /tools/mapmerge2 
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>
 2021-06-08 20:42:51 +00:00
dependabot[bot]
92b31b7945 Bump pillow from 7.1.0 to 8.1.1 in /tools/mapmerge2 
Bumps [pillow](https://github.com/python-pillow/Pillow) from 7.1.0 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.0...8.1.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-03-19 09:27:49 +00:00
dependabot[bot]
4fadca14dd Bump pillow from 6.2.0 to 7.1.0 in /tools/mapmerge2 
Bumps [pillow](https://github.com/python-pillow/Pillow) from 6.2.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/6.2.0...7.1.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-11-13 07:27:20 +00:00
izac112
ff69e5cde0 Update requirements.txt 2020-05-22 11:35:03 +02:00
Killian
af4dc435a5 once more with feeling 2020-04-04 16:26:23 +01:00
Killian
89bf195956 wiring fix, mapmerge update 2020-04-04 16:23:19 +01:00
dependabot[bot]
8b3096b06e 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 21:50:18 +00:00
Rykka
7ed11de790 Somehow this one had /_maps/ instead of /maps/ too 2019-09-24 04:22:10 -06:00
Rykka
4fc7887bc3 Update for clarity 2019-09-24 04:19:43 -06:00
Rykka
027600ab7e Updates readmes to be more clear. 2019-09-24 04:16:13 -06:00
Rykka
ab7740eb7f Fixes mapmerge.bat 2019-09-24 04:04:33 -06:00
Arokha Sieyes
49d417dcf6 Stop using old pygit2 because it's terrible on windows 2018-10-06 13:00:01 -04:00
Arokha Sieyes
e3690cf196 New mapmerge2 2018-10-06 12:33:10 -04:00
Arokha Sieyes
dd7c6533a5 Clean up unused merge things 2018-10-06 12:32:41 -04:00
Arokha Sieyes
bca4a60a8e Update MapMerge2 2018-04-19 13:16:31 -04:00
Aronai Sieyes
03a3309f1a BAD README 2018-02-03 01:26:13 -05:00
Aronai Sieyes
93958c8090 Merge pull request #2944 from VOREStation/aro-mapmergedoc 
Mapmerge2 Readme
 2018-02-03 01:16:02 -05:00
Aronai Sieyes
34ec1b15c1 Mapmerge2 Readme 2018-02-03 00:41:05 -05:00
Arokha Sieyes
4d559b4c63 TGM guys! 2018-02-02 23:26:40 -05:00
Arokha Sieyes
a1564b4b54 DMM by default for dmm.py 2018-01-28 16:47:42 -05:00
Arokha Sieyes
9dabf02163 Fixes some stuff 2018-01-28 16:09:21 -05:00
Arokha Sieyes
ae08a6896f Add MapMerge2 from /tg/ 2018-01-27 23:38:52 -05:00