Skip to content

Commit

Permalink
[net9] Rollup changes from master (#2133)
Browse files Browse the repository at this point in the history
* Use MiniGame BGM scene for About tab

* Use span comparison in GameGui.IsInLobby

* [master] Update ClientStructs (#2126)

Co-authored-by: github-actions[bot] <[email protected]>

* [master] Update ClientStructs (#2134)

Co-authored-by: github-actions[bot] <[email protected]>

* [master] Update ClientStructs (#2135)

Co-authored-by: github-actions[bot] <[email protected]>

* Fix config option summaries (#2138)

* Fix config option summaries

* Obsolete LockonDefaultZoom_179 with error

* Don't allow nameplate GameObject lookup when ObjectId is invalid (#2137)

* build: 11.0.2.0

* Update ClientStructs (#2139)

Co-authored-by: github-actions[bot] <[email protected]>

* chore: remove [Experimental] from SeStringRenderer (#2144)

It hasn't caused problem for a while (though performance probably can be
better), and looks good enough to remove this attribute.

* Update ClientStructs (#2140)

Co-authored-by: github-actions[bot] <[email protected]>

* Return nullable on XivChatType.GetDetails (#2143)

---------

Co-authored-by: Haselnussbomber <[email protected]>
Co-authored-by: github-actions[bot] <[email protected]>
Co-authored-by: nebel <[email protected]>
Co-authored-by: goat <[email protected]>
Co-authored-by: goat <[email protected]>
Co-authored-by: srkizer <[email protected]>
  • Loading branch information
7 people authored Dec 17, 2024
2 parents df3900f + f9bdceb commit a7faabd
Show file tree
Hide file tree
Showing 15 changed files with 746 additions and 763 deletions.
2 changes: 1 addition & 1 deletion Dalamud/Dalamud.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
</PropertyGroup>

<PropertyGroup Label="Feature">
<DalamudVersion>11.0.1.0</DalamudVersion>
<DalamudVersion>11.0.2.0</DalamudVersion>
<Description>XIV Launcher addon framework</Description>
<AssemblyVersion>$(DalamudVersion)</AssemblyVersion>
<Version>$(DalamudVersion)</Version>
Expand Down
Loading

0 comments on commit a7faabd

Please sign in to comment.