Merge branch 'DoorDevUnstable' into Synthesis

# Conflicts:
#	CLI.py
#	Main.py
#	Rom.py
#	data/base2current.bps
This commit is contained in:
aerinon
2022-09-08 13:47:38 -06:00
3 changed files with 10 additions and 7 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.1.2-x'
__version__ = '1.0.1.3-x'
from source.classes.BabelFish import BabelFish