Merge branch 'DoorDevVolatile' into Customizer

# Conflicts:
#	BaseClasses.py
#	ItemList.py
#	Main.py

CLI.py

@@ -125,7 +125,7 @@ def parse_cli(argv, no_defaults=False):
                          'ow_palettes', 'uw_palettes', 'sprite', 'disablemusic', 'quickswap', 'fastmenu', 'heartcolor',
                          'heartbeep', 'remote_items', 'shopsanity', 'dropshuffle', 'pottery', 'keydropshuffle',
                          'mixed_travel', 'standardize_palettes', 'code', 'reduce_flashing', 'shuffle_sfx',
-                         'msu_resume', 'collection_rate']:
+                         'msu_resume', 'collection_rate', 'colorizepots']:
                 value = getattr(defaults, name) if getattr(playerargs, name) is None else getattr(playerargs, name)
                 if player == 1:
                     setattr(ret, name, {1: value})
@@ -162,6 +162,7 @@ def parse_settings():
         "progressive": "on",
         "accessibility": "items",
         "algorithm": "balanced",
+        'mystery': False,
         "restrict_boss_items": "none",
 
         # Shuffle Ganon defaults to TRUE
@@ -182,6 +183,7 @@ def parse_settings():
         'keydropshuffle': False,
         'dropshuffle': False,
         'pottery': 'none',
+        'colorizepots': False,
         'shufflepots': False,
         "mapshuffle": False,
         "compassshuffle": False,