Merge branch 'Customizer' into Synthesis

# Conflicts: # BaseClasses.py # Rom.py # data/base2current.bps
2022-08-11 16:06:50 -06:00
parent 1168273e43 5dd9403afd
commit 21456b5c90
16 changed files with 69 additions and 34 deletions
--- a/resources/app/gui/randomize/entrando/widgets.json
+++ b/resources/app/gui/randomize/entrando/widgets.json
@@ -18,6 +18,7 @@
      ]
    },
    "shufflelinks":     { "type": "checkbox" },
+    "shuffletavern":     { "type": "checkbox" },
    "overworld_map": {
      "type": "selectbox",
      "options": [