From 4c048357126fe825bf2375326d9eb311e7b73e71 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sat, 14 Jan 2023 00:29:17 +0000 Subject: [PATCH 1/8] Update ClientStructs --- lib/FFXIVClientStructs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/FFXIVClientStructs b/lib/FFXIVClientStructs index 2d1e16c14..2d011b8fa 160000 --- a/lib/FFXIVClientStructs +++ b/lib/FFXIVClientStructs @@ -1 +1 @@ -Subproject commit 2d1e16c148b429081894e3c7fb0761e67ced0ac2 +Subproject commit 2d011b8fab2cf5cada56007a6bcf5156a362a93b From bd6b96a9b728b963221dca82436b6cdd9277b376 Mon Sep 17 00:00:00 2001 From: Liam Date: Fri, 13 Jan 2023 21:28:09 -0500 Subject: [PATCH 2/8] fix flytext dirty flag --- Dalamud/Game/Gui/FlyText/FlyTextGui.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/Dalamud/Game/Gui/FlyText/FlyTextGui.cs b/Dalamud/Game/Gui/FlyText/FlyTextGui.cs index c69f6cb9c..f2222a7cd 100644 --- a/Dalamud/Game/Gui/FlyText/FlyTextGui.cs +++ b/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; From 820ae7fb945326bd116bc2e977e62a1b23e0b32f Mon Sep 17 00:00:00 2001 From: Jade Macho Date: Sat, 14 Jan 2023 16:18:14 +0100 Subject: [PATCH 3/8] Update MonoMod.RuntimeDetour to reorg 23.1.2-prerelease.1 --- Dalamud/Dalamud.csproj | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Dalamud/Dalamud.csproj b/Dalamud/Dalamud.csproj index d0c6fdd22..1c1e74440 100644 --- a/Dalamud/Dalamud.csproj +++ b/Dalamud/Dalamud.csproj @@ -70,7 +70,7 @@ - + @@ -110,6 +110,14 @@ + + + + monomod + + + + $(OutputPath)TEMP_gitver.txt From 34599d225fe8c38c55931d4d555ca325643b5b86 Mon Sep 17 00:00:00 2001 From: Liam Date: Sat, 14 Jan 2023 10:29:41 -0500 Subject: [PATCH 4/8] cs --- lib/FFXIVClientStructs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/FFXIVClientStructs b/lib/FFXIVClientStructs index 2d011b8fa..af4c2b5f9 160000 --- a/lib/FFXIVClientStructs +++ b/lib/FFXIVClientStructs @@ -1 +1 @@ -Subproject commit 2d011b8fab2cf5cada56007a6bcf5156a362a93b +Subproject commit af4c2b5f9aebfb2518da9fe167fe8fdfdf614b38 From 3c6c91075fb685168030135f14f82fc7edad66a6 Mon Sep 17 00:00:00 2001 From: wolfcomp Date: Mon, 16 Jan 2023 09:09:01 +0100 Subject: [PATCH 5/8] chore: fix CS GHA not resetting head for pulling branch if exists --- .github/workflows/update-submodules.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/update-submodules.yml b/.github/workflows/update-submodules.yml index 3e0c24a33..29e86d09c 100644 --- a/.github/workflows/update-submodules.yml +++ b/.github/workflows/update-submodules.yml @@ -33,6 +33,7 @@ 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 @@ -43,4 +44,11 @@ jobs: - name: Create PR run: | 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" + else + echo "PR already exists, closing it" + gh pr close $prNumber + fi gh pr create --head csupdate-${{ matrix.branches }} --title "[${{ matrix.branches }}] Update ClientStructs" --body "" --base ${{ matrix.branches }} From 43690223c529a0a3e7ebd5ad03d45bc81f1372ac Mon Sep 17 00:00:00 2001 From: wolfcomp <4028289+wolfcomp@users.noreply.github.com> Date: Mon, 16 Jan 2023 09:14:54 +0100 Subject: [PATCH 6/8] chore: force push due to hard reset --- .github/workflows/update-submodules.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update-submodules.yml b/.github/workflows/update-submodules.yml index 29e86d09c..aff4d416c 100644 --- a/.github/workflows/update-submodules.yml +++ b/.github/workflows/update-submodules.yml @@ -40,7 +40,7 @@ jobs: 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 From 425a4d7c185265e827915cf0b7f0fd9113fdb2e2 Mon Sep 17 00:00:00 2001 From: wolfcomp <4028289+wolfcomp@users.noreply.github.com> Date: Mon, 16 Jan 2023 15:16:56 +0100 Subject: [PATCH 7/8] chore: ignore creating a pr if one exists --- .github/workflows/update-submodules.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/update-submodules.yml b/.github/workflows/update-submodules.yml index aff4d416c..19bd86b30 100644 --- a/.github/workflows/update-submodules.yml +++ b/.github/workflows/update-submodules.yml @@ -47,8 +47,7 @@ jobs: 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, closing it" - gh pr close $prNumber + echo "PR already exists, ignoring" fi - gh pr create --head csupdate-${{ matrix.branches }} --title "[${{ matrix.branches }}] Update ClientStructs" --body "" --base ${{ matrix.branches }} From 68b6d9e0cb51a0d21732b8951807b9811a4491ec Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 17 Jan 2023 18:06:59 +0000 Subject: [PATCH 8/8] Update ClientStructs --- lib/FFXIVClientStructs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/FFXIVClientStructs b/lib/FFXIVClientStructs index af4c2b5f9..08e6c7ed7 160000 --- a/lib/FFXIVClientStructs +++ b/lib/FFXIVClientStructs @@ -1 +1 @@ -Subproject commit af4c2b5f9aebfb2518da9fe167fe8fdfdf614b38 +Subproject commit 08e6c7ed7747ad68a38e5762863b5874fe04b8b8