CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,499 Commits 10 Branches 30 Tags
5088d33fd2aec8fed9725f9dedb64e9629226c11
Commit Graph

1256 Commits

Author SHA1 Message Date
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
TheKodeToad
97662f5c8e Multiple icon themes! 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-07-18 22:51:34 +01: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
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
Sefa Eyeoglu
fcdd9ea986 Merge pull request #1246 from Trial97/export 2023-07-16 12:24:42 +02:00
Trial97
06fc8358d9 auto focus search line on resource download 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-15 23:57:32 +03:00
seth
a2a09ffe01 chore: better explain quilt loader beacon 
Signed-off-by: seth <getchoo@tuta.io>
 2023-07-15 14:25:05 -04:00
Alexandru Ionut Tripon
da87e825a1 Update launcher/ui/dialogs/ExportToModListDialog.ui 
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2023-07-15 15:59:19 +03:00
Trial97
ab10524cd7 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into export 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-14 23:45:40 +03:00
Trial97
1ccfba13eb renames 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-14 23:41:51 +03:00
Trial97
b9ed8283b7 Added buttons 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-14 23:41:45 +03:00
Trial97
1495bfb73e Made custom template enabled all time 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-14 23:41:37 +03:00
Trial97
9a3931dac6 Added json and csv format 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-14 23:34:21 +03:00
Trial97
515197fba2 fix: html sintax for modlist export 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-14 23:34:03 +03:00
seth
89aaedc06c feat: add toggle for quilt beacon 
Signed-off-by: seth <getchoo@tuta.io>
 2023-07-12 21:10:48 -04:00
Tayou
94d4d12ee0 Merge pull request #1345 from Trial97/time2 
feat:Added option to use system locale
 2023-07-13 01:56:12 +02:00
Trial97
76cc8ce043 renamed setting 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-12 21:05:13 +03:00
Rachel Powers
9499066375 Merge pull request #1350 from Trial97/fix_managed_pack_crash 
fixed crash if no version is loaded on managed page
 2023-07-12 09:55:31 -07:00
Sefa Eyeoglu
06a7d447f6 Merge pull request #1333 from Ryex/fix/null_instance_edit_crash 2023-07-12 15:53:46 +02:00
Trial97
766e833a73 fixed crash if no version is loaded 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-12 16:25:05 +03:00
Trial97
f0d2aab784 feat:Added option to use system locale 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-11 18:05:43 +03:00
Rachel Powers
1aa5fa03f9 Update launcher/ui/MainWindow.cpp 
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-07-10 12:05:01 -07:00
Nathan
99ba02afb6 Shortcuts on macOS (#1081) 
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
 2023-07-10 20:26:25 +02:00
TheKodeToad
9aedb5afff Merge pull request #1334 from TheKodeToad/litemod-dl 
LiteMod downloading
 2023-07-10 16:42:38 +01:00
TheKodeToad
91c9082d19 Merge pull request #1249 from Trial97/curse 
Curseforge modpack export
 2023-07-10 14:20:29 +01:00
TheKodeToad
4f4ccdaa59 Merge pull request #1338 from Trial97/unlockVersionPage 
feat:unlocked versions page
 2023-07-10 13:06:32 +01:00
TheKodeToad
f816e3cd3f Merge pull request #1241 from Trial97/settings 
Allow editing of running instances
 2023-07-09 22:10:43 +01:00
Trial97
308877aa8f removed redundant code 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-09 23:18:38 +03:00
Trial97
159f14c076 feat:unlocked versions page 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-09 22:47:38 +03:00
TheKodeToad
d53d58a5d4 LiteMod downloading 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-07-08 22:16:43 +01:00
Rachel Powers
a54bbae622 fix(instance edit): don't allow editing if no selected instance or instance doesn't support editing 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-07-08 12:59:55 -07:00
TheKodeToad
08c140b9b4 Fix actionVisitItemPage insersion, and prevent widebar segfault 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-07-08 20:55:30 +01:00
Rachel Powers
20c781b23b fix(progress dialog): if there is a parent center on creation 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-07-08 02:28:37 -07:00
Rachel Powers
3211b265d7 Merge pull request #1302 from Ryex/fix/progress-dialog-segfault 
fix: segfault in progress dialog
 2023-07-07 21:25:14 -07:00
Trial97
bc2940e16a Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into settings 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-08 00:14:05 +03:00
Tayou
1131038fdb Merge pull request #1120 from Trial97/visit_mod_page 2023-07-07 22:23:59 +02:00