diff options
author | Sefa Eyeoglu <contact@scrumplex.net> | 2023-08-06 21:54:00 +0200 |
---|---|---|
committer | Sefa Eyeoglu <contact@scrumplex.net> | 2023-08-06 21:54:00 +0200 |
commit | 74fe2fb2a6282a9292cc912b865ce0179dbc3412 (patch) | |
tree | d006abece962a65d3538b9b0d8f4e3d264d59eca /launcher/minecraft/mod/tasks/LocalResourceParse.cpp | |
parent | a83e5be8f2acd66f83ad181e54fe688ed08c1b6f (diff) | |
parent | efaf4024ab22a53a3ef05f0a41b746b7561e087c (diff) | |
download | PrismLauncher-74fe2fb2a6282a9292cc912b865ce0179dbc3412.tar.gz PrismLauncher-74fe2fb2a6282a9292cc912b865ce0179dbc3412.tar.bz2 PrismLauncher-74fe2fb2a6282a9292cc912b865ce0179dbc3412.zip |
Merge remote-tracking branch 'upstream/staging' into curseforge-url-handle
Diffstat (limited to 'launcher/minecraft/mod/tasks/LocalResourceParse.cpp')
-rw-r--r-- | launcher/minecraft/mod/tasks/LocalResourceParse.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/launcher/minecraft/mod/tasks/LocalResourceParse.cpp b/launcher/minecraft/mod/tasks/LocalResourceParse.cpp index fa7d7f4a..0894049c 100644 --- a/launcher/minecraft/mod/tasks/LocalResourceParse.cpp +++ b/launcher/minecraft/mod/tasks/LocalResourceParse.cpp @@ -44,7 +44,8 @@ static const QMap<PackedResourceType, QString> s_packed_type_names = { namespace ResourceUtils { PackedResourceType identify(QFileInfo file){ if (file.exists() && file.isFile()) { - if (ModUtils::validate(file)) { // Mods can also contain resource and data packs + if (ModUtils::validate(file)) { + // mods can contain resource and data packs so they must be tested first qDebug() << file.fileName() << "is a mod"; return PackedResourceType::Mod; } else if (ResourcePackUtils::validate(file)) { |