Merge branch 'main' into rework

# Conflicts:
#	Glamourer.GameData/CharacterEquipExtensions.cs
#	Glamourer.GameData/Customization/CharaMakeParams.cs
#	Glamourer.GameData/Customization/CharacterCustomization.cs
#	Glamourer.GameData/GameData.cs
#	Glamourer.GameData/Glamourer.GameData.csproj
#	Glamourer.sln
#	Glamourer.zip
#	Glamourer/CharacterSave.cs
#	Glamourer/Glamourer.cs
#	Glamourer/Glamourer.csproj
#	Glamourer/Gui/Interface.cs
#	Glamourer/Offsets.cs
This commit is contained in:
Ottermandias 2022-08-25 13:39:12 +02:00
commit d70bc675f2
12 changed files with 724 additions and 12 deletions

View file

@ -5,6 +5,7 @@ using Lumina.Text;
using OtterGui;
using Penumbra.GameData.Enums;
using Penumbra.GameData.Structs;
using Penumbra.PlayerWatch;
namespace Glamourer.Gui;