diff options
| author | Trial97 <alexandru.tripon97@gmail.com> | 2023-04-22 01:32:33 +0300 |
|---|---|---|
| committer | Trial97 <alexandru.tripon97@gmail.com> | 2023-04-22 01:32:33 +0300 |
| commit | 1d167f8fda8df1b0ded22b8a7dde2cb1a5612542 (patch) | |
| tree | 6ff7b6aa977c99e6740798e6d8a8c22a69d4e3d6 /launcher/ui/pages/modplatform/ShaderPackPage.cpp | |
| parent | 22bbf1bd1fb789d2542b07fc6bb4140ef7226e36 (diff) | |
| parent | 460e83207f9ae087846fc9ca210799e41f51a326 (diff) | |
| download | PrismLauncher-1d167f8fda8df1b0ded22b8a7dde2cb1a5612542.tar.gz PrismLauncher-1d167f8fda8df1b0ded22b8a7dde2cb1a5612542.tar.bz2 PrismLauncher-1d167f8fda8df1b0ded22b8a7dde2cb1a5612542.zip | |
Merge branch 'Fix_Assert' of github.com:Trial97/PrismLauncher into develop
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
Diffstat (limited to 'launcher/ui/pages/modplatform/ShaderPackPage.cpp')
| -rw-r--r-- | launcher/ui/pages/modplatform/ShaderPackPage.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/launcher/ui/pages/modplatform/ShaderPackPage.cpp b/launcher/ui/pages/modplatform/ShaderPackPage.cpp index 251c07e7..1b9b2b83 100644 --- a/launcher/ui/pages/modplatform/ShaderPackPage.cpp +++ b/launcher/ui/pages/modplatform/ShaderPackPage.cpp @@ -13,8 +13,7 @@ namespace ResourceDownload { -ShaderPackResourcePage::ShaderPackResourcePage(ShaderPackDownloadDialog* dialog, BaseInstance& instance) - : ResourcePage(dialog, instance) +ShaderPackResourcePage::ShaderPackResourcePage(ShaderPackDownloadDialog* dialog, BaseInstance& instance) : ResourcePage(dialog, instance) { connect(m_ui->searchButton, &QPushButton::clicked, this, &ShaderPackResourcePage::triggerSearch); connect(m_ui->packView, &QListView::doubleClicked, this, &ShaderPackResourcePage::onResourceSelected); @@ -38,7 +37,8 @@ QMap<QString, QString> ShaderPackResourcePage::urlHandlers() const { QMap<QString, QString> map; map.insert(QRegularExpression::anchoredPattern("(?:www\\.)?modrinth\\.com\\/shaders\\/([^\\/]+)\\/?"), "modrinth"); - map.insert(QRegularExpression::anchoredPattern("(?:www\\.)?curseforge\\.com\\/minecraft\\/customization\\/([^\\/]+)\\/?"), "curseforge"); + map.insert(QRegularExpression::anchoredPattern("(?:www\\.)?curseforge\\.com\\/minecraft\\/customization\\/([^\\/]+)\\/?"), + "curseforge"); map.insert(QRegularExpression::anchoredPattern("minecraft\\.curseforge\\.com\\/projects\\/([^\\/]+)\\/?"), "curseforge"); return map; } @@ -47,7 +47,7 @@ void ShaderPackResourcePage::addResourceToDialog(ModPlatform::IndexedPack& pack, { if (version.loaders.contains(QStringLiteral("canvas"))) version.custom_target_folder = QStringLiteral("resourcepacks"); - + m_model->addPack(pack); m_parent_dialog->addResource(pack, version); } |