ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-28 19:39:19 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'refs/heads/master' into apiX

Browse source 
# Conflicts:
#	Dalamud/Game/Libc/LibcFunction.cs
#	Dalamud/Game/Libc/LibcFunctionAddressResolver.cs
#	Dalamud/Game/Libc/OwnedStdString.cs
#	Dalamud/Game/Libc/StdString.cs
#	Dalamud/Interface/UiBuilder.cs
This commit is contained in:
Kaz Wolfe 2024-04-28 11:54:54 -07:00
commit b32ed39826
No known key found for this signature in database
GPG key ID: 258813F53A16EBB4
297 changed files with 768 additions and 543 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Dalamud/Interface/Internal/Windows/PluginInstaller/DalamudChangelog.cs
View file

@ -1,5 +1,4 @@
using System;
using System.Collections.Generic;
using System.Collections.Generic;
namespace Dalamud.Interface.Internal.Windows.PluginInstaller;

4
Dalamud/Interface/Internal/Windows/PluginInstaller/DalamudChangelogEntry.cs
View file

@ -1,6 +1,4 @@
using System;
namespace Dalamud.Interface.Internal.Windows.PluginInstaller;
namespace Dalamud.Interface.Internal.Windows.PluginInstaller;
/// <summary>
/// Class representing a Dalamud changelog.

3
Dalamud/Interface/Internal/Windows/PluginInstaller/DalamudChangelogManager.cs
View file

@ -1,5 +1,4 @@
using System;
using System.Collections.Generic;
using System.Collections.Generic;
using System.Linq;
using System.Net.Http.Json;
using System.Threading.Tasks;

4
Dalamud/Interface/Internal/Windows/PluginInstaller/IChangelogEntry.cs
View file

@ -1,6 +1,4 @@
using System;
namespace Dalamud.Interface.Internal.Windows.PluginInstaller;
namespace Dalamud.Interface.Internal.Windows.PluginInstaller;
/// <summary>
/// Class representing a changelog entry.

10
Dalamud/Interface/Internal/Windows/PluginInstaller/PluginInstallerWindow.cs
View file

@ -2099,7 +2099,8 @@ internal class PluginInstallerWindow : Window, IDisposable
var useTesting = pluginManager.UseTesting(manifest);
var wasSeen = this.WasPluginSeen(manifest.InternalName);
var isOutdated = manifest.DalamudApiLevel < PluginManager.DalamudApiLevel;
var effectiveApiLevel = useTesting && manifest.TestingDalamudApiLevel != null ? manifest.TestingDalamudApiLevel.Value : manifest.DalamudApiLevel;
var isOutdated = effectiveApiLevel < PluginManager.DalamudApiLevel;
// Check for valid versions
if ((useTesting && manifest.TestingAssemblyVersion == null) || manifest.AssemblyVersion == null)
@ -2421,7 +2422,8 @@ internal class PluginInstallerWindow : Window, IDisposable
var canFeedback = !isThirdParty &&
!plugin.IsDev &&
!plugin.IsOrphaned &&
plugin.Manifest.DalamudApiLevel == PluginManager.DalamudApiLevel &&
(plugin.Manifest.DalamudApiLevel == PluginManager.DalamudApiLevel
|| plugin.Manifest.TestingDalamudApiLevel == PluginManager.DalamudApiLevel) &&
acceptsFeedback &&
availablePluginUpdate == default;
@ -3323,7 +3325,9 @@ internal class PluginInstallerWindow : Window, IDisposable
var searchString = this.searchText.ToLowerInvariant();
var matcher = new FuzzyMatcher(searchString, MatchMode.FuzzyParts);
var hasSearchString = !string.IsNullOrWhiteSpace(this.searchText);
var oldApi = manifest.DalamudApiLevel < PluginManager.DalamudApiLevel;
var oldApi = (manifest.TestingDalamudApiLevel == null
|| manifest.TestingDalamudApiLevel < PluginManager.DalamudApiLevel)
&& manifest.DalamudApiLevel < PluginManager.DalamudApiLevel;
var installed = this.IsManifestInstalled(manifest).IsInstalled;
if (oldApi && !hasSearchString && !installed)

3
Dalamud/Interface/Internal/Windows/PluginInstaller/ProfileManagerWidget.cs
View file

@ -1,5 +1,4 @@
using System;
using System.Linq;
using System.Linq;
using System.Numerics;
using System.Threading.Tasks;