Merge branch 'master' into SDF-chevrons

LumpBloom7 · Nov 9, 2024 · ecee317 · ecee317
2 parents cd5548f + bdf491e
commit ecee317
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 4 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -5,7 +5,7 @@
 
 # Check out with crlf (Windows) line endings
 *.sln text eol=crlf
-#*.csproj text eol=crlf
+# *.csproj text eol=crlf
 *.cs text diff=csharp eol=crlf
 *.resx text eol=crlf
 *.vsixmanifest text eol=crlf

diff --git a/osu.Game.Rulesets.Sentakki/Objects/Drawables/Pieces/Slides/SlideVisual.cs b/osu.Game.Rulesets.Sentakki/Objects/Drawables/Pieces/Slides/SlideVisual.cs
@@ -124,7 +124,6 @@ private void tryCreateRegularChevrons()
                     chevron.Width = 80;
                     chevrons.Add(chevron);
 
-
                     previousPosition = position;
                 }
 

diff --git a/osu.Game.Rulesets.Sentakki/Objects/SentakkiHitObject.cs b/osu.Game.Rulesets.Sentakki/Objects/SentakkiHitObject.cs
@@ -65,7 +65,7 @@ public override IEnumerable<string> LookupNames
             }
 
 #nullable enable
-            public override HitSampleInfo With(Optional<string> newName = default, Optional<string> newBank = default, Optional<string?> newSuffix = default, Optional<int> newVolume = default)
+            public override HitSampleInfo With(Optional<string> newName = default, Optional<string> newBank = default, Optional<string?> newSuffix = default, Optional<int> newVolume = default, Optional<bool> newEditorAutoBank = default)
             {
                 return new SentakkiHitSampleInfo(newName.GetOr(Name), newVolume.GetOr(Volume));
             }

diff --git a/osu.Game.Rulesets.Sentakki/osu.Game.Rulesets.Sentakki.csproj b/osu.Game.Rulesets.Sentakki/osu.Game.Rulesets.Sentakki.csproj
@@ -9,7 +9,7 @@
         <AssemblyName>osu.Game.Rulesets.Sentakki</AssemblyName>
     </PropertyGroup>
     <ItemGroup>
-        <PackageReference Include="ppy.osu.Game" Version="2024.1023.0"/>
+        <PackageReference Include="ppy.osu.Game" Version="2024.1104.0"/>
     </ItemGroup>
 
     <!--Since we aren't changing the assembly name, we use the assembly title to indicate whether it is a dev build-->
-Original file line number
+Diff line change
@@ Expand Up / @@ -124,7 +124,6 @@ private void tryCreateRegularChevrons() @@
                         chevron.Width = 80;
                         chevrons.Add(chevron);
                         previousPosition = position;
                     }
@@ Expand Down @@