Merge branch 'develop' into feat/acknowledge_release_type

Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
This commit is contained in:
Alexandru Ionut Tripon
2023-08-12 12:42:30 +03:00
committed by GitHub
721 changed files with 21136 additions and 19041 deletions

View File

@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-3.0-only
/*
* PolyMC - Minecraft Launcher
* Prism Launcher - Minecraft Launcher
* Copyright (c) 2022 flowln <flowlnlnln@gmail.com>
*
* This program is free software: you can redistribute it and/or modify
@ -76,7 +76,6 @@ struct ModpackExtra {
QString discordUrl;
QList<DonationData> donate;
};
struct ModpackVersion {
@ -100,10 +99,10 @@ struct Modpack {
QString description;
std::tuple<QString, QUrl> author;
QString iconName;
QUrl iconUrl;
QUrl iconUrl;
bool versionsLoaded = false;
bool extraInfoLoaded = false;
bool versionsLoaded = false;
bool extraInfoLoaded = false;
ModpackExtra extra;
QVector<ModpackVersion> versions;
@ -116,7 +115,7 @@ auto loadIndexedVersion(QJsonObject&) -> ModpackVersion;
auto validateDownloadUrl(QUrl) -> bool;
}
} // namespace Modrinth
Q_DECLARE_METATYPE(Modrinth::Modpack)
Q_DECLARE_METATYPE(Modrinth::ModpackVersion)