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

build: 13.0.0.12
Re-add config properties for XLCore/XoM backwards compatibility
2025-12-12 18:27:23 +01:00 · 2025-11-30 01:48:02 +00:00 · 2025-11-30 02:47:07 +01:00 · 2025-11-30 02:01:01 +01:00 · 2025-11-29 19:39:18 +01:00
2 changed files with 9 additions and 1 deletions
--- a/Dalamud/Configuration/Internal/DalamudConfiguration.cs
+++ b/Dalamud/Configuration/Internal/DalamudConfiguration.cs
@ -487,6 +487,14 @@ internal sealed class DalamudConfiguration : IInternalDisposableService
    /// </summary>
    public Vector2 NotificationAnchorPosition { get; set; } = new(1f, 1f);

+#pragma warning disable SA1600
+#pragma warning disable SA1516
+    // XLCore/XoM compatibility until they move it out
+    public string? DalamudBetaKey { get; set; } = null;
+    public string? DalamudBetaKind { get; set; }
+#pragma warning restore SA1516
+#pragma warning restore SA1600
+
    /// <summary>
    /// Load a configuration from the provided path.
    /// </summary>
--- a/Dalamud/Dalamud.csproj
+++ b/Dalamud/Dalamud.csproj
@ -6,7 +6,7 @@

    <PropertyGroup Label="Feature">
        <Description>XIV Launcher addon framework</Description>
-        <DalamudVersion>13.0.0.11</DalamudVersion>
+        <DalamudVersion>13.0.0.12</DalamudVersion>
        <AssemblyVersion>$(DalamudVersion)</AssemblyVersion>
        <Version>$(DalamudVersion)</Version>
        <FileVersion>$(DalamudVersion)</FileVersion>
Author	SHA1	Message	Date
github-actions[bot]	ff3f48848a	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-30 01:48:02 +00:00
goaaats	ac2d522415	build: 13.0.0.12 Some checks failed Rollup changes to next version / check (api14) (push) Failing after 5s Details Tag Build / Tag Build (push) Failing after 3s 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-30 02:47:07 +01:00
goaaats	fadf941fa4	Re-add config properties for XLCore/XoM backwards compatibility	2025-11-30 02:01:01 +01:00
goat	a31dda7865	Merge pull request #2475 from goatcorp/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 [api14] Rollup changes from master	2025-11-29 19:39:18 +01:00