ToxicMushroom/Penumbra
1
0
Fork 0
mirror of https://github.com/xivdev/Penumbra.git synced 2025-12-15 05:04:15 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/master' into services

Browse source
This commit is contained in:
Ottermandias 2023-04-12 16:11:15 +02:00
commit a88332d3bc
3 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Penumbra/Mods/Mod.Files.cs
View file

@ -40,7 +40,9 @@ public partial class Mod
{ {
var modFiles = AllFiles.ToHashSet(); var modFiles = AllFiles.ToHashSet();
return ModPath.EnumerateDirectories() return ModPath.EnumerateDirectories()
.Where(d => !d.Attributes.HasFlag( FileAttributes.Hidden ) )
.SelectMany(f => f.EnumerateFiles("*", SearchOption.AllDirectories)) .SelectMany(f => f.EnumerateFiles("*", SearchOption.AllDirectories))
.Where( f => !f.Attributes.HasFlag( FileAttributes.Hidden ) )
.Select(f => new FullPath(f)) .Select(f => new FullPath(f))
.Where(f => !modFiles.Contains(f)) .Where(f => !modFiles.Contains(f))
.ToList(); .ToList();

5
Penumbra/UI/AdvancedWindow/ItemSwapTab.cs
View file

@ -771,9 +771,10 @@ public class ItemSwapTab : IDisposable, ITab
private void OnModOptionChange(ModOptionChangeType type, Mod mod, int a, int b, int c) private void OnModOptionChange(ModOptionChangeType type, Mod mod, int a, int b, int c)
{ {
if (type is ModOptionChangeType.PrepareChange || mod != _mod) if (type is ModOptionChangeType.PrepareChange or ModOptionChangeType.GroupAdded or ModOptionChangeType.OptionAdded || mod != _mod)
return; return;
_swapData.LoadMod(_mod, _modSettings); _swapData.LoadMod(_mod, _modSettings);
UpdateOption();
_dirty = true; _dirty = true;
} }
} }

10
repo.json
View file

@ -4,8 +4,8 @@
"Name": "Penumbra", "Name": "Penumbra",
"Description": "Runtime mod loader and manager.", "Description": "Runtime mod loader and manager.",
"InternalName": "Penumbra", "InternalName": "Penumbra",
"AssemblyVersion": "0.6.6.4", "AssemblyVersion": "0.6.6.5",
"TestingAssemblyVersion": "0.6.6.4", "TestingAssemblyVersion": "0.6.6.5",
"RepoUrl": "https://github.com/xivdev/Penumbra", "RepoUrl": "https://github.com/xivdev/Penumbra",
"ApplicableVersion": "any", "ApplicableVersion": "any",
"DalamudApiLevel": 8, "DalamudApiLevel": 8,
@ -16,9 +16,9 @@
"LoadPriority": 69420, "LoadPriority": 69420,
"LoadRequiredState": 2, "LoadRequiredState": 2,
"LoadSync": true, "LoadSync": true,
"DownloadLinkInstall": "https://github.com/xivdev/Penumbra/releases/download/0.6.6.4/Penumbra.zip", "DownloadLinkInstall": "https://github.com/xivdev/Penumbra/releases/download/0.6.6.5/Penumbra.zip",
"DownloadLinkTesting": "https://github.com/xivdev/Penumbra/releases/download/0.6.6.4/Penumbra.zip", "DownloadLinkTesting": "https://github.com/xivdev/Penumbra/releases/download/0.6.6.5/Penumbra.zip",
"DownloadLinkUpdate": "https://github.com/xivdev/Penumbra/releases/download/0.6.6.4/Penumbra.zip", "DownloadLinkUpdate": "https://github.com/xivdev/Penumbra/releases/download/0.6.6.5/Penumbra.zip",
"IconUrl": "https://raw.githubusercontent.com/xivdev/Penumbra/master/images/icon.png" "IconUrl": "https://raw.githubusercontent.com/xivdev/Penumbra/master/images/icon.png"
} }
] ]