dasha_uwu/PrismLauncher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader

Browse source
This commit is contained in:
Trial97 2024-08-20 00:02:14 +03:00
commit 4d24213aa3
No known key found for this signature in database
GPG key ID: 55EF5DA53DB36318
40 changed files with 350 additions and 401 deletions
Download patch file Download diff file Expand all files Collapse all files

4
launcher/Application.cpp
View file

@ -48,7 +48,6 @@
#include "net/PasteUpload.h"
#include "pathmatcher/MultiMatcher.h"
#include "pathmatcher/SimplePrefixMatcher.h"
#include "settings/INIFile.h"
#include "tools/GenericProfiler.h"
#include "ui/InstanceWindow.h"
#include "ui/MainWindow.h"
@ -107,7 +106,7 @@
#include "icons/IconList.h"
#include "net/HttpMetaCache.h"
#include "java/JavaUtils.h"
#include "java/JavaInstallList.h"
#include "updater/ExternalUpdater.h"
@ -153,6 +152,7 @@
#endif
#if defined Q_OS_WIN32
#include <windows.h>
#include "WindowsConsole.h"
#endif