diff options
| author | TheKodeToad <TheKodeToad@proton.me> | 2023-06-14 20:05:02 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-14 20:05:02 +0100 |
| commit | 3526d00a2330aad7d01f345816505c4d1cd5b096 (patch) | |
| tree | 31b34c829f21ef6f49bc3dda6bd1fc6b55ac7029 /launcher/minecraft/mod/ResourcePackFolderModel.cpp | |
| parent | 79ce7eb1fc9351e689e7106e3dc3a641d9614c9a (diff) | |
| parent | a4502f44c291fad2174e84bf883cdb754aa08e28 (diff) | |
| download | PrismLauncher-3526d00a2330aad7d01f345816505c4d1cd5b096.tar.gz PrismLauncher-3526d00a2330aad7d01f345816505c4d1cd5b096.tar.bz2 PrismLauncher-3526d00a2330aad7d01f345816505c4d1cd5b096.zip | |
Merge branch 'develop' into feat/dont-hide-settings
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
Diffstat (limited to 'launcher/minecraft/mod/ResourcePackFolderModel.cpp')
| -rw-r--r-- | launcher/minecraft/mod/ResourcePackFolderModel.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/launcher/minecraft/mod/ResourcePackFolderModel.cpp b/launcher/minecraft/mod/ResourcePackFolderModel.cpp index 6eba4e2e..c12d1f23 100644 --- a/launcher/minecraft/mod/ResourcePackFolderModel.cpp +++ b/launcher/minecraft/mod/ResourcePackFolderModel.cpp @@ -45,7 +45,7 @@ #include "minecraft/mod/tasks/BasicFolderLoadTask.h" #include "minecraft/mod/tasks/LocalResourcePackParseTask.h" -ResourcePackFolderModel::ResourcePackFolderModel(const QString& dir, std::shared_ptr<const BaseInstance> instance) +ResourcePackFolderModel::ResourcePackFolderModel(const QString& dir, BaseInstance* instance) : ResourceFolderModel(QDir(dir), instance) { m_column_sort_keys = { SortType::ENABLED, SortType::NAME, SortType::PACK_FORMAT, SortType::DATE }; |