CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,853 Commits 10 Branches 30 Tags 34 MiB
29736b3b1f
Commit Graph

2734 Commits

Author SHA1 Message Date
TheKodeToad
57430fd189
Merge branch 'develop' into better-launch 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-07-22 11:26:02 +01:00
TheKodeToad
6ffcfcd7e9
Merge pull request #1402 from Trial97/flame_import 
feat:made flame instace creation use metadata for recommended version
 2023-07-22 11:14:12 +01: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
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
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
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
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
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
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
Alexandru Ionut Tripon
ec41252535
Update launcher/MMCZip.h 
Co-authored-by: Tayou <31988415+TayouVR@users.noreply.github.com>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2023-07-16 23:47:54 +03:00
Alexandru Ionut Tripon
4df9df03ab
Update launcher/MMCZip.cpp 
Co-authored-by: Tayou <31988415+TayouVR@users.noreply.github.com>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2023-07-16 23:47:47 +03:00
Trial97
79222a56e3
use shared pointer 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>

use shared pointer
 2023-07-16 21:14:39 +03: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
Sefa Eyeoglu
c145bfa524
Merge pull request #1369 from Trial97/autoselect 2023-07-16 12:21:17 +02:00
Trial97
a3ffa64550
Upgraded pack changelog 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-16 01:59:08 +03: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
Trial97
c346d875a2
make FileResolvingTask accept empty modlist 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-15 23:26:52 +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
7befd63cce
fixed settings 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-15 00:28:58 +03:00
Alexandru Ionut Tripon
2c2c39b42c
Update launcher/modplatform/import_ftb/PackInstallTask.cpp 
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2023-07-15 00:17:48 +03:00
Alexandru Ionut Tripon
0692cbe701
Update launcher/modplatform/import_ftb/PackInstallTask.cpp 
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2023-07-15 00:17:32 +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
9b02c31f8d
escaped text for html export 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-14 23:35:18 +03:00
Trial97
50dae9d4f3
Moved to separate functions 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-14 23:34:28 +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
Rachel Powers
37fb52aada
Merge pull request #1351 from Trial97/ftb_import 
fixed substatus on ftb_import
 2023-07-14 12:41:21 -07:00
seth
094af0f78f
Merge pull request #1336 from Ryex/packaging/fix-duplicate-share-directories 
packaging: fix duplicate share directories (use only lowercase)
 2023-07-14 14:19:44 -04:00
Rachel Powers
3487e1cb64
Update launcher/Application.cpp 
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-07-14 03:56:18 -07:00
Trial97
440afcedb0
fixed warning 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-14 13:32:18 +03:00
Trial97
b0a21c9389
insert header 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-14 13:31:28 +03:00
Trial97
fc4a1ef193
format 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-14 13:31:13 +03:00
Trial97
c8533c0b0d
fixed substatus on ftb_import 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-14 12:29:03 +03:00
Trial97
b0a018d823
format 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-14 12:28:23 +03:00
seth
3099a70edc
Merge pull request #1335 from Ryex/fix/gh-1322-old-zip-mods-in-wrong-place 
fix(flame install): don't assume .zip is a resource pack. default to mod
 2023-07-14 00:16:43 -04:00
Rachel Powers
cde85947c7
Update launcher/minecraft/mod/tasks/LocalResourceParse.cpp 
Co-authored-by: seth <getchoo@tuta.io>
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-07-13 21:12:12 -07:00
Rachel Powers
5d10045cc8
Merge pull request #1352 from Trial97/crash_after_abort 
Do not reset shared pointer if it's already empty
 2023-07-13 21:11:47 -07:00
Rachel Powers
520594e529
Merge branch 'develop' into chore/add-compiler-warnings 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-07-13 20:05:16 -07:00
Rachel Powers
95b300f1ea
packaging: use PascalCase folder name instead 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-07-13 19:56:36 -07:00
Trial97
bd6e8533ad
send by reference 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-13 19:58:08 +03:00
Trial97
843c2d67eb
Added FTBAPP Import 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-13 18:41:29 +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
Trial97
25f7cf23d3
the other place 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-12 19:55:11 +03:00
Trial97
9ee68b9268
small pointer check 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-12 18:12:31 +03:00
leo78913
1208300ddf
i forgor to change skin upload browse button 
Signed-off-by: leo78913 <leo3758@riseup.net>
 2023-07-12 10:57:40 -03: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
