Merge remote-tracking branch 'origin/master' into api14-rollup

Fix experimental diagnostic IDs
2026-02-21 23:37:44 +01:00 · 2025-11-20 18:33:00 +00:00 · 2025-11-20 19:31:50 +01:00
2 changed files with 3 additions and 1 deletions
--- a/Dalamud/Game/UnlockState/UnlockState.cs
+++ b/Dalamud/Game/UnlockState/UnlockState.cs
@ -22,7 +22,7 @@ using PublicContentSheet = Lumina.Excel.Sheets.PublicContent;

 namespace Dalamud.Game.UnlockState;

-#pragma warning disable UnlockState
+#pragma warning disable Dalamud001

 /// <summary>
 /// This class provides unlock state of various content in the game.
--- a/Dalamud/Storage/ReliableFileStoragePluginScoped.cs
+++ b/Dalamud/Storage/ReliableFileStoragePluginScoped.cs
@ -11,6 +11,8 @@ using Dalamud.Plugin.Services;

 namespace Dalamud.Storage;

+#pragma warning disable Dalamud001
+
 /// <summary>
 /// Plugin-scoped VFS wrapper.
 /// </summary>
Author	SHA1	Message	Date
github-actions[bot]	a834860892	Merge remote-tracking branch 'origin/master' into api14-rollup Some checks failed Build Dalamud / Build on Windows (push) Has been cancelled Details Build Dalamud / Check API Compatibility (push) Has been cancelled Details Build Dalamud / Deploy dalamud-distrib staging (push) Has been cancelled Details	2025-11-20 18:33:00 +00:00
goaaats	0656bff1f9	Fix experimental diagnostic IDs Some checks failed Rollup changes to next version / check (api14) (push) Failing after 4s Details Tag Build / Tag Build (push) Successful in 1s Details Build Dalamud / Build on Windows (push) Has been cancelled Details Build Dalamud / Check API Compatibility (push) Has been cancelled Details Build Dalamud / Deploy dalamud-distrib staging (push) Has been cancelled Details	2025-11-20 19:31:50 +01:00