Merge branch 'main' into beta

BaseClasses.py

@@ -1409,7 +1409,7 @@ class CollectionState(object):
     def can_hit_stunned_ganon(self, player):
         ganon_item = self.world.ganon_item[player]
         if ganon_item == "silver":
-            return self.has("Silver Arroys", player) and self.can_shoot_arrows(player)
+            return self.has("Silver Arrows", player) and self.can_shoot_arrows(player)
         elif ganon_item == "boomerang":
             return self.has("Blue Boomerang", player) or self.has("Red Boomerang", player)
         elif ganon_item == "hookshot":

Rom.py

@@ -85,7 +85,7 @@ from Utils import int16_as_bytes, int32_as_bytes, local_path, snes_to_pc
 from Versions import DRVersion, GKVersion, ORVersion
 
 JAP10HASH = '03a63945398191337e896e5771f77173'
-RANDOMIZERBASEHASH = '589a044786a63d98aff0e44b51a6a339'
+RANDOMIZERBASEHASH = 'd80446af9eeb1726d2b6c1303bec1226'
 
 
 class JsonRom(object):