mc-in-work/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2026-06-29 01:54:20 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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
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/ShaderPackFolderModel.h
View file

@ -6,7 +6,7 @@ class ShaderPackFolderModel : public ResourceFolderModel {
Q_OBJECT
public:
explicit ShaderPackFolderModel(const QString& dir, std::shared_ptr<const BaseInstance> instance)
explicit ShaderPackFolderModel(const QString& dir, BaseInstance* instance)
: ResourceFolderModel(QDir(dir), instance)
{}