Fabian Dill 0d576eefbb Merge branch 'main' into breaking_changes ...

# Conflicts:
#	Main.py
#	worlds/alttp/EntranceRandomizer.py

2021-03-03 01:54:52 +01:00

..

api

…

static

Merge remote-tracking branch 'pepperpow/triforce_changes' into main

2021-02-26 19:56:44 -08:00

templates

Merge branch 'main' into breaking_changes

2021-03-03 01:54:52 +01:00

__init__.py

…

autolauncher.py

Merge branch 'main' into breaking_changes

2021-02-21 20:15:07 +01:00

check.py

…

customserver.py

…

downloads.py

…

generate.py

Hollow Knight integration

2021-02-21 20:17:24 +01:00

landing.py

…

models.py

…

requirements.txt

Hollow Knight integration

2021-02-21 20:17:24 +01:00

tracker.py

Merge branch 'main' into breaking_changes

2021-03-03 01:54:52 +01:00

upload.py

…