morgan/Grinch-AP
1
0
Fork 0
mirror of https://github.com/MarioSpore/Grinch-AP.git synced 2025-10-21 20:21:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into breaking_changes

Browse Source 
# Conflicts:
#	Adjuster.py
#	Gui.py
#	MultiClient.py
#	setup.py
#	worlds/alttp/AdjusterMain.py
#	worlds/alttp/Main.py
This commit is contained in:
Fabian Dill
2021-02-21 20:15:07 +01:00
parent 96dfccdbfc a8bace554e
commit dcce53f8c8
23 changed files with 424 additions and 404 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Utils.py
View File

@@ -341,8 +341,8 @@ def get_adjuster_settings(romfile: str) -> typing.Tuple[str, bool]:
f"Enter yes, no or never: ")
if adjust_wanted and adjust_wanted.startswith("y"):
adjusted = True
import AdjusterMain
_, romfile = AdjusterMain.adjust(adjuster_settings)
import Adjuster
_, romfile = Adjuster.adjust(adjuster_settings)
elif adjust_wanted and "never" in adjust_wanted:
persistent_store("adjuster", "never_adjust", True)
return romfile, False