Merge branch 'DoorDevVolatile' into Customizer

# Conflicts:
#	Main.py
#	Rom.py
This commit is contained in:
aerinon
2022-06-15 16:56:57 -06:00
7 changed files with 116 additions and 62 deletions

View File

@@ -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.2.4-w'
__version__ = '1.0.2.5-w'
from source.classes.BabelFish import BabelFish