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 |
|
Trial97
|
ef21879df4
|
replaced require with ensure for jvmArgs
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-21 19:30:00 +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
|
8705e88e91
|
Fix build on Windows
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-07-21 11:19:55 +01:00 |
|
TheKodeToad
|
0be4db30eb
|
Merge branch 'PrismLauncher:develop' into better-component-installation
|
2023-07-21 11:02:57 +01:00 |
|
Sefa Eyeoglu
|
821dd8400b
|
Merge pull request #1253 from Trial97/catpacks
|
2023-07-21 11:11:12 +02: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 |
|
Trial97
|
f8d9cd9a03
|
use range for
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-19 23:08:16 +03: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
|
593f452986
|
Merge pull request #1399 from Scrumplex/offline-uuid
fix: generate predictable UUIDs for offline accounts
|
2023-07-19 10:16:27 +01:00 |
|
TheKodeToad
|
97662f5c8e
|
Multiple icon themes!
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-07-18 22:51:34 +01:00 |
|
seth
|
f8d88cc83d
|
Merge pull request #1372 from PrismLauncher/update_flake_lock_action
chore(nix): update lockfile
|
2023-07-18 21:19:58 +00:00 |
|
Trial97
|
f393aa684e
|
wait to load metadata
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-18 23:59:43 +03:00 |
|
Trial97
|
4c319c8f4f
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into flame_import
|
2023-07-18 23:49:52 +03:00 |
|
Trial97
|
477b72ad33
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into prism_export2
|
2023-07-18 23:48:02 +03:00 |
|
Sefa Eyeoglu
|
3728cbb62a
|
Merge pull request #1397 from Gaming32/develop
|
2023-07-18 22:47:55 +02: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
|
3fbc25155b
|
Merge pull request #1362 from Trial97/fix_warning
|
2023-07-18 22:28:27 +02: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 |
|
seth
|
5b54475d3e
|
Merge pull request #1385 from orowith2os/flatpak-updates
Update Flatpak manifest
|
2023-07-18 20:12:39 +00:00 |
|
Trial97
|
391497645f
|
feat:made flame instace creation use metadata for recommended version
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-18 22:33:39 +03:00 |
|
Sefa Eyeoglu
|
f8fcb98c68
|
fix: generate predictable UUIDs for offline accounts
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-07-18 10:07:35 +02:00 |
|
Dallas Strouse
|
2eff1de560
|
Update Flatpak manifest
Signed-off-by: Dallas Strouse <dastrouses@gmail.com>
|
2023-07-17 22:38:12 -05:00 |
|
Josiah Glosson
|
1fbb41f5e2
|
Make Launch Offline not launch online in 1.6+
Signed-off-by: Josiah Glosson <soujournme@gmail.com>
|
2023-07-17 17:07:06 -05:00 |
|
TheKodeToad
|
01afa8957f
|
Merge pull request #1387 from Scrumplex/fix-quilt-beacon
Check if any modloader is installed
|
2023-07-17 17:40:42 +01:00 |
|
Trial97
|
5162203c7d
|
Merge branch 'prism_export' of github.com:Trial97/PrismLauncher into prism_export2
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-17 17:58:42 +03: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 |
|
Trial97
|
fe73d696cb
|
replace emplace with insert
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-17 17:24:29 +03:00 |
|
Trial97
|
2ea4a78541
|
Upgraded ExportToZipTask
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-17 17:24:23 +03:00 |
|
Trial97
|
cd9310afed
|
replace emplace with insert
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-17 16:57:52 +03:00 |
|
Trial97
|
64041a84a2
|
handle file removal in ExportToZipTask
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-17 16:55:26 +03:00 |
|
Trial97
|
78ee63af38
|
simplify modrinth export
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-17 16:40:01 +03:00 |
|
Trial97
|
455c495338
|
simplify flame export
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
s
|
2023-07-17 16:27:08 +03:00 |
|
Trial97
|
0bf70d677e
|
Upgraded ExportToZipTask
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-17 16:24:43 +03:00 |
|
Sefa Eyeoglu
|
2be630904f
|
fix: don't take modloaders by reference
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-07-17 14:33:01 +02:00 |
|
Tayou
|
e8c44e700d
|
Merge pull request #1286 from TayouVR/better-instance-group-separator
|
2023-07-17 11:55:31 +02:00 |
|
Sefa Eyeoglu
|
54a091ca59
|
fix: check if any modloader is installed
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-07-17 10:09:01 +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 |
|