ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-21 16:09:19 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge branch 'goatcorp:master' into master

Browse source
This commit is contained in:
wolfcomp 2023-01-18 09:48:05 +01:00 • committed by GitHub
commit ea7c3e59c8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 20 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
.github/workflows/update-submodules.yml vendored
View file

@ -33,14 +33,21 @@ jobs:
- name: Update submodule - name: Update submodule
run: | run: |
git checkout -b csupdate-${{ matrix.branches }} git checkout -b csupdate-${{ matrix.branches }}
git reset --hard origin/${{ matrix.branches }}
cd lib/FFXIVClientStructs cd lib/FFXIVClientStructs
git fetch git fetch
git reset --hard origin/main git reset --hard origin/main
cd ../.. cd ../..
git add lib/FFXIVClientStructs git add lib/FFXIVClientStructs
git commit --message "Update ClientStructs" git commit --message "Update ClientStructs"
git push origin csupdate-${{ matrix.branches }} git push origin csupdate-${{ matrix.branches }} --force
- name: Create PR - name: Create PR
run: | run: |
echo ${{ secrets.UPDATE_PAT }} | gh auth login --with-token echo ${{ secrets.UPDATE_PAT }} | gh auth login --with-token
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 }} gh pr create --head csupdate-${{ matrix.branches }} --title "[${{ matrix.branches }}] Update ClientStructs" --body "" --base ${{ matrix.branches }}
else
echo "PR already exists, ignoring"
fi

10
Dalamud/Dalamud.csproj
View file

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

1
Dalamud/Game/Gui/FlyText/FlyTextGui.cs
View file

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

2
lib/FFXIVClientStructs

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