ToxicMushroom/Glamourer
1
0
Fork 0
mirror of https://github.com/Ottermandias/Glamourer.git synced 2026-02-18 21:47:44 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'main' into rework

Browse source 
# Conflicts:
#	Glamourer.GameData/Customization/CustomizationOptions.cs
#	Glamourer.GameData/Util/IconStorage.cs
#	Glamourer/Api/PenumbraAttach.cs
#	Glamourer/CharacterSave.cs
#	Glamourer/Designs/DesignManager.cs
#	Glamourer/Designs/FixedDesigns.cs
#	Glamourer/Glamourer.csproj
#	Glamourer/Gui/Interface.cs
#	Glamourer/Gui/InterfaceDesigns.cs
#	Glamourer/Gui/InterfaceEquipment.cs
#	Glamourer/Offsets.cs
#	Penumbra.PlayerWatch/Penumbra.PlayerWatch.csproj
This commit is contained in:
Ottermandias 2023-01-12 14:57:17 +01:00
commit b2cede67b8
7 changed files with 39 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Glamourer/Gui/InterfaceDesigns.cs
View file

@ -57,7 +57,7 @@ namespace Glamourer.Gui;
//
// try
// {
// _selection!.Data = CharacterSave.FromString(text);
// _selection!.Data.Load(text, out _);
// _designs.SaveToFile();
// }
// catch (Exception e)

2
Glamourer/Gui/InterfaceEquipment.cs
View file

@ -106,7 +106,7 @@ namespace Glamourer.Gui;
// {
// 0 => SmallClothes,
// 9903 => SmallClothesNpc,
// _ => _identifier.Identify(set, weapon, variant, slot) ?? Unknown,
// _ => _identifier.Identify(set, weapon, variant, slot).FirstOrDefault() ?? Unknown,
// };
// }
//