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,8 +5,8 @@
<PlatformTarget>x64</PlatformTarget>
<RootNamespace>Glamourer</RootNamespace>
<AssemblyName>Glamourer</AssemblyName>
<FileVersion>0.1.0.5</FileVersion>
<AssemblyVersion>0.1.0.5</AssemblyVersion>
<FileVersion>0.2.0.0</FileVersion>
<AssemblyVersion>0.2.0.0</AssemblyVersion>
<Company>SoftOtter</Company>
<Product>Glamourer</Product>
<Copyright>Copyright © 2020</Copyright>

View file

@ -5,10 +5,10 @@
"Description": "Adds functionality to change and store appearance of players, customization and equip. Requires Penumbra to be installed and activated to work. Can also add preview options to the Changed Items tab for Penumbra.",
"Tags": [ "Appearance", "Glamour", "Race", "Outfit", "Armor", "Clothes", "Skins", "Customization", "Design", "Character" ],
"InternalName": "Glamourer",
"AssemblyVersion": "0.1.0.5",
"AssemblyVersion": "0.1.1.0",
"RepoUrl": "https://github.com/Ottermandias/Glamourer",
"ApplicableVersion": "any",
"DalamudApiLevel": 6,
"DalamudApiLevel": 7,
"ImageUrls": null,
"IconUrl": "https://raw.githubusercontent.com/Ottermandias/Glamourer/master/images/icon.png"
}

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;