diff options
| author | flow <flowlnlnln@gmail.com> | 2022-05-17 18:25:08 -0300 |
|---|---|---|
| committer | flow <flowlnlnln@gmail.com> | 2022-05-17 18:25:08 -0300 |
| commit | ff9f3cb31ff75c2d657146cf8fe646084439fd0f (patch) | |
| tree | 6c098648df6a4da447aa305420709037115f81f0 /launcher/CMakeLists.txt | |
| parent | 17bbfe8d8951ddc7acca0222c6d2e38fb29eef25 (diff) | |
| parent | cc13310083fe8d0c3bb423fa3e31db7b1f7b25e1 (diff) | |
| download | PrismLauncher-ff9f3cb31ff75c2d657146cf8fe646084439fd0f.tar.gz PrismLauncher-ff9f3cb31ff75c2d657146cf8fe646084439fd0f.tar.bz2 PrismLauncher-ff9f3cb31ff75c2d657146cf8fe646084439fd0f.zip | |
fix conflicts with develop
Diffstat (limited to 'launcher/CMakeLists.txt')
| -rw-r--r-- | launcher/CMakeLists.txt | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/launcher/CMakeLists.txt b/launcher/CMakeLists.txt index b79f03c8..8e75be20 100644 --- a/launcher/CMakeLists.txt +++ b/launcher/CMakeLists.txt @@ -532,6 +532,8 @@ set(FLAME_SOURCES set(MODRINTH_SOURCES modplatform/modrinth/ModrinthPackIndex.cpp modplatform/modrinth/ModrinthPackIndex.h + modplatform/modrinth/ModrinthPackManifest.cpp + modplatform/modrinth/ModrinthPackManifest.h ) set(MODPACKSCH_SOURCES @@ -774,6 +776,11 @@ SET(LAUNCHER_SOURCES ui/pages/modplatform/flame/FlameModPage.cpp ui/pages/modplatform/flame/FlameModPage.h + ui/pages/modplatform/modrinth/ModrinthPage.cpp + ui/pages/modplatform/modrinth/ModrinthPage.h + ui/pages/modplatform/modrinth/ModrinthModel.cpp + ui/pages/modplatform/modrinth/ModrinthModel.h + ui/pages/modplatform/technic/TechnicModel.cpp ui/pages/modplatform/technic/TechnicModel.h ui/pages/modplatform/technic/TechnicPage.cpp @@ -782,10 +789,10 @@ SET(LAUNCHER_SOURCES ui/pages/modplatform/ImportPage.cpp ui/pages/modplatform/ImportPage.h - ui/pages/modplatform/modrinth/ModrinthModel.cpp - ui/pages/modplatform/modrinth/ModrinthModel.h - ui/pages/modplatform/modrinth/ModrinthPage.cpp - ui/pages/modplatform/modrinth/ModrinthPage.h + ui/pages/modplatform/modrinth/ModrinthModModel.cpp + ui/pages/modplatform/modrinth/ModrinthModModel.h + ui/pages/modplatform/modrinth/ModrinthModPage.cpp + ui/pages/modplatform/modrinth/ModrinthModPage.h # GUI - dialogs ui/dialogs/AboutDialog.cpp @@ -908,6 +915,7 @@ qt5_wrap_ui(LAUNCHER_UI ui/pages/modplatform/legacy_ftb/Page.ui ui/pages/modplatform/ImportPage.ui ui/pages/modplatform/ftb/FtbPage.ui + ui/pages/modplatform/modrinth/ModrinthPage.ui ui/pages/modplatform/technic/TechnicPage.ui ui/widgets/InstanceCardWidget.ui ui/widgets/CustomCommands.ui |