From 02d4081f2ff877be565858c2d4aacac1c5f5e46a Mon Sep 17 00:00:00 2001
From: goat <16760685+goaaats@users.noreply.github.com>
Date: Thu, 18 Dec 2025 01:24:09 +0100
Subject: [PATCH 1/4] ci: disable rollup for now

---
 .github/workflows/rollup.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/rollup.yml b/.github/workflows/rollup.yml
index 8fe049ad7..f4e013258 100644
--- a/.github/workflows/rollup.yml
+++ b/.github/workflows/rollup.yml
@@ -1,8 +1,8 @@
 name: Rollup changes to next version
 on:
-  push:
-    branches:
-      - master
+#  push:
+#    branches:
+#      - master
   workflow_dispatch:
 
 jobs:

From 05037dccc7c6b899b1a4ab1483e763e789e28dee Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <noreply@github.com>
Date: Thu, 18 Dec 2025 00:24:13 +0000
Subject: [PATCH 2/4] Update ClientStructs

---
 lib/FFXIVClientStructs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/FFXIVClientStructs b/lib/FFXIVClientStructs
index 305c1629e..c0a862043 160000
--- a/lib/FFXIVClientStructs
+++ b/lib/FFXIVClientStructs
@@ -1 +1 @@
-Subproject commit 305c1629eed0b1cdca5efb102e37de93d592d155
+Subproject commit c0a8620439e647ccf443710e81acce021b299bf5

From 25dba5e23b9217b7d8f86af1c449a907b04c6f52 Mon Sep 17 00:00:00 2001
From: goat <16760685+goaaats@users.noreply.github.com>
Date: Thu, 18 Dec 2025 01:29:48 +0100
Subject: [PATCH 3/4] ci: revert global concurrency change again because it
 breaks PR workflows

Need to figure out something better for this soon, but it's better not to have this at all right now
---
 .github/workflows/main.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 9466cb083..209ed90de 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1,9 +1,8 @@
 name: Build Dalamud
 on: [push, pull_request, workflow_dispatch]
 
-# Globally blocking because of git pushes in deploy step
 concurrency:
-  group: build_dalamud_${{ github.repository_owner }}
+  group: build_dalamud_${{ github.ref_name }}
   cancel-in-progress: false
 
 jobs:

From 3a1e1e6425acf5be0a4721aae505f732f1cc0977 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <noreply@github.com>
Date: Thu, 18 Dec 2025 06:40:14 +0000
Subject: [PATCH 4/4] Update Excel Schema

---
 lib/Lumina.Excel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Lumina.Excel b/lib/Lumina.Excel
index c74841abc..d8d0b53e2 160000
--- a/lib/Lumina.Excel
+++ b/lib/Lumina.Excel
@@ -1 +1 @@
-Subproject commit c74841abce0830ead4437ed2f560bceb6235a538
+Subproject commit d8d0b53e27393f509ac5397511cb8d251d562277