Merged in DR v1.2.0.14 (2nd)

2023-04-07 12:04:12 -05:00
parent c2b3d8ce6c
commit 793f3b30b0
28 changed files with 633 additions and 618 deletions
--- a/source/classes/constants.py
+++ b/source/classes/constants.py
@@ -80,7 +80,7 @@ SETTINGSTOPROCESS = {
      "dropshuffle": "dropshuffle",
      "keydropshuffle": "keydropshuffle",
      "take_any": "take_any",
-      
+
      "itempool": "difficulty",
      "flute_mode": "flute_mode",
      "bow_mode": "bow_mode",
@@ -118,7 +118,7 @@ SETTINGSTOPROCESS = {
      "experimental": "experimental",
      "dungeon_counters": "dungeon_counters",
      "mixed_travel": "mixed_travel",
-      "standardize_palettes": "standardize_palettes"
+      "standardize_palettes": "standardize_palettes",
    },
    "enemizer": {
      "enemyshuffle": "shuffleenemies",