CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/images-for-resource-page

Browse Source
This commit is contained in:
Rachel Powers
2023-05-28 12:01:49 -07:00
parent 086a7e19f0 954d4d701a
commit b28f682ad9
120 changed files with 1978 additions and 603 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
launcher/minecraft/mod/TexturePackFolderModel.cpp
View File

@ -42,7 +42,7 @@
#include "minecraft/mod/tasks/BasicFolderLoadTask.h"
#include "minecraft/mod/tasks/LocalTexturePackParseTask.h"
TexturePackFolderModel::TexturePackFolderModel(const QString& dir, std::shared_ptr<const BaseInstance> instance)
TexturePackFolderModel::TexturePackFolderModel(const QString& dir, BaseInstance* instance)
: ResourceFolderModel(QDir(dir), instance)
{
m_column_sort_keys = { SortType::ENABLED, SortType::NAME, SortType::NAME, SortType::DATE };