Fabian Dill a646594f08 Merge branch 'main' into breaking_changes ... # Conflicts: # BaseClasses.py # Fill.py # MultiClient.py # MultiServer.py # Utils.py # test/dungeons/TestDungeon.py # test/inverted/TestInverted.py # test/inverted_minor_glitches/TestInvertedMinor.py # test/inverted_owg/TestInvertedOWG.py # test/minor_glitches/TestMinor.py # test/owg/TestVanillaOWG.py # test/vanilla/TestVanilla.py # worlds/alttp/ItemPool.py # worlds/alttp/Main.py # worlds/alttp/Rom.py		2021-01-30 23:29:32 +01:00
..
api	fix attribute access in user api	2020-12-06 14:05:47 +01:00
static	Fix certain settings not being set properly on the weighted settings page.	2021-01-26 18:29:23 -05:00
templates	Merge branch 'main' into breaking_changes	2021-01-17 06:50:25 +01:00
__init__.py	Merge branch 'main' into breaking_changes	2021-01-17 06:50:25 +01:00
autolauncher.py	update Archipelago	2021-01-03 14:32:32 +01:00
check.py	Item Plando Support	2021-01-02 12:49:43 +01:00
customserver.py	update Archipelago	2021-01-03 14:32:32 +01:00
downloads.py	Merge branch 'main' into breaking_changes	2021-01-17 06:50:25 +01:00
generate.py	update Archipelago	2021-01-03 14:32:32 +01:00
landing.py	update landing with dynamic links and counter for Seeds	2020-08-13 09:23:52 +02:00
models.py	fix downloading and displaying patches for seeds/rooms with teams	2021-01-03 18:28:07 +01:00
requirements.txt	Revert "Revert "Merge branch 'pr/151'""	2020-12-04 23:52:03 +01:00
tracker.py	Merge branch 'main' into breaking_changes	2021-01-03 13:13:59 +01:00
upload.py	Merge branch 'main' into breaking_changes	2021-01-17 06:50:25 +01:00