Merge branch 'develop' into icon-indexing

Signed-off-by: Tayou <31988415+TayouVR@users.noreply.github.com>

1 files changed, 5 insertions, 8 deletions

diff --git a/launcher/minecraft/mod/tasks/LocalTexturePackParseTask.cpp b/launcher/minecraft/mod/tasks/LocalTexturePackParseTask.cpp
index a72e8115..887a1062 100644
--- a/launcher/minecraft/mod/tasks/LocalTexturePackParseTask.cpp
+++ b/launcher/minecraft/mod/tasks/LocalTexturePackParseTask.cpp
@@ -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>
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *
@@ -161,15 +161,14 @@ bool processPackPNG(const TexturePack& pack, QByteArray&& raw_data)
 }
 
 bool processPackPNG(const TexturePack& pack)
-{   
+{
     auto png_invalid = [&pack]() {
         qWarning() << "Texture pack at" << pack.fileinfo().filePath() << "does not have a valid pack.png";
         return false;
     };
 
     switch (pack.type()) {
-        case ResourceType::FOLDER: 
-        {
+        case ResourceType::FOLDER: {
             QFileInfo image_file_info(FS::PathCombine(pack.fileinfo().filePath(), "pack.png"));
             if (image_file_info.exists() && image_file_info.isFile()) {
                 QFile pack_png_file(image_file_info.filePath());
@@ -188,8 +187,7 @@ bool processPackPNG(const TexturePack& pack)
                 return png_invalid();  // pack.png does not exists or is not a valid file.
             }
         }
-        case ResourceType::ZIPFILE:
-        {
+        case ResourceType::ZIPFILE: {
             Q_ASSERT(pack.type() == ResourceType::ZIPFILE);
 
             QuaZip zip(pack.fileinfo().filePath());
@@ -232,8 +230,7 @@ bool validate(QFileInfo file)
 
 }  // namespace TexturePackUtils
 
-LocalTexturePackParseTask::LocalTexturePackParseTask(int token, TexturePack& rp)
-    : Task(nullptr, false), m_token(token), m_texture_pack(rp)
+LocalTexturePackParseTask::LocalTexturePackParseTask(int token, TexturePack& rp) : Task(nullptr, false), m_token(token), m_texture_pack(rp)
 {}
 
 bool LocalTexturePackParseTask::abort()