cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 04:32:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
75,041 Commits 8 Branches 0 Tags
b801f6d8469795b811d88cb1563d53ce8cc1cbda
Commit Graph

181 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
Nadyr
e2fb1de6ee powder that makes you say yes 2022-07-03 21:06:19 -04:00
Nadyr
1e9905d766 powder that makes you say yes 2022-07-03 21:06:19 -04:00
Nadyr
258d839052 powder that makes you say yes 2022-07-03 21:06:19 -04:00
Casey
922cfda587 GitHub Workflows 2022-07-03 21:06:19 -04:00
Razgriz
dea4008401 Update compile_and_run.sh 2022-07-03 17:34:19 -07:00
Nadyr
59919ac95a I swear if it's this simple... 2022-06-26 03:17:12 -04:00
Nadyr
648bc73bc5 powder that makes you say yes 2022-06-25 23:06:30 -04:00
Casey
da183d8607 [TGUI] Added prettierx 2022-06-25 21:57:53 +00:00
Razgriz
14792ea49a stop 2022-03-18 22:47:37 -07: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
Razgriz
faf4996d02 Update ss13_autochangelog.py 2022-03-04 23:22:50 -07: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
Cadyn
830bd23885 Make PR merge script executable 2021-08-24 20:53:58 -07:00
Chompstation Bot
dec034e7a8 Upgrade rust_g to version 0.4.0 2021-07-04 22:47:46 +00:00
Chompstation Bot
fb343cec6c [MIRROR] Linter diagnostics + bans non-var relative pathing 2021-06-22 22:17:02 +00:00
cadyn
2db90463d7 Fix merge file 2021-06-19 22:12:14 -07:00
Chompstation Bot
331e5230d6 TGUI 4.3 2021-06-19 04:46:36 -04:00
Chompstation Bot
0a3805ce5c File tweaks 2021-06-12 01:00:59 +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
Aronai Sieyes
f8ff773412 Merge pull request #10573 from VOREStation/upstream-merge-8120 
[MIRROR] Add CI annotations to compile errors/warnings.
 2021-06-07 04:49:20 +00:00
Razgriz
60428c88a8 Update nanomap-renderer-invoker.sh 2021-03-30 01:50:13 -07: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
cadyn
e351ca0423 Merge branch 'master' into upstream-merge-9510 2021-02-27 13:19:51 -08:00
Chompstation Bot
7e47c15a61 [MIRROR] Autochangelog fix 6 2021-02-27 20:10:47 +00:00
Novacat
556b955810 Merge pull request #9504 from VOREStation/upstream-merge-7804 
[MIRROR] Autochangelog Fix
 2021-02-27 19:00:57 +00:00
MarinaGryphon
30a49e5f80 Update tools/ci/compile_and_run.sh 2021-02-17 08:18:29 -06:00
MarinaGryphon
519a606574 Fixes CI hang 2021-02-16 23:19:16 -06:00
Novacat
b8e88cf77b Merge pull request #9616 from VOREStation/upstream-merge-7817 
[MIRROR] Adds StrongDMM to the main repository
 2021-01-27 15:50:34 +00:00
Razgriz1032
c0f2aca519 Automatic changelog generation for 2021-01-19 22:24:44 +00:00
Chompstation Bot
3018b622d3 [MIRROR] Experimental: adds workflow to autoupdate changelog 2021-01-13 00:28:47 +00:00
Chompstation Bot
db1c95c6a7 Move away from Travis CI to GitHub Actions 2020-11-24 19:00:16 +00:00
NanoMap Generation
d75cce93e8 NanoMap Auto-Update (Tue Nov 24 03:49:13 UTC 2020) 2020-11-24 03:49:13 +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
Cadyn
213cec1dcc Reset map files. 2020-10-14 21:51:31 -07:00
Cadyn
07775449d7 Fixing conflicts 2020-10-05 18:10:53 -07:00
ShadowLarkens
a306353b7a chmod +x nanomap-renderer-invoker.sh 2020-09-28 14:51:29 -07:00
ShadowLarkens
cf9b39b4a9 Set up GitHub action for nanomap generation 2020-09-25 03:25:07 -07:00
ShadowLarkens
8c338ed9da NanoUI PDAs made Modular (lazy commit) 2020-09-16 21:31:49 -07:00
izac112
4b051c23fc Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-09-13 15:05:53 +02:00
ShadowLarkens
dbbaaca434 Add random playsound dump script 2020-08-21 09:33:03 -07:00
izac112
601a155b30 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-07-25 15:22:42 +02:00
ShadowLarkens
e60a98da74 We're close, I can feel it 2020-07-21 17:52:38 -07:00
ShadowLarkens
462c8ccac9 Once again, I am asking for your support 2020-07-21 17:46:55 -07:00
ShadowLarkens
5e86d718fd Let's try again with less failure 2020-07-21 17:39:19 -07:00
ShadowLarkens
8ed4d6e173 Attempt to compile TGUI as part of TRAVIS 2020-07-21 17:35:15 -07:00
izac112
ff69e5cde0 Update requirements.txt 2020-05-22 11:35:03 +02:00
izac112
a66fd72dba # YW Edit removes "|| exit 1" until we can fix our submaps 2020-05-18 22:46:18 +02:00