Merge branch 'Ottermandias:main' into main

This commit is contained in:
Anya 2024-11-01 12:44:44 +01:00 committed by GitHub
commit 3fda370b54
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 19 additions and 7 deletions

View file

@ -1,5 +1,4 @@
using Dalamud.Interface.Textures;
using Dalamud.Interface.Textures.TextureWraps;
using Dalamud.Plugin.Services;
using OtterGui.Classes;
using OtterGui.Services;

View file

@ -84,9 +84,13 @@ internal class CustomizeSetFactory(
CustomizeIndex.TattooColor,
CustomizeIndex.EyeColorLeft,
CustomizeIndex.EyeColorRight,
CustomizeIndex.TailShape,
};
var npcCustomizations = new HashSet<(CustomizeIndex, CustomizeValue)>();
var npcCustomizations = new HashSet<(CustomizeIndex, CustomizeValue)>()
{
(CustomizeIndex.Height, CustomizeValue.Max),
};
_npcCustomizeSet.Awaiter.Wait();
foreach (var customize in _npcCustomizeSet.Select(s => s.Customize)
.Where(c => c.Clan == race && c.Gender == gender && c.BodyType.Value == 1))

View file

@ -36,6 +36,7 @@ public class GlamourerChangelog
Add1_2_3_0(Changelog);
Add1_3_1_0(Changelog);
Add1_3_2_0(Changelog);
Add1_3_3_0(Changelog);
}
private (int, ChangeLogDisplayType) ConfigData()
@ -56,6 +57,14 @@ public class GlamourerChangelog
}
}
private static void Add1_3_3_0(Changelog log)
=> log.NextVersion("Version 1.3.3.0")
.RegisterHighlight("Added the option to create automations for owned human NPCs (like trust avatars).")
.RegisterEntry("Added some special filters to the Actors tab selector, hover over it to see the options.")
.RegisterEntry("Added an option for designs to always reset all previously applied advanced dyes.")
.RegisterEntry("Added some new NPC-only customizations to the valid customizations.")
.RegisterEntry("Reworked quite a bit of things around face wear / bonus items. Please let me know if anything broke.");
private static void Add1_3_2_0(Changelog log)
=> log.NextVersion("Version 1.3.2.0")
.RegisterEntry("Fixed an issue with weapon hiding when leaving GPose or changing zones.")

View file

@ -17,8 +17,8 @@
"Character"
],
"InternalName": "Glamourer",
"AssemblyVersion": "1.3.2.0",
"TestingAssemblyVersion": "1.3.2.2",
"AssemblyVersion": "1.3.3.0",
"TestingAssemblyVersion": "1.3.3.0",
"RepoUrl": "https://github.com/Ottermandias/Glamourer",
"ApplicableVersion": "any",
"DalamudApiLevel": 10,
@ -27,9 +27,9 @@
"IsTestingExclusive": "False",
"DownloadCount": 1,
"LastUpdate": 1618608322,
"DownloadLinkInstall": "https://github.com/Ottermandias/Glamourer/releases/download/1.3.2.0/Glamourer.zip",
"DownloadLinkUpdate": "https://github.com/Ottermandias/Glamourer/releases/download/1.3.2.0/Glamourer.zip",
"DownloadLinkTesting": "https://github.com/Ottermandias/Glamourer/releases/download/testing_1.3.2.2/Glamourer.zip",
"DownloadLinkInstall": "https://github.com/Ottermandias/Glamourer/releases/download/1.3.3.0/Glamourer.zip",
"DownloadLinkUpdate": "https://github.com/Ottermandias/Glamourer/releases/download/1.3.3.0/Glamourer.zip",
"DownloadLinkTesting": "https://github.com/Ottermandias/Glamourer/releases/download/1.3.3.0/Glamourer.zip",
"IconUrl": "https://raw.githubusercontent.com/Ottermandias/Glamourer/main/images/icon.png"
}
]