Merge branch 'goatcorp:master' into master

.github/workflows/update-submodules.yml

@@ -33,14 +33,21 @@ jobs:
     - name: Update submodule
       run: |
         git checkout -b csupdate-${{ matrix.branches }}
+        git reset --hard origin/${{ matrix.branches }}
         cd lib/FFXIVClientStructs
         git fetch
         git reset --hard origin/main
         cd ../..
         git add lib/FFXIVClientStructs
         git commit --message "Update ClientStructs"
-        git push origin csupdate-${{ matrix.branches }}
+        git push origin csupdate-${{ matrix.branches }} --force
     - name: Create PR
       run: |
         echo ${{ secrets.UPDATE_PAT }} | gh auth login --with-token
-        gh pr create --head csupdate-${{ matrix.branches }} --title "[${{ matrix.branches }}] Update ClientStructs" --body "" --base ${{ matrix.branches }}
+        prNumber=$(gh pr list --base ${{ matrix.branches }} --head csupdate-${{ matrix.branches }} --state open --json number --template "{{range .}}{{.number}}{{end}}")
+        if [ -z "$prNumber" ]; then
+          echo "No PR found, creating one"
+          gh pr create --head csupdate-${{ matrix.branches }} --title "[${{ matrix.branches }}] Update ClientStructs" --body "" --base ${{ matrix.branches }}
+        else
+          echo "PR already exists, ignoring"
+        fi

Dalamud/Dalamud.csproj

@@ -70,7 +70,7 @@
         <PackageReference Include="Lumina" Version="3.10.0" />
         <PackageReference Include="Lumina.Excel" Version="6.3.1" />
         <PackageReference Include="MinSharp" Version="1.0.4" />
-        <PackageReference Include="MonoMod.RuntimeDetour" Version="21.10.10.01" />
+        <PackageReference Include="MonoModReorg.RuntimeDetour" Version="23.1.2-prerelease.1" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
         <PackageReference Include="Serilog" Version="2.11.0" />
         <PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
@@ -110,6 +110,14 @@
         </ItemGroup>
     </Target>
 
+    <Target Name="ChangeAliasesOfNugetRefs" BeforeTargets="FindReferenceAssembliesForReferences;ResolveReferences">
+        <ItemGroup>
+            <ReferencePath Condition="'%(FileName)' == 'MonoMod.Iced'">
+                <Aliases>monomod</Aliases>
+            </ReferencePath>
+        </ItemGroup>
+    </Target>
+
     <PropertyGroup>
         <!-- Needed temporarily for CI -->
         <TempVerFile>$(OutputPath)TEMP_gitver.txt</TempVerFile>

Dalamud/Game/Gui/FlyText/FlyTextGui.cs

@@ -262,6 +262,7 @@ public sealed class FlyTextGui : IDisposable, IServiceType
                         tmpVal2 != val2 ||
                         tmpText1.ToString() != cmpText1 ||
                         tmpText2.ToString() != cmpText2 ||
+                        tmpDamageTypeIcon != damageTypeIcon ||
                         tmpColor != color ||
                         tmpIcon != icon ||
                         Math.Abs(tmpYOffset - yOffset) > float.Epsilon;

lib/FFXIVClientStructs

@@ -1 +1 @@
-Subproject commit af4c2b5f9aebfb2518da9fe167fe8fdfdf614b38
+Subproject commit 08e6c7ed7747ad68a38e5762863b5874fe04b8b8