Kaz Wolfe b32ed39826 Merge branch 'refs/heads/master' into apiX ... # Conflicts: # Dalamud/Game/Libc/LibcFunction.cs # Dalamud/Game/Libc/LibcFunctionAddressResolver.cs # Dalamud/Game/Libc/OwnedStdString.cs # Dalamud/Game/Libc/StdString.cs # Dalamud/Interface/UiBuilder.cs		2024-04-28 11:54:54 -07:00
..
CommandInfo.cs	Add "loading dialog" for service init, unify blocking logic (#1779)	2024-04-21 17:28:37 +02:00
CommandManager.cs	Update XivChatEntry types and names (#1784)	2024-04-28 11:38:40 -07:00