diff options
| author | Sefa Eyeoglu <contact@scrumplex.net> | 2023-01-16 10:04:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-16 10:04:09 +0100 |
| commit | 1a35fec1341323950eb5cb4ee1d2791b2241db67 (patch) | |
| tree | d435ef97651840f92f7b382121064a79ab816450 /launcher/minecraft/mod/tasks/LocalDataPackParseTask.cpp | |
| parent | f1247d2224e2ca81076d52fe53f0ddb0382713fd (diff) | |
| parent | f7b0ba88da5895a48e9d5f1adda223a8fb0f4c32 (diff) | |
| download | PrismLauncher-1a35fec1341323950eb5cb4ee1d2791b2241db67.tar.gz PrismLauncher-1a35fec1341323950eb5cb4ee1d2791b2241db67.tar.bz2 PrismLauncher-1a35fec1341323950eb5cb4ee1d2791b2241db67.zip | |
Merge pull request #696 from Ryex/import-all-the-things
Fixes https://github.com/PrismLauncher/PrismLauncher/issues/581
Fixes https://github.com/PrismLauncher/PrismLauncher/issues/700
Diffstat (limited to 'launcher/minecraft/mod/tasks/LocalDataPackParseTask.cpp')
| -rw-r--r-- | launcher/minecraft/mod/tasks/LocalDataPackParseTask.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/launcher/minecraft/mod/tasks/LocalDataPackParseTask.cpp b/launcher/minecraft/mod/tasks/LocalDataPackParseTask.cpp index 3fcb2110..5bb44877 100644 --- a/launcher/minecraft/mod/tasks/LocalDataPackParseTask.cpp +++ b/launcher/minecraft/mod/tasks/LocalDataPackParseTask.cpp @@ -50,7 +50,7 @@ bool processFolder(DataPack& pack, ProcessingLevel level) Q_ASSERT(pack.type() == ResourceType::FOLDER); auto mcmeta_invalid = [&pack]() { - qWarning() << "Resource pack at" << pack.fileinfo().filePath() << "does not have a valid pack.mcmeta"; + qWarning() << "Data pack at" << pack.fileinfo().filePath() << "does not have a valid pack.mcmeta"; return false; // the mcmeta is not optional }; @@ -95,7 +95,7 @@ bool processZIP(DataPack& pack, ProcessingLevel level) QuaZipFile file(&zip); auto mcmeta_invalid = [&pack]() { - qWarning() << "Resource pack at" << pack.fileinfo().filePath() << "does not have a valid pack.mcmeta"; + qWarning() << "Data pack at" << pack.fileinfo().filePath() << "does not have a valid pack.mcmeta"; return false; // the mcmeta is not optional }; |