Merge branch 'master' into pull/58

Browse Source

# Conflicts:
#	AdjusterMain.py
#	BaseClasses.py
#	EntranceShuffle.py
#	Gui.py
#	InvertedRegions.py
#	ItemList.py
#	Main.py
#	Plando.py
#	Rom.py
#	Rules.py

...

This commit is contained in:

Fabian Dill

2020-04-04 09:16:39 +02:00

parent 96a1794f7c 959917bb13

commit f89c28d5c2

79 changed files with 5886 additions and 5077 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

650

BaseClasses.py

File diff suppressed because it is too large Load Diff