Merge branch 'DoorDevVolatile' into Customizer

# Conflicts: # BaseClasses.py # ItemList.py # Main.py
2022-04-21 11:14:40 -06:00
parent b3c9f1cf03 31aeb8a776
commit 7dd5cc0e36
23 changed files with 1087 additions and 546 deletions
--- a/source/gui/adjust/overview.py
+++ b/source/gui/adjust/overview.py
@@ -157,6 +157,7 @@ def adjust_page(top, parent, settings):
            "quickswap": "quickswap",
            "nobgm": "disablemusic",
            "reduce_flashing": "reduce_flashing",
+            'msu_resume': 'msu_resume',
            "shuffle_sfx": "shuffle_sfx",
            "msu_resume": "msu_resume",
        }