diff options
| author | Petr Mrázek <peterix@gmail.com> | 2013-12-13 02:47:59 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2013-12-13 02:47:59 +0100 |
| commit | 39aebddf3b6b93091aa8494f74690b4a819593d1 (patch) | |
| tree | 824e2bd5a4a3c67118982d9a13bdd73914501741 /MultiMC.cpp | |
| parent | bf34aa7fbd87eb5e21bc1bb69fc3f53c2c92d8fd (diff) | |
| download | MultiMC-39aebddf3b6b93091aa8494f74690b4a819593d1.tar MultiMC-39aebddf3b6b93091aa8494f74690b4a819593d1.tar.gz MultiMC-39aebddf3b6b93091aa8494f74690b4a819593d1.tar.lz MultiMC-39aebddf3b6b93091aa8494f74690b4a819593d1.tar.xz MultiMC-39aebddf3b6b93091aa8494f74690b4a819593d1.zip | |
Add support for 1.7.4 user_type (needs testing with legacy accounts)
Diffstat (limited to 'MultiMC.cpp')
| -rw-r--r-- | MultiMC.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/MultiMC.cpp b/MultiMC.cpp index 6c88a6be..2c9e74dd 100644 --- a/MultiMC.cpp +++ b/MultiMC.cpp @@ -12,7 +12,7 @@ #include "gui/MainWindow.h" #include "gui/dialogs/VersionSelectDialog.h" #include "logic/lists/InstanceList.h" -#include "logic/lists/MojangAccountList.h" +#include "logic/auth/MojangAccountList.h" #include "logic/lists/IconList.h" #include "logic/lists/LwjglVersionList.h" #include "logic/lists/MinecraftVersionList.h" @@ -78,11 +78,13 @@ MultiMC::MultiMC(int &argc, char **argv) : QApplication(argc, argv), parser.addShortOpt("quietupdate", 'U'); parser.addDocumentation("quietupdate", "doesn't restart MultiMC after installing updates"); + // WARNING: disabled until further notice + /* // --launch parser.addOption("launch"); parser.addShortOpt("launch", 'l'); parser.addDocumentation("launch", "tries to launch the given instance", "<inst>"); - +*/ // parse the arguments try { @@ -212,6 +214,8 @@ MultiMC::MultiMC(int &argc, char **argv) : QApplication(argc, argv), m_qnam.reset(new QNetworkAccessManager(this)); // launch instance, if that's what should be done + // WARNING: disabled until further notice + /* if (!args["launch"].isNull()) { if (InstanceLauncher(args["launch"].toString()).launch()) @@ -220,7 +224,7 @@ MultiMC::MultiMC(int &argc, char **argv) : QApplication(argc, argv), m_status = MultiMC::Failed; return; } - +*/ m_status = MultiMC::Initialized; } |