Merge remote-tracking branch 'upstream/develop' into resource-meta

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-11-12 19:02:14 +00:00
parent 179abfa03e 913d81e371
commit f4940e26c6
313 changed files with 14697 additions and 2921 deletions
--- a/launcher/minecraft/mod/tasks/ResourceFolderLoadTask.cpp
+++ b/launcher/minecraft/mod/tasks/ResourceFolderLoadTask.cpp
@@ -127,7 +127,7 @@ void ResourceFolderLoadTask::getFromMetadata()
        auto metadata = Metadata::get(m_index_dir, entry);

        if (!metadata.isValid())
-            return;
+            continue;

        auto* resource = m_create_func(QFileInfo(m_resource_dir.filePath(metadata.filename)));
        resource->setMetadata(metadata);