Merge branch 'DoorDevUnstable' into DoorDevVolatile

# Conflicts: # Main.py # MultiClient.py # Rom.py # data/base2current.bps # resources/app/gui/lang/en.json # resources/app/gui/randomize/item/widgets.json # source/gui/bottom.py # source/gui/widgets.py
2023-08-04 11:33:31 -06:00
parent 5d3c401f1f 1592fac792
commit 90f1629f0e
31 changed files with 289 additions and 155 deletions
--- a/resources/app/cli/args.json
+++ b/resources/app/cli/args.json
@@ -342,6 +342,7 @@
  "triforce_goal_min": {},
  "triforce_goal_max": {},
  "triforce_min_difference": {},
+  "triforce_max_difference": {},
  "custom": {
    "type": "bool",
    "help": "suppress"