Rachel Powers 7c1a465ec9 Merge branch 'develop' into feat/launcher-updater ...

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

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

..

dialogs

Merge branch 'develop' into feat/launcher-updater

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

instanceview

Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into catpacks

2023-07-19 12:26:12 +03:00

pagedialog

NOISSUE continue reshuffling the codebase

2021-11-22 03:55:16 +01:00

pages

Merge branch 'develop' into feat/launcher-updater

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

setupwizard

Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into catpacks

2023-07-19 12:26:12 +03:00

themes

removed subdirectory flag

2023-07-19 12:27:02 +03:00

widgets

Merge branch 'develop' into feat/launcher-updater

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

ColorCache.cpp

NOISSUE continue reshuffling the codebase

2021-11-22 03:55:16 +01:00

ColorCache.h

NOISSUE continue reshuffling the codebase

2021-11-22 03:55:16 +01:00

GuiUtil.cpp

Merge branch 'develop' into remove-updater

2023-01-24 14:40:17 +01:00

GuiUtil.h

Use optional instead of hardcoded cancelled string

2022-12-26 14:58:37 +00:00

InstanceWindow.cpp

feat: add functionality to MR modpack update in the page :D

2022-12-06 17:00:32 -03:00

InstanceWindow.h

Added Launch Demo button.

2022-09-15 18:44:18 -03:00

MainWindow.cpp

Merge branch 'develop' into feat/launcher-updater

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

MainWindow.h

Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into export

2023-07-14 23:45:40 +03:00

MainWindow.ui

Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into export

2023-07-14 23:45:40 +03:00