Merge branch 'PrismLauncher:develop' into skinfix

2023-08-04 16:29:30 +01:00
parent d48dd7eb6a ac36a2289f
commit c5bffed21e
75 changed files with 1337 additions and 668 deletions
--- a/launcher/minecraft/MinecraftInstance.h
+++ b/launcher/minecraft/MinecraftInstance.h
@ -166,8 +166,6 @@ public:

 protected:
    QMap<QString, QString> createCensorFilterFromSession(AuthSessionPtr session);
-    QStringList validLaunchMethods();
-    QString launchMethod();

 protected: // data
    std::shared_ptr<PackProfile> m_components;