Fabian Dill dcce53f8c8 Merge branch 'main' into breaking_changes ...

# Conflicts:
#	Adjuster.py
#	Gui.py
#	MultiClient.py
#	setup.py
#	worlds/alttp/AdjusterMain.py
#	worlds/alttp/Main.py

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

..

api

fix attribute access in user api

2020-12-06 14:05:47 +01:00

static

Weighted Settings v4.0.1 rev1 - Fix a bug (it was a typo) causing the "puke" palettes to never be updated on weighted settings files generated from the website.

2021-02-19 17:50:49 -05:00

templates

Merge branch 'main' into breaking_changes

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

__init__.py

Merge branch 'main' into breaking_changes

2021-01-17 06:50:25 +01:00

autolauncher.py

Merge branch 'main' into breaking_changes

2021-02-21 20:15:07 +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

…

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-02-19 13:45:50 +01:00

upload.py

Merge branch 'main' into breaking_changes

2021-01-17 06:50:25 +01:00