Skip to content

Commit

Permalink
Merge branch 'apiX' of github.com:goatcorp/Dalamud into apiX
Browse files Browse the repository at this point in the history
  • Loading branch information
goaaats committed Jul 1, 2024
2 parents f574f79 + 1232a9c commit 0f5cf33
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions Dalamud/Plugin/Internal/PluginManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -554,14 +554,14 @@ public async Task LoadAllPlugins()
var manifestFile = LocalPluginManifest.GetManifestFile(dllFile);
if (!manifestFile.Exists)
{
Log.Information("DLL at {DllPath} has no manifest, this is no longer valid", dllFile.FullName);
Log.Error("DLL at {DllPath} has no manifest, this is no longer valid", dllFile.FullName);
continue;
}

var manifest = LocalPluginManifest.Load(manifestFile);
if (manifest == null)
{
Log.Information("Could not deserialize manifest for DLL at {DllPath}", dllFile.FullName);
Log.Error("Could not deserialize manifest for DLL at {DllPath}", dllFile.FullName);
continue;
}

Expand Down Expand Up @@ -816,14 +816,14 @@ public void ScanDevPlugins()
var manifestFile = LocalPluginManifest.GetManifestFile(dllFile);
if (!manifestFile.Exists)
{
Log.Information("DLL at {DllPath} has no manifest, this is no longer valid", dllFile.FullName);
Log.Error("DLL at {DllPath} has no manifest, this is no longer valid", dllFile.FullName);
continue;
}

var manifest = LocalPluginManifest.Load(manifestFile);
if (manifest == null)
{
Log.Information("Could not deserialize manifest for DLL at {DllPath}", dllFile.FullName);
Log.Error("Could not deserialize manifest for DLL at {DllPath}", dllFile.FullName);
continue;
}

Expand Down
2 changes: 1 addition & 1 deletion lib/FFXIVClientStructs
Submodule FFXIVClientStructs updated 24 files
+15 −9 7.0_changes.md
+55 −0 FFXIVClientStructs/FFXIV/Application/Network/WorkDefinitions/ClientSelectData.cs
+4 −4 FFXIVClientStructs/FFXIV/Client/Game/Character/DrawDataContainer.cs
+14 −14 FFXIVClientStructs/FFXIV/Client/Game/GcArmyManager.cs
+4 −4 FFXIVClientStructs/FFXIV/Client/Game/MirageManager.cs
+11 −11 FFXIVClientStructs/FFXIV/Client/Game/UI/Buddy.cs
+12 −10 FFXIVClientStructs/FFXIV/Client/Game/UI/Map.cs
+1 −1 FFXIVClientStructs/FFXIV/Client/Game/UI/UIState.cs
+1 −1 FFXIVClientStructs/FFXIV/Client/Graphics/Scene/Camera.cs
+1 −1 FFXIVClientStructs/FFXIV/Client/System/Resource/Handle/MaterialResourceHandle.cs
+6 −6 FFXIVClientStructs/FFXIV/Client/UI/AddonItemSearch.cs
+2 −2 FFXIVClientStructs/FFXIV/Client/UI/Agent/AgentBannerEditor.cs
+1 −1 FFXIVClientStructs/FFXIV/Client/UI/Agent/AgentItemComp.cs
+3 −59 FFXIVClientStructs/FFXIV/Client/UI/Agent/AgentLobby.cs
+1 −1 FFXIVClientStructs/FFXIV/Client/UI/Agent/AgentTryon.cs
+4 −7 FFXIVClientStructs/FFXIV/Client/UI/Info/InfoProxyInterface.cs
+2 −2 FFXIVClientStructs/FFXIV/Client/UI/Info/InfoProxyItemSearch.cs
+1 −1 FFXIVClientStructs/FFXIV/Client/UI/Misc/CharaView.cs
+2 −2 FFXIVClientStructs/FFXIV/Client/UI/Misc/RaptureGearsetModule.cs
+1 −1 FFXIVClientStructs/FFXIV/Client/UI/Misc/RaptureHotbarModule.SavedHotbar.cs
+6 −6 FFXIVClientStructs/FFXIV/Client/UI/RaptureAtkModule.cs
+30 −28 FFXIVClientStructs/FFXIV/Client/UI/UI3DModule.cs
+15 −2 ida/data.yml
+9,406 −6,151 ida/ffxiv_structs.yml

0 comments on commit 0f5cf33

Please sign in to comment.