mc-in-work/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2026-07-01 10:56:57 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
This commit is contained in:
TheKodeToad 2023-11-12 19:02:14 +00:00
commit f4940e26c6
No known key found for this signature in database
GPG key ID: 5E39D70B4C93C38E
313 changed files with 14697 additions and 2921 deletions
Download patch file Download diff file Expand all files Collapse all files

2
launcher/minecraft/mod/tasks/ResourceFolderLoadTask.cpp
View file

@ -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);