Rachel Powers
6d5a2ceefe
fix(flameapi): getFile use shared_ptr 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-07-11 21:45:23 -07:00
Rachel Powers
149bc8e9ce
cleanup: pull out data object so I'm not repeating myself 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-07-11 21:42:34 -07:00
Rachel Powers
9957aeb003
Merge branch 'develop' into curseforge-url-handle 2023-07-11 21:42:29 -07:00
Trial97
634612ae81
added missing header 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-11 18:20:44 +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
TheKodeToad
4c69290381
Merge branch 'develop' into better-component-installation 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-07-11 11:14:06 +01:00
seth
640aaa8c23
Merge pull request #1331 from TheKodeToad/hungry-trash 
Fix updating trashing resources
 2023-07-10 16:31:43 -04: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
e21756ea8c Remove direct launch 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-07-10 16:22:37 +01:00
Trial97
35ccfdb799
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into catpacks 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-10 16:25:15 +03: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
Rachel Powers
49109b9213
Merge pull request #1332 from TheKodeToad/widebar-pain 
Fix crash when editing instance and prevent similar crashes in future
 2023-07-09 14:07:34 -07:00
Rachel Powers
d43399c2b4
Merge pull request #1321 from TheKodeToad/mr-optional 
Optional mods in mrpack export
 2023-07-09 14:03:47 -07: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
