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

Merge branch 'master' into editor-highlight-player-paths

Browse source
This commit is contained in:
Ottermandias 2023-11-29 17:29:09 +01:00
commit b3c757c37b
3 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
OtterGui

@ -1 +1 @@
Subproject commit b09bbcc276363bc994d90b641871e6280898b6e5 Subproject commit 3e2d4ae934694918d312280d62127cf1a55b03e4

2
Penumbra/Interop/ResourceLoading/TexMdlService.cs
View file

@ -8,7 +8,7 @@ using Penumbra.String.Classes;
namespace Penumbra.Interop.ResourceLoading; namespace Penumbra.Interop.ResourceLoading;
public unsafe class TexMdlService public unsafe class TexMdlService : IDisposable
{ {
/// <summary> Custom ulong flag to signal our files as opposed to SE files. </summary> /// <summary> Custom ulong flag to signal our files as opposed to SE files. </summary>
public static readonly IntPtr CustomFileFlag = new(0xDEADBEEF); public static readonly IntPtr CustomFileFlag = new(0xDEADBEEF);

1
Penumbra/Penumbra.cs
View file

@ -85,6 +85,7 @@ public class Penumbra : IDalamudPlugin
_services.GetRequiredService<SkinFixer>(); _services.GetRequiredService<SkinFixer>();
_services.GetRequiredService<DalamudSubstitutionProvider>(); // Initialize before Interface.
SetupInterface(); SetupInterface();
SetupApi(); SetupApi();