diff options
| author | Trial97 <alexandru.tripon97@gmail.com> | 2023-07-09 19:38:17 +0300 |
|---|---|---|
| committer | Trial97 <alexandru.tripon97@gmail.com> | 2023-07-09 19:38:17 +0300 |
| commit | d7f4e40f85d1e253fe62e1c9e1cfb1842ffb0c86 (patch) | |
| tree | 9348d96110913ec2916e0854d5e495e33e1c9352 /launcher/modplatform | |
| parent | 908ac813e0f96126a643851e99379956faa08cda (diff) | |
| parent | 67d473aab773e7f94c394ebdde05581dc8f805de (diff) | |
| download | PrismLauncher-d7f4e40f85d1e253fe62e1c9e1cfb1842ffb0c86.tar.gz PrismLauncher-d7f4e40f85d1e253fe62e1c9e1cfb1842ffb0c86.tar.bz2 PrismLauncher-d7f4e40f85d1e253fe62e1c9e1cfb1842ffb0c86.zip | |
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into curse
Diffstat (limited to 'launcher/modplatform')
| -rw-r--r-- | launcher/modplatform/ModIndex.h | 1 | ||||
| -rw-r--r-- | launcher/modplatform/flame/FlameInstanceCreationTask.cpp | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/launcher/modplatform/ModIndex.h b/launcher/modplatform/ModIndex.h index 773ee934..2aa91602 100644 --- a/launcher/modplatform/ModIndex.h +++ b/launcher/modplatform/ModIndex.h @@ -145,6 +145,7 @@ inline auto getOverrideDeps() -> QList<OverrideDep> { "qvIfYCYJ", "P7dR8mSH", "API", ModPlatform::ResourceProvider::MODRINTH }, { "lwVhp9o5", "Ha28R6CL", "KotlinLibraries", ModPlatform::ResourceProvider::MODRINTH } }; }; +QString getMetaURL(ResourceProvider provider, QVariant projectID); } // namespace ModPlatform diff --git a/launcher/modplatform/flame/FlameInstanceCreationTask.cpp b/launcher/modplatform/flame/FlameInstanceCreationTask.cpp index f003ada9..e7641d64 100644 --- a/launcher/modplatform/flame/FlameInstanceCreationTask.cpp +++ b/launcher/modplatform/flame/FlameInstanceCreationTask.cpp @@ -470,8 +470,9 @@ void FlameCreationTask::setupDownloadJob(QEventLoop& loop) switch (result.type) { case Flame::File::Type::Folder: { logWarning(tr("This 'Folder' may need extracting: %1").arg(relpath)); - // fall-through intentional, we treat these as plain old mods and dump them wherever. + // fallthrough intentional, we treat these as plain old mods and dump them wherever. } + /* fallthrough */ case Flame::File::Type::SingleFile: case Flame::File::Type::Mod: { if (!result.url.isEmpty()) { |