ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-12 18:27:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #2473 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

Browse source 
[api14] Rollup changes from master
This commit is contained in:
goat 2025-11-26 22:43:25 +01:00 • committed by GitHub
commit d4f1636dd2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Dalamud/Dalamud.csproj
View file

@ -6,7 +6,7 @@
<PropertyGroup Label="Feature">
<Description>XIV Launcher addon framework</Description>
<DalamudVersion>13.0.0.10</DalamudVersion>
<DalamudVersion>13.0.0.11</DalamudVersion>
<AssemblyVersion>$(DalamudVersion)</AssemblyVersion>
<Version>$(DalamudVersion)</Version>
<FileVersion>$(DalamudVersion)</FileVersion>

2
Dalamud/Interface/Internal/Windows/BranchSwitcherWindow.cs
View file

@ -105,7 +105,7 @@ public class BranchSwitcherWindow : Window
};
ps.ArgumentList.Add($"--dalamud-beta-kind={config.DalamudBetaKind}");
ps.ArgumentList.Add($"--dalamud-beta-key={config.DalamudBetaKey}");
ps.ArgumentList.Add($"--dalamud-beta-key={(config.DalamudBetaKey.IsNullOrEmpty() ? "invalid" : config.DalamudBetaKey)}");
Process.Start(ps);
Environment.Exit(0);