Merge branch 'Ambrosia' into DoorDevVolatile

# Conflicts: # BaseClasses.py # CLI.py # Main.py
2021-10-29 15:26:51 -06:00
parent d84a3832a6 9e04417072
commit e78f9218f5
15 changed files with 200 additions and 73 deletions
--- a/source/classes/constants.py
+++ b/source/classes/constants.py
@@ -72,7 +72,8 @@ SETTINGSTOPROCESS = {
      "progressives": "progressive",
      "accessibility": "accessibility",
      "sortingalgo": "algorithm",
-      "beemizer": "beemizer"
+      "beemizer": "beemizer",
+      "restrict_boss_items": "restrict_boss_items"
    },
    "entrance": {
      "openpyramid": "openpyramid",