Rachel Powers f03924478b

Merge branch 'fix/windows-console-attach' into feat/launcher-updater ...

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>

# Conflicts:
#	launcher/Application.cpp
#	launcher/CMakeLists.txt
#	launcher/filelink/FileLink.cpp

2023-07-30 14:30:16 -07:00

..

filelink

Merge branch 'fix/windows-console-attach' into feat/launcher-updater

2023-07-30 14:30:16 -07:00

icons

…

java

fixed warning

2023-07-14 13:32:18 +03:00

launch

fix: typo in task.h

2023-07-26 16:20:30 -04:00

meta

Merge branch 'develop' into feat/launcher-updater

2023-07-30 14:19:31 -07:00

minecraft

Merge branch 'develop' into feat/launcher-updater

2023-07-30 14:19:31 -07:00

modplatform

Merge branch 'develop' into feat/launcher-updater

2023-07-30 14:19:31 -07:00

net

fix: add build config header & trimlines form stdout

2023-06-28 11:25:59 -07:00

news

Made ByteSynkArray to use shared_ptr

2023-06-15 22:59:41 +03:00

pathmatcher

…

resources

Deduplicate launcher icon

2023-06-25 15:02:25 +01:00

screenshots

refactor: override / mask static make functions for ApiDownload

2023-06-25 11:09:25 -07:00

settings

fix: add support for QByteArray inifile

2023-07-26 23:56:01 +03:00

tasks

fix: typo in task.h

2023-07-26 16:20:30 -04:00

tools

…

translations

renamed setting

2023-07-12 21:05:13 +03:00

ui

Merge branch 'develop' into feat/launcher-updater

2023-07-30 14:19:31 -07:00

updater

fix(updater): fix bad exe_name on linux

2023-06-30 21:33:22 -07:00

Application.cpp

Merge branch 'fix/windows-console-attach' into feat/launcher-updater

2023-07-30 14:30:16 -07:00

Application.h

Merge branch 'develop' into feat/launcher-updater

2023-07-30 14:19:31 -07:00

ApplicationMessage.cpp

…

ApplicationMessage.h

…

BaseInstaller.cpp

…

BaseInstaller.h

…

BaseInstance.cpp

…

BaseInstance.h

…

BaseVersion.h

format

2023-07-14 13:31:13 +03:00

BaseVersionList.cpp

…

BaseVersionList.h

…

CMakeLists.txt

Merge branch 'fix/windows-console-attach' into feat/launcher-updater

2023-07-30 14:30:16 -07:00

Commandline.cpp

…

Commandline.h

…

DataMigrationTask.cpp

…

DataMigrationTask.h

…

DefaultVariable.h

…

DesktopServices.cpp

…

DesktopServices.h

…

Exception.h

…

ExponentialSeries.h

…

FastFileIconProvider.cpp

Optimised icons

2023-06-03 13:39:42 +01:00

FastFileIconProvider.h

Optimised icons

2023-06-03 13:39:42 +01:00

FileIgnoreProxy.cpp

removed extra condition

2023-06-30 12:10:00 +03:00

FileIgnoreProxy.h

Made sure the logs are ignored when collecting files

2023-06-30 10:52:10 +03:00

FileSystem.cpp

Merge branch 'develop' into feat/launcher-updater

2023-07-30 14:19:31 -07:00

FileSystem.h

Merge branch 'develop' into feat/launcher-updater

2023-07-30 14:19:31 -07:00

Filter.cpp

…

Filter.h

…

GZip.cpp

…

GZip.h

…

install_prereqs.cmake.in

…

InstanceCopyPrefs.cpp

…

InstanceCopyPrefs.h

…

InstanceCopyTask.cpp

fix #1118 : use filePath not path on QFileInfo

2023-06-07 06:26:58 -07:00

InstanceCopyTask.h

…

InstanceCreationTask.cpp

…

InstanceCreationTask.h

fix: memory leak with NetJob and responce not getting cleaned up

2023-05-21 01:46:28 -07:00

InstanceImportTask.cpp

Merge branch 'develop' into feat/launcher-updater

2023-07-30 14:19:31 -07:00

InstanceImportTask.h

…

InstanceList.cpp

fix: typo in task.h

2023-07-26 16:20:30 -04:00

InstanceList.h

…

InstancePageProvider.h

…

InstanceTask.cpp

Fix trailing space in instance name

2023-06-15 16:37:03 +01:00

InstanceTask.h

…

JavaCommon.cpp

…

JavaCommon.h

…

Json.cpp

…

Json.h

…

KonamiCode.cpp

…

KonamiCode.h

…

LaunchController.cpp

Merge pull request #1276 from Scrumplex/print-build-platform

2023-07-16 17:15:55 -04:00

LaunchController.h

…

Launcher.in

…

LoggedProcess.cpp

fix: remove qt < 5.6 support process error signal

2023-05-11 16:32:00 -07:00

LoggedProcess.h

…

main.cpp

…

MangoHud.cpp

…

MangoHud.h

…

Markdown.cpp

Fix markdown header

2023-06-25 13:43:03 +01:00

Markdown.h

Fix markdown header

2023-06-25 13:43:03 +01:00

MessageLevel.cpp

…

MessageLevel.h

…

MMCTime.cpp

refactor: move functions to utils + code-review fixes

2023-05-06 19:10:58 -07:00

MMCTime.h

doc fixes

2023-05-06 19:18:39 -07:00

MMCZip.cpp

Merge branch 'develop' into feat/launcher-updater

2023-07-30 14:19:31 -07:00

MMCZip.h

Merge branch 'develop' into feat/launcher-updater

2023-07-30 14:19:31 -07:00

MTPixmapCache.h

fix: fix qchar conversion and codeql

2023-05-05 11:13:36 -07:00

NullInstance.h

…

ProblemProvider.h

…

QObjectPtr.h

…

qtlogging.ini

typo fix

2023-05-07 13:23:59 -07:00

QVariantUtils.h

…

RecursiveFileSystemWatcher.cpp

…

RecursiveFileSystemWatcher.h

…

ResourceDownloadTask.cpp

Merge branch 'develop' into feat/launcher-updater

2023-07-30 14:19:31 -07:00

ResourceDownloadTask.h

Fix crash when selecting same mod from different providers (#1029)

2023-06-02 18:04:06 -03:00

RuntimeContext.h

…

RWStorage.h

…

SeparatorPrefixTree.h

…

SkinUtils.cpp

…

SkinUtils.h

…

StringUtils.cpp

fix(updater): build atrifact fix on linux ci + add qt-ver to artifact name

2023-06-30 18:17:06 -07:00

StringUtils.h

feat(updater): tie in updater part 1

2023-06-25 21:37:47 -07:00

Usable.h

…

Version.cpp

…

Version.h

feat: paliminary updater

2023-05-30 23:03:44 -07:00

VersionProxyModel.cpp

Keep formatting consistent

2023-07-06 08:51:42 -04:00

VersionProxyModel.h

Add a search bar to version lists

2023-06-05 22:47:42 +01:00

WatchLock.h

…

WindowsConsole.cpp

refactor(windows console): move to external file

2023-07-30 13:38:47 -07:00

WindowsConsole.h

refactor(windows console): move to external file

2023-07-30 13:38:47 -07:00