Merge branch 'Dev' into dev-fenhl

Author: fenhl

data/presets_default.json

@@ -4576,14 +4576,14 @@
         "custom_ice_trap_count": 100,
         "ice_trap_appearance": "junk_only"
     },
-    "Multiworld Tournament Season 5": {
+    "Multiworld Tournament Season 6": {
         "aliases": [
             "mw",
-            "mw_s5"
+            "mw_s6"
         ],
         "language": "english",
         "show_seed_info": true,
-        "user_message": "Multiworld Tournament Season 5",
+        "user_message": "Multiworld Tournament Season 6",
         "world_count": 3,
         "create_spoiler": true,
         "password_lock": false,
@@ -4694,7 +4694,7 @@
         "keyring_give_bk": false,
         "shuffle_bosskeys": "dungeon",
         "shuffle_silver_rupees": "vanilla",
-        "silver_rupee_pouches_choice": "off",
+        "silver_rupee_pouches_choice": "all",
         "silver_rupee_pouches": [],
         "enhance_map_compass": [
             "map_mq",

version.py

@@ -1,7 +1,7 @@
-__version__ = '9.0.24'
+__version__ = '9.0.25'
 
 # This is a supplemental version number for branches based off of main dev.
-supplementary_version = 2
+supplementary_version = 1
 
 # Pick a unique identifier byte for your fork if you are intending to have a long-lasting branch.
 # This will be 0x00 for main releases and 0x01 for main dev.