Merge branch 'main' into rework

# Conflicts:
#	Glamourer.zip
#	Glamourer/Glamourer.csproj
#	Glamourer/Gui/InterfaceEquipment.cs
This commit is contained in:
Ottermandias 2023-01-19 16:25:23 +01:00
commit 9c6256bf1b
3 changed files with 4 additions and 4 deletions

View file

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