6e2fcc9e11 Replace string manipulation in favour of QFileInfo 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-07-09 12:08:15 +01:00
Rachel Powers
4dc4c589ba
packaging: fix duplicate share directories (use only lowercase) 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-07-08 15:44:09 -07:00
TheKodeToad
d53d58a5d4 LiteMod downloading 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-07-08 22:16:43 +01:00
Rachel Powers
e704072892
fix(flame install): don't assume .zip is a resource pack. default to mod 
let identifier move it if needed

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-07-08 13:38:00 -07: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
TheKodeToad
0c6362f28d Make trash hungry 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-07-08 18:51:28 +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
ashuntu
51d7a6289e Fix URL open crash (#596) 2023-07-07 13:24:31 -05:00
ashuntu
10678096e5 Persist app data between install versions 2023-07-07 13:20:15 -05:00
Sefa Eyeoglu
51e62761ee
fix: improve QUrl construction 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-07-07 19:25:12 +02:00
leo78913
d1cceac7d1
disable hiding enable and name columns on folder models 
Signed-off-by: leo78913 <leo3758@riseup.net>
 2023-07-07 12:37:24 -03:00
TheKodeToad
b8482a5d89
Update ModFolderPage.cpp 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-07-07 15:53:50 +01:00
Trial97
3139af8487
Made action text simpler 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-07 17:12:10 +03:00
Sefa Eyeoglu
6fcdac0d36
fix: reset invalid meta url on launch 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-07-07 15:57:25 +02:00
Sefa Eyeoglu
073cb91f88
fix(ui): validate meta override url 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-07-07 15:56:07 +02:00
leo78913
3154c2644a
enable tear off on widebar context menu 
Signed-off-by: leo78913 <leo3758@riseup.net>
 2023-07-07 10:30:18 -03:00
Sefa Eyeoglu
e225a72180
Merge pull request #1128 from pandaninjas/fix-implicit-fallthrough 2023-07-07 15:19:00 +02:00
TheKodeToad
ec85266860
Memory leak fixes 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-07-07 12:18:04 +01:00
TheKodeToad
4c25e3ce75 Add keyboard shortcut to Kill action 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-07-06 21:04:21 +01:00
TheKodeToad
8ae67b84db Optional mods in mrpack export 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-07-06 20:04:26 +01:00
TheKodeToad
440dcdf022 Import QActionGroup properly :P 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-07-06 18:31:59 +01:00
TheKodeToad
22327bbe71 Combine launch buttons in Instance window, persist profiler 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-07-06 18:07:45 +01:00
Trial97
93870c315f
better url handling 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-06 18:46:59 +03:00
PandaNinjas
13d67c6524
Keep formatting consistent 
Signed-off-by: PandaNinjas <admin@malwarefight.wip.la>
 2023-07-06 08:51:42 -04:00
leo78913
e8dc1564b6
add _kde_side_panel_view property to page container 
With this the sidebars look better with the breeze theme

Signed-off-by: leo78913 <leo3758@riseup.net>
 2023-07-06 01:39:59 -03:00
leo78913
f9578066d6
make "browse" buttons and java pages more consistent 
Signed-off-by: leo78913 <leo3758@riseup.net>
 2023-07-06 01:39:59 -03:00
Sefa Eyeoglu
5ba13297c6
Merge pull request #1284 from Ryex/fix/properly-track-failed-copies-and-clones 2023-07-05 19:26:07 +02:00
PandaNinjas
817ecf8225
Fix VersionProxyModel.cpp 
Signed-off-by: PandaNinjas <admin@malwarefight.wip.la>
 2023-07-04 17:19:08 -04:00
PandaNinjas
4509fde410
Merge branch 'develop' into fix-implicit-fallthrough 
Signed-off-by: PandaNinjas <admin@malwarefight.wip.la>
 2023-07-04 16:41:34 -04:00
PandaNinjas
34cf28712c
Replace break with return true; 
Signed-off-by: PandaNinjas <admin@malwarefight.wip.la>
 2023-07-04 16:39:24 -04:00
PandaNinjas
1fbc17d275
Remove break and add fallthrough comment in WorldListPage.cpp 
Signed-off-by: PandaNinjas <admin@malwarefight.wip.la>
 2023-07-04 16:38:04 -04:00
Trial97
908ac813e0
escaped modlist inner html 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-04 15:16:54 +03:00
TheKodeToad
64c591b234 Better parent version filtering; handle old fabric :P 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-07-03 20:48:37 +01:00
TheKodeToad
0e5c377680 Various tweaks 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-07-03 17:39:09 +01:00
Trial97
6d758795af
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into catpacks 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-03 17:00:56 +03:00
Tayou
dedc9e4edc
Merge pull request #1127 from Trial97/scale_cat 2023-07-03 15:46:56 +02:00
Trial97
fa7cfc77d8
fixed template 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-03 16:08:20 +03:00
Trial97
f0aab541f8
fixed typo 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-03 15:09:35 +03:00
Trial97
026293f773
updated option text 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-03 14:17:39 +03:00
Trial97
5d5f1b86fd
fixed logic regarding range over multiple years 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-03 09:21:25 +03:00
Trial97
ba159ba971
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into catpacks 2023-07-03 09:01:22 +03:00
Rachel Powers
e5b9bfb2e7
fix: update if new size is larger 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-07-02 22:30:25 -07:00
Rachel Powers
8cb8273e67
fix: update if new size is larger 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-07-02 22:29:45 -07:00
Rachel Powers
73d8343914
fix: header <qpoint.h> -> <QPoint> 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-07-02 22:27:24 -07:00
Rachel Powers
3960eb7d32
fix: properly calculate min size for progress dialog, apply it at creation 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-07-02 21:24:43 -07:00
Rachel Powers
4004e0faee
fix: segfault in progress dialog 
- dialog tries to resize after unhiding the subtask scroll area
- after resize attempts to recenter on parent
  - `calls parentWidget()->{x|y}()`
  - what if there is no parent? nullptr->() = segfault

- recenter on last pos, don't access parent

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-07-02 20:22:25 -07:00
Trial97
f1bd9700f7
Fail NetRequest on connection close from QT 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-02 22:49:58 +03:00
Trial97
5f63c781b4
resolved local vaiables names 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-02 18:50:29 +03:00
TheKodeToad
43e6f05ed5
Merge pull request #1232 from telans/screenshots-update 
ScreenshotsPage fixes
 2023-07-02 16:44:54 +01:00
Trial97
aad5ca5474
fixed typos 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-02 16:45:15 +03:00
Trial97
cf2393a509
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into settings 2023-07-02 15:56:39 +03:00
Tayou
81c0a1c4bd
antialiasing for all painting, make hitbox fullwidth 
Signed-off-by: Tayou <tayou@gmx.net>
 2023-07-02 14:01:56 +02:00
Trial97
6fc745e98c
Merge branch 'catpacks' of github.com:Trial97/PrismLauncher into catpacks 2023-07-02 13:34:41 +03:00
Trial97
7579fff532
Added more options for variants planing 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-02 13:34:04 +03:00
Trial97
7ac2a23bc8
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into catpacks 2023-07-02 13:14:19 +03:00
Trial97
6c4cf085e0
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into curse 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-02 12:50:45 +03:00
Rachel Powers
8d7dcdfc5b
chore: fix shadowed member and signed/unsigned mismatch 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>

chore: supress unused with [[maybe_unused]]

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

chore: unshadow ^&^& static_cast implicit return

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

chore: deshadow and mark unused in parse task

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

chore: mark unused in folder models

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

chore: deshadow and mark unused with instances

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

chore: more deshadow and unused

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

chore: remove uneeded simicolons

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

chore: mark unused

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

chore: prevent shadow

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-07-01 23:39:38 -07:00
Finian Wright
3fe518ff2b Fix compiling on OpenBSD 
Signed-off-by: Finian Wright <turbowafflz@gmail.com>
 2023-07-02 00:36:21 -04:00
Rachel Powers
98d6904e4a
chore: fix propagate mispelling 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-07-01 17:03:12 -07:00
Rachel Powers
d7d2d9f612
chore: remove WARNINGS_AS_ERRORS 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-07-01 17:03:11 -07:00
Rachel Powers
2a5d291bd9
fix: toml without exceptions usage 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-07-01 17:03:11 -07:00
Rachel Powers
671d3c1c80
Merge branch 'develop' into chore/add-compiler-warnings 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-07-01 17:03:11 -07:00
TheKodeToad
6cc3587da2 Disable as intended 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-07-01 20:10:38 +01:00
TheKodeToad
9f9b5254a2 Double-click to install/change version 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-07-01 19:39:04 +01:00
TheKodeToad
284e374ae8 Nop 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-07-01 19:39:04 +01:00
TheKodeToad
4cdf669154 Modify "Change Version" to use "Install Loader" dialog 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-07-01 19:39:04 +01:00
TheKodeToad
4332b62a62 Fix search focusing 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-07-01 19:39:04 +01:00
TheKodeToad
7138425c85
Merge branch 'develop' into better-component-installation 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-07-01 13:05:55 +01:00
Trial97
18e628e873
removed extra condition 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-30 12:10:00 +03:00
Trial97
81207c6502
Made sure the logs are ignored when collecting files 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-30 10:52:10 +03:00
Trial97
87efa700ab
Removed logs from instance export 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-30 00:01:36 +03:00
Tayou
8211befc29
removed magic 5, removed unnecessary QPainter function calls 
Signed-off-by: Tayou <tayou@gmx.net>
 2023-06-28 23:24:57 +02:00
Tayou
1dc7f80034
4 clang-tidy changes, update copyright info 
while already at it I updated all my emails to use one from my domain
Signed-off-by: Tayou <tayou@gmx.net>
 2023-06-28 23:08:04 +02:00
Tayou
534d156b12
format VisualGroup.cpp file 
Signed-off-by: Tayou <tayou@gmx.net>
 2023-06-28 20:06:17 +02:00
Tayou
54d88e4dbf
use QString.isEmpty() 
oops
Signed-off-by: Tayou <tayou@gmx.net>
 2023-06-28 20:05:28 +02:00
Tayou
6b3b119db0
give ungrouped instances a group header 
Signed-off-by: Tayou <tayou@gmx.net>
 2023-06-28 18:50:44 +02:00
Tayou
66461ac500
some positioning adjustments, deleted the line 
Signed-off-by: Tayou <tayou@gmx.net>
 2023-06-28 18:42:49 +02:00