Merge remote-tracking branch 'upstream/develop' into data-packs

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
This commit is contained in:
TheKodeToad 2025-04-29 09:15:11 +01:00
commit fadbcf2d04
No known key found for this signature in database
GPG key ID: 5E39D70B4C93C38E
279 changed files with 9562 additions and 2103 deletions

View file

@ -69,7 +69,7 @@ class FlameTexturePackModel : public TexturePackResourceModel {
void loadIndexedPackVersions(ModPlatform::IndexedPack& m, QJsonArray& arr) override;
ResourceAPI::SearchArgs createSearchArguments() override;
ResourceAPI::VersionSearchArgs createVersionsArguments(QModelIndex&) override;
ResourceAPI::VersionSearchArgs createVersionsArguments(const QModelIndex&) override;
auto documentToArray(QJsonDocument& obj) const -> QJsonArray override;
};