diff --git a/IPA.Loader/Loader/PluginLoader.cs b/IPA.Loader/Loader/PluginLoader.cs index e34bcb00..60bacee6 100644 --- a/IPA.Loader/Loader/PluginLoader.cs +++ b/IPA.Loader/Loader/PluginLoader.cs @@ -978,9 +978,11 @@ namespace IPA.Loader foreach (var conflict in plugin.Manifest.Conflicts) { Logger.loader.Trace($">- Checking conflict '{conflict.Key}' {conflict.Value}"); - if (TryResolveId(conflict.Key, out var meta, out var conflDisabled, out var conflIgnored) && !conflIgnored && !conflDisabled) + if (TryResolveId(conflict.Key, out var meta, out var conflDisabled, out var conflIgnored) + && conflict.Value.IsSatisfied(meta.Version) + && !conflIgnored && !conflDisabled) // the conflict is only *actually* a problem if it is both not ignored and not disabled { - // the conflict is only *actually* a problem if it is both not ignored and not disabled + Logger.loader.Warn($"Plugin '{plugin.Id}' conflicts with {meta.Id}@{meta.Version}; ignoring '{plugin.Id}'"); ignoredPlugins.Add(plugin, new(Reason.Conflict) {