Merge branch 'develop' into curseforge-url-handle

This commit is contained in:
Rachel Powers
2023-05-28 11:25:58 -07:00
279 changed files with 7065 additions and 4476 deletions

View File

@ -1,7 +1,8 @@
// SPDX-License-Identifier: GPL-3.0-only
/*
* PolyMC - Minecraft Launcher
* Prism Launcher - Minecraft Launcher
* Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
* Copyright (C) 2023 TheKodeToad <TheKodeToad@proton.me>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -112,6 +113,8 @@ private slots:
void on_actionViewInstanceFolder_triggered();
void on_actionViewLauncherRootFolder_triggered();
void on_actionViewSelectedInstFolder_triggered();
void refreshInstances();
@ -151,7 +154,10 @@ private slots:
void deleteGroup();
void undoTrashInstance();
void on_actionExportInstance_triggered();
inline void on_actionExportInstance_triggered() { on_actionExportInstanceZip_triggered(); }
void on_actionExportInstanceZip_triggered();
void on_actionExportInstanceMrPack_triggered();
void on_actionExportInstanceFlamePack_triggered();
void on_actionRenameInstance_triggered();