Merge branch 'DoorDevUnstable' into Synthesis

# Conflicts:
#	CLI.py
#	Main.py
#	Rom.py
#	data/base2current.bps

CLI.py

@@ -205,14 +205,14 @@ def parse_settings():
         'keyshuffle': 'none',
         'bigkeyshuffle': False,
         'keysanity': False,
-        "door_shuffle": "basic",
-        "intensity": 2,
+        'door_shuffle': 'vanilla',
+        'intensity': 2,
         'door_type_mode': 'original',
         'decoupledoors': False,
-        "experimental": False,
-        "dungeon_counters": "default",
-        "mixed_travel": "prevent",
-        "standardize_palettes": "standardize",
+        'experimental': False,
+        'dungeon_counters': 'default',
+        'mixed_travel': 'prevent',
+        'standardize_palettes': 'standardize',
         
         "triforce_pool": 0,
         "triforce_goal": 0,

Main.py

@@ -33,7 +33,7 @@ from source.overworld.EntranceShuffle2 import link_entrances_new
 from source.tools.BPS import create_bps_from_data
 from source.classes.CustomSettings import CustomSettings
 
-__version__ = '1.0.1.2-x'
+__version__ = '1.0.1.3-x'
 
 from source.classes.BabelFish import BabelFish
 

RELEASENOTES.md

@@ -210,6 +210,9 @@ Same as above but both small keys and bigs keys of the dungeon are not allowed o
 
 #### Unstable
 
+* 1.0.1.3
+  * Fix for rain prevented doors fouling up key doors
+  * Couple minor issues
 * 1.0.1.2
   * Removed "good bee" as an in-logic way of killing Mothula
   * Fixed an issue with Mystery generation and Windows path