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 |
Fabian Dill
|
670b8b4b11
|
Merge branch 'main' into breaking_changes
# Conflicts:
# MultiClient.py
# WebUI.py
|
2021-01-21 05:36:16 +01:00 |
Fabian Dill
|
08ca4245c1
|
Merge branch 'main' into breaking_changes
# Conflicts:
# Adjuster.py
# AdjusterMain.py
# BaseClasses.py
# MultiClient.py
# MultiServer.py
# Mystery.py
# Utils.py
# WebHostLib/downloads.py
# WebHostLib/generate.py
# dumpSprites.py
# test/TestBase.py
# worlds/alttp/EntranceRandomizer.py
# worlds/alttp/Main.py
# worlds/alttp/Rom.py
|
2021-01-03 13:13:59 +01:00 |
Fabian Dill
|
1d58f54101
|
move ALTTP to its own world folder
|
2020-10-24 05:38:56 +02:00 |