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 |
|
Fabian Dill
|
7333a15f1f
|
handle merge conflicts after plando update
|
2021-01-17 06:54:38 +01:00 |
|
Fabian Dill
|
514cd19367
|
Merge branch 'main' into breaking_changes
# Conflicts:
# BaseClasses.py
# Mystery.py
# WebHostLib/downloads.py
# WebHostLib/models.py
# WebHostLib/templates/macros.html
# WebHostLib/upload.py
# worlds/alttp/ItemPool.py
# worlds/alttp/Main.py
|
2021-01-17 06:50:25 +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
|
4de64eab84
|
update Options system #2
|
2020-10-24 19:46:13 +02:00 |
|
Fabian Dill
|
1d58f54101
|
move ALTTP to its own world folder
|
2020-10-24 05:38:56 +02:00 |
|