Tayou
|
9afa7cc91f
|
Merge branch 'develop' into icon-indexing
Signed-off-by: Tayou <31988415+TayouVR@users.noreply.github.com>
|
2023-08-07 10:32:38 +02:00 |
|
Trial97
|
91eb30f037
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into pack_changelog
|
2023-08-05 19:04:53 +03:00 |
|
Sefa Eyeoglu
|
1d638e018a
|
chore: update license headers
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-08-04 19:41:47 +02:00 |
|
Sefa Eyeoglu
|
1d468ac35a
|
chore: reformat
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-08-02 18:35:35 +02:00 |
|
Sefa Eyeoglu
|
ce2ca13815
|
fix: add missing headers
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-08-02 18:35:08 +02:00 |
|
Sefa Eyeoglu
|
01d3eea379
|
Merge pull request #1359 from Trial97/import
|
2023-08-02 18:25:51 +02:00 |
|
Alexandru Ionut Tripon
|
f13eccb03d
|
Update launcher/ui/pages/modplatform/import_ftb/ImportFTBPage.h
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
|
2023-08-02 19:24:58 +03:00 |
|
TheKodeToad
|
bb039d4bc7
|
Merge pull request #1445 from Trial97/curse
feat: removed flame quilt warning
|
2023-08-02 12:55:49 +01:00 |
|
Apix
|
16e6a01881
|
fix: fix copyright year
Signed-off-by: Apix <apix0n@outlook.com>
|
2023-08-02 11:35:54 +02:00 |
|
TheKodeToad
|
b572f75dba
|
Merge branch 'PrismLauncher:develop' into icon-indexing
|
2023-07-31 14:40:27 +01:00 |
|
Sefa Eyeoglu
|
bdec11c501
|
Merge pull request #1437 from LostLuma/instance-export-ignore-caches-2
|
2023-07-27 09:40:31 +02:00 |
|
LostLuma
|
4a9ea832ff
|
Ignore cache files entirely, also apply to modpack export
Signed-off-by: LostLuma <lilly@lostluma.net>
|
2023-07-27 01:42:14 +02:00 |
|
Alexandru Ionut Tripon
|
31b62203a7
|
Update launcher/ui/MainWindow.cpp
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
|
2023-07-26 23:44:35 +03:00 |
|
Trial97
|
e6b4fc9182
|
removed quilt warning
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-26 21:36:40 +03:00 |
|
TheKodeToad
|
719d87de3b
|
Update MainWindow.ui
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-07-26 17:21:12 +01:00 |
|
TheKodeToad
|
816acc9c76
|
Open catpak folder action
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-07-26 17:19:39 +01:00 |
|
LostLuma
|
a9fefb2eeb
|
Address review comments
Signed-off-by: LostLuma <lilly@lostluma.net>
|
2023-07-26 15:22:22 +02:00 |
|
LostLuma
|
361583edfc
|
Ignore cache files when exporting instances
Signed-off-by: LostLuma <lilly@lostluma.net>
|
2023-07-26 04:23:01 +02:00 |
|
tjw123hh
|
280f041acb
|
Delete some incorrect notr="true" tags
Signed-off-by: tjw123hh <tjw123hh@outlook.com>
|
2023-07-25 17:35:31 +08:00 |
|
tjw123hh
|
6a01c277e8
|
Delete some incorrect tags
|
2023-07-24 20:41:22 +08:00 |
|
TheKodeToad
|
516ddb22ae
|
More catpack changes :3
This is just embarrasing
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-07-22 11:05:58 +01:00 |
|
Trial97
|
0b74b3833a
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import
|
2023-07-21 19:30:06 +03:00 |
|
TheKodeToad
|
1a7c5693cc
|
Remove redundant methods
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-07-21 13:01:01 +01:00 |
|
TheKodeToad
|
f8b935ab37
|
Merge remote-tracking branch 'upstream/develop' into icon-indexing
|
2023-07-21 12:48:05 +01:00 |
|
TheKodeToad
|
5088d33fd2
|
Finish things :P
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-07-20 14:17:01 +01:00 |
|
TheKodeToad
|
39f7bea53e
|
Revert accidental change in MainWindow
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-07-20 14:13:29 +01:00 |
|
TheKodeToad
|
842f08dcfc
|
(UX) Add open folder button next to combo boxes
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-07-20 11:54:15 +01:00 |
|
TheKodeToad
|
960093700a
|
Better theme reset
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-07-19 20:57:08 +01:00 |
|
TheKodeToad
|
54d393632d
|
Automatically create theme folders, and add an action to open them
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-07-19 16:29:52 +01:00 |
|
TheKodeToad
|
c633c6d083
|
Colors->Widgets
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-07-19 14:19:28 +01:00 |
|
TheKodeToad
|
96ebdfc9a8
|
Sorting and invalid reset
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-07-19 14:12:39 +01:00 |
|
TheKodeToad
|
f55120654a
|
Merge branch 'PrismLauncher:develop' into icon-indexing
|
2023-07-19 12:51:26 +01:00 |
|
TheKodeToad
|
44ca7c7d22
|
Licenses
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-07-19 12:29:51 +01:00 |
|
TheKodeToad
|
58c2059e10
|
Remove recursion
It will add icon packs which aren't available - as QIcon's search paths are not recursed!
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-07-19 10:38:56 +01:00 |
|
Trial97
|
b7bccb9058
|
removed subdirectory flag
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-19 12:27:02 +03:00 |
|
Trial97
|
f046bd7d50
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into catpacks
|
2023-07-19 12:26:12 +03:00 |
|
TheKodeToad
|
97662f5c8e
|
Multiple icon themes!
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-07-18 22:51:34 +01:00 |
|
Trial97
|
015f88bf83
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-18 23:46:19 +03:00 |
|
Sefa Eyeoglu
|
ecac05b2fc
|
Merge pull request #1378 from Trial97/prism_export
Added progress bar to Prism instance export
|
2023-07-18 22:26:56 +02:00 |
|
Trial97
|
b0940d696b
|
Added QFutureWatcher
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
abort
forgot
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-17 17:52:00 +03:00 |
|
Tayou
|
e8c44e700d
|
Merge pull request #1286 from TayouVR/better-instance-group-separator
|
2023-07-17 11:55:31 +02:00 |
|
Trial97
|
ec32618e11
|
reveted back to add years
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-17 10:20:22 +03:00 |
|
Sefa Eyeoglu
|
aaf1726965
|
Merge pull request #1357 from getchoo/quilt-beacon
feat: add toggle for quilt beacon
|
2023-07-17 06:42:46 +02:00 |
|
seth
|
5e0df9b696
|
Merge pull request #1276 from Scrumplex/print-build-platform
Print build platform on launch
|
2023-07-16 17:15:55 -04:00 |
|
Trial97
|
cadb7142f0
|
Added progress bar to Prism instance export
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-16 20:57:57 +03:00 |
|
Trial97
|
251055302e
|
format
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-16 20:53:58 +03:00 |
|
Trial97
|
de30a72c4e
|
made the date a object
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-16 15:16:16 +03:00 |
|
Trial97
|
0a956bbc73
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into catpacks
|
2023-07-16 14:18:26 +03:00 |
|
Trial97
|
1e9a596908
|
simplified code in cat packs
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-16 14:18:17 +03:00 |
|
Sefa Eyeoglu
|
fcdd9ea986
|
Merge pull request #1246 from Trial97/export
|
2023-07-16 12:24:42 +02:00 |
|