Merge branch 'DoorDev' into DoorDevUnstable

# Conflicts: # Main.py # RELEASENOTES.md
2021-03-05 10:43:05 -07:00
parent 9a5be8644c b108398545
commit dc5cd2b744
8 changed files with 103 additions and 89 deletions
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -130,6 +130,7 @@ New item counter modified to show total

 * 0.3.1.5-u
 	* Ganon hints fixed for shops
+	* Added support for a settings file so SahasrahBot and the main website can use it easier. (Thanks Synack)
 * 0.3.1.4-u
 	* Fix for Blind when shuffled to TT and another dungeon
 	* Remove use of RaceRandom