Ottermandias f2f16c664c Merge branch 'main' into rework ... # Conflicts: # Glamourer.GameData/CharacterEquipExtensions.cs # Glamourer.GameData/Customization/CharacterCustomization.cs # Glamourer.GameData/Customization/CustomizationOptions.cs # Glamourer.GameData/GameData.cs # Glamourer.zip # Glamourer/Glamourer.csproj # Glamourer/GlamourerConfig.cs # Glamourer/Gui/InterfaceActorPanel.cs # Glamourer/Gui/InterfaceConfig.cs # Glamourer/Gui/InterfaceEquipment.cs # Glamourer/Gui/InterfaceFixedDesigns.cs # Penumbra.PlayerWatch/CharacterEquipment.cs # Penumbra.PlayerWatch/Penumbra.PlayerWatch.csproj		2023-06-12 16:35:21 +02:00
..
CharacterExtensions.cs	Merge branch 'main' into rework	2023-06-12 16:35:21 +02:00
CustomizeExtensions.cs	.	2023-06-09 17:57:40 +02:00