Merge pull request #1320 from TheKodeToad/better-launch

Combine launch buttons in instance window, persist profiler
2023-08-19 11:08:02 +01:00
parent 3098aecf97 acf586ef82
commit f99b04bd16
14 changed files with 126 additions and 214 deletions
--- a/launcher/Application.h
+++ b/launcher/Application.h
@ -195,7 +195,6 @@ class Application : public QApplication {
    bool launch(InstancePtr instance,
                bool online = true,
                bool demo = false,
-                BaseProfilerFactory* profiler = nullptr,
                MinecraftServerTargetPtr serverToJoin = nullptr,
                MinecraftAccountPtr accountToUse = nullptr);
    bool kill(InstancePtr instance);