Merge branch 'PrismLauncher:develop' into data-packs

This commit is contained in:
TheKodeToad 2025-06-01 07:54:16 +00:00 committed by GitHub
commit e4ed3b4546
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
125 changed files with 3925 additions and 1596 deletions

View file

@ -310,6 +310,8 @@ set(MINECRAFT_SOURCES
minecraft/ParseUtils.h
minecraft/ProfileUtils.cpp
minecraft/ProfileUtils.h
minecraft/ShortcutUtils.cpp
minecraft/ShortcutUtils.h
minecraft/Library.cpp
minecraft/Library.h
minecraft/MojangDownloadInfo.h
@ -834,6 +836,10 @@ SET(LAUNCHER_SOURCES
icons/IconList.h
icons/IconList.cpp
# log utils
logs/AnonymizeLog.cpp
logs/AnonymizeLog.h
# GUI - windows
ui/GuiUtil.h
ui/GuiUtil.cpp
@ -1048,6 +1054,8 @@ SET(LAUNCHER_SOURCES
ui/dialogs/ProfileSetupDialog.h
ui/dialogs/CopyInstanceDialog.cpp
ui/dialogs/CopyInstanceDialog.h
ui/dialogs/CreateShortcutDialog.cpp
ui/dialogs/CreateShortcutDialog.h
ui/dialogs/CustomMessageBox.cpp
ui/dialogs/CustomMessageBox.h
ui/dialogs/ExportInstanceDialog.cpp
@ -1230,6 +1238,7 @@ qt_wrap_ui(LAUNCHER_UI
ui/widgets/MinecraftSettingsWidget.ui
ui/widgets/JavaSettingsWidget.ui
ui/dialogs/CopyInstanceDialog.ui
ui/dialogs/CreateShortcutDialog.ui
ui/dialogs/ProfileSetupDialog.ui
ui/dialogs/ProgressDialog.ui
ui/dialogs/NewInstanceDialog.ui
@ -1306,7 +1315,7 @@ target_link_libraries(Launcher_logic
qdcss
BuildConfig
Qt${QT_VERSION_MAJOR}::Widgets
qrcode
qrcodegenerator
)
if (UNIX AND NOT CYGWIN AND NOT APPLE)