From f0ca079fe6f0e0f2006bc44e1357475db93f28a0 Mon Sep 17 00:00:00 2001
From: Urantij <maximumuranti@gmail.com>
Date: Tue, 18 Nov 2025 15:52:37 +0700
Subject: [PATCH 1/3] Fix cursor incorrectly flashing red after a rewind in
 replays with Alternate mod active (#35725)

* Fix red cursor with alt mod when rewind

* Change rewind detection in input blocking
---
 osu.Game.Rulesets.Osu/Mods/InputBlockingMod.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/Mods/InputBlockingMod.cs b/osu.Game.Rulesets.Osu/Mods/InputBlockingMod.cs
index b56fdbdf74..34eb2be077 100644
--- a/osu.Game.Rulesets.Osu/Mods/InputBlockingMod.cs
+++ b/osu.Game.Rulesets.Osu/Mods/InputBlockingMod.cs
@@ -67,6 +67,9 @@ namespace osu.Game.Rulesets.Osu.Mods
         {
             if (LastAcceptedAction != null && nonGameplayPeriods.IsInAny(gameplayClock.CurrentTime))
                 LastAcceptedAction = null;
+
+            if (LastAcceptedAction != null && gameplayClock.IsRewinding)
+                LastAcceptedAction = null;
         }
 
         protected abstract bool CheckValidNewAction(OsuAction action);

From 89f2c7160d91ed991fea7db7de6b6ca425521969 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 18 Nov 2025 18:45:38 +0900
Subject: [PATCH 2/3] Update framework

---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index 6f0543935b..2df686d354 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -10,7 +10,7 @@
     <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2025.1111.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2025.1118.1" />
   </ItemGroup>
   <PropertyGroup>
     <!-- Fody does not handle Android build well, and warns when unchanged.
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 9925cf217e..d4248b8570 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -35,7 +35,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Realm" Version="20.1.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2025.1111.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2025.1118.1" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2025.1116.0" />
     <PackageReference Include="Sentry" Version="5.1.1" />
     <!-- Held back due to 0.34.0 failing AOT compilation on ZstdSharp.dll dependency. -->
diff --git a/osu.iOS.props b/osu.iOS.props
index adab5435ea..74dae877f1 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -17,6 +17,6 @@
     <MtouchInterpreter>-all</MtouchInterpreter>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2025.1111.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2025.1118.1" />
   </ItemGroup>
 </Project>

From ef4408a73e5c5c5851bdc6073f4ca09a626032f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 19 Nov 2025 08:29:55 +0100
Subject: [PATCH 3/3] Fix song select crashing when selecting random beatmap
 and changing star rating filter simultaneously (#35730)

Closes https://github.com/ppy/osu/issues/35728.
---
 osu.Game/Screens/SelectV2/BeatmapCarousel.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/SelectV2/BeatmapCarousel.cs b/osu.Game/Screens/SelectV2/BeatmapCarousel.cs
index 58874e79d1..ae1c8eb878 100644
--- a/osu.Game/Screens/SelectV2/BeatmapCarousel.cs
+++ b/osu.Game/Screens/SelectV2/BeatmapCarousel.cs
@@ -1035,13 +1035,13 @@ namespace osu.Game.Screens.SelectV2
 
         private bool nextRandomBeatmap()
         {
-            ICollection<GroupedBeatmap> visibleBeatmaps = ExpandedGroup != null
+            ICollection<GroupedBeatmap> visibleBeatmaps = ExpandedGroup != null && grouping.GroupItems.TryGetValue(ExpandedGroup, out var groupItems)
                 // In the case of grouping, users expect random to only operate on the expanded group.
                 // This is going to incur some overhead as we don't have a group-beatmapset mapping currently.
                 //
                 // If this becomes an issue, we could either store a mapping, or run the random algorithm many times
                 // using the `SetItems` method until we get a group HIT.
-                ? grouping.GroupItems[ExpandedGroup].Select(i => i.Model).OfType<GroupedBeatmap>().ToArray()
+                ? groupItems.Select(i => i.Model).OfType<GroupedBeatmap>().ToArray()
                 : GetCarouselItems()!.Select(i => i.Model).OfType<GroupedBeatmap>().ToArray();
 
             GroupedBeatmap beatmap;