diff options
| author | Petr Mrázek <peterix@gmail.com> | 2013-11-24 18:41:35 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2013-11-24 18:41:35 +0100 |
| commit | 82225a21e1b7f1671a42c1511032c59ecda0503f (patch) | |
| tree | bed0663df62a7210da6928c50a6ba99aed53cd1f /CMakeLists.txt | |
| parent | ca297fca79a7b1b96e41ba5abed4956af9383c16 (diff) | |
| parent | 75e7932607bdd84d2867765eb6f07dcec95ee193 (diff) | |
| download | MultiMC-82225a21e1b7f1671a42c1511032c59ecda0503f.tar MultiMC-82225a21e1b7f1671a42c1511032c59ecda0503f.tar.gz MultiMC-82225a21e1b7f1671a42c1511032c59ecda0503f.tar.lz MultiMC-82225a21e1b7f1671a42c1511032c59ecda0503f.tar.xz MultiMC-82225a21e1b7f1671a42c1511032c59ecda0503f.zip | |
Merge branch 'feature_yggdrasil' into develop
Conflicts:
gui/MainWindow.cpp
logic/OneSixInstance.h
Fix missing session id functionality for legacy and old onesix.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index a9de11d1..1bb3126b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -217,6 +217,8 @@ gui/dialogs/EditNotesDialog.h gui/dialogs/EditNotesDialog.cpp gui/dialogs/CustomMessageBox.h gui/dialogs/CustomMessageBox.cpp +gui/dialogs/AccountListDialog.h +gui/dialogs/AccountListDialog.cpp # GUI - widgets gui/widgets/InstanceDelegate.h @@ -269,6 +271,14 @@ logic/net/LoginTask.cpp logic/net/S3ListBucket.h logic/net/S3ListBucket.cpp +# Yggdrasil login stuff +logic/auth/MojangAccount.h +logic/auth/MojangAccount.cpp +logic/auth/YggdrasilTask.h +logic/auth/YggdrasilTask.cpp +logic/auth/AuthenticateTask.h +logic/auth/AuthenticateTask.cpp + # legacy instances logic/LegacyInstance.h @@ -317,6 +327,8 @@ logic/lists/ForgeVersionList.h logic/lists/ForgeVersionList.cpp logic/lists/JavaVersionList.h logic/lists/JavaVersionList.cpp +logic/lists/MojangAccountList.h +logic/lists/MojangAccountList.cpp # misc model/view logic/EnabledItemFilter.h @@ -359,6 +371,7 @@ gui/dialogs/IconPickerDialog.ui gui/dialogs/LegacyModEditDialog.ui gui/dialogs/OneSixModEditDialog.ui gui/dialogs/EditNotesDialog.ui +gui/dialogs/AccountListDialog.ui # Widgets/other gui/widgets/MCModInfoFrame.ui |