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

Merge branch 'master' into api4-b

Browse source 
# Conflicts:
#	Penumbra/Interop/GameResourceManagement.cs
#	Penumbra/Penumbra.cs
#	Penumbra/Penumbra.csproj
This commit is contained in:
Ottermandias 2021-09-01 21:40:02 +02:00
commit 34b21c2fde
8 changed files with 164 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Penumbra/UI/SettingsMenu.cs
View file

@ -80,6 +80,7 @@ namespace Penumbra.UI
if( DebugTabVisible )
{
_base.DrawDebugTab();
_base.DrawResourceManagerTab();
}
ImGui.EndTabBar();
@ -87,4 +88,4 @@ namespace Penumbra.UI
}
}
}
}
}