Mirrors/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2025-06-10 20:35:43 +02:00
Code Issues Packages Projects Releases Wiki Activity
9,404 Commits 9 Branches 38 Tags
476054ba19f1858b1ac1effb84f0e7415e7de0c3
Commit Graph

101 Commits

Author SHA1 Message Date
Trial97
c5fd5e6ac1 chore: make all the regexes static const 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2025-04-28 22:37:29 +03:00
TheKodeToad
216034c283 refactor FlameCheckUpdate to remove qEventLoop (#3046) 2025-03-20 09:34:26 +00:00
Trial97
59a816c696 fix duplicate optional mods dialog appearing when updating a modpack 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>

tmp
 2025-03-06 10:19:38 +02:00
Trial97
3da94eeea2 removed some unused QNetworkAccessManager references 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2025-03-03 08:31:39 +02:00
Trial97
7d3238d234 rename variables 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2025-01-17 21:09:44 +02:00
Trial97
7cb8deeb90 feat: updated flame mod resolution 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2025-01-16 17:05:36 +02:00
Trial97
7dde35fef2 Add settings to control the if prism should move the downloaded mods 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-12-20 19:57:09 +02:00
timoreo
736ecf266d Merge pull request #3019 from Trial97/task_parent 
fixed double deletion for tasks
 2024-11-15 06:19:40 +01:00
Trial97
ce61ed2f86 Fix file remaingin open after program closure 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-11-14 13:27:16 +02:00
Trial97
2b590f24ed remove task parent from constuctor 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-11-01 00:11:45 +02:00
Trial97
0e80aae1b8 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into lambda 2024-10-30 19:35:25 +02:00
Trial97
82bffabb69 do not capture by default all values in lambdas 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-10-30 18:16:43 +02:00
TheKodeToad
3fae659b30 Merge remote-tracking branch 'upstream/develop' into resource-meta 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-10-08 17:15:42 +01:00
Trial97
09d258670a create mod meta information when importing curseforge pack 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-28 19:26:11 +03:00
Alexandru Ionut Tripon
7d418a32e7 Merge pull request #2425 from Trial97/win_char 
improve invalid path name
 2024-06-10 12:11:21 +03:00
Trial97
a7a1b28765 improve invalid path name 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-30 13:49:23 +03:00
Trial97
ba947993c2 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_zip 2024-05-18 12:47:01 +03:00
Trial97
e068120375 Fix invalid characters filename download on windows 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-04-30 22:56:40 +03:00
Trial97
3a4f82ffd1 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_zip 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-04-24 00:21:39 +03:00
Alexandru Ionut Tripon
29bf6cc68c Update launcher/modplatform/flame/FlameInstanceCreationTask.cpp 
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2024-02-10 23:15:26 +02:00
Trial97
830ce246e1 Fixed curseforge neoforge import for 1.20.1 versions 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-02-10 13:48:02 +02:00
Trial97
5099061a5c Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_zip 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-02-10 11:02:29 +02:00
Sefa Eyeoglu
f8a6a099c7 Merge pull request #1732 from Trial97/update_file2 2023-12-11 11:08:07 +01:00
Trial97
5afe6600ee use fs::move instead of qt rename 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-04 16:49:35 +02:00
Trial97
03a27d5b5a Updated Managed Packs 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-19 19:47:48 +03:00
Trial97
30f73a0696 Merge branch 'fail_concurrent_task' of github.com:Trial97/PrismLauncher into concurrent 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-18 18:08:31 +03:00
Trial97
6bbff310bc Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feat/launcher-updater 2023-10-15 17:42:39 +03:00
Trial97
abbac5c26c Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fail_concurrent_task 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-09-01 22:28:59 +03:00
TheKodeToad
befa3baa6a Merge branch 'develop' into feat/launcher-updater 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-08-30 11:47:33 +01:00
Trial97
2990c5d0c9 Added optional mods dialog 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-24 12:44:11 +03:00
Trial97
7ab391904a Flame support for neoforge 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-17 22:23:34 +02:00
Trial97
1faf741004 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feat/launcher-updater 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-15 13:29:42 +03:00
Trial97
42a6c670c7 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fail_concurrent_task 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-15 12:52:59 +03:00
Trial97
0ba88ff138 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into staging 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-15 00:33:24 +03:00
Trial97
b3da35be74 Fixed curseforge import 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-10 12:19:38 +03:00
Trial97
5981e7815a Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fail_concurrent_task 2023-08-05 19:06:01 +03:00
Rachel Powers
5a9f780cf8 fix(FlameInstanceCreationTask): include Net::Apidownload 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-07-31 22:36:13 -07:00
Rachel Powers
2d1197f59f Merge branch 'develop' into refactor/net-split-headers-to-proxy-class 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-07-31 22:26:20 -07:00
Rachel Powers
1e947ca893 fix(flame creation task): import ApiDownload 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-07-30 15:42:15 -07:00
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
seth
af59c41713 fix: typo in task.h 
Signed-off-by: seth <getchoo@tuta.io>
 2023-07-26 16:20:30 -04:00
Trial97
f8d9cd9a03 use range for 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-19 23:08:16 +03:00
Trial97
f393aa684e wait to load metadata 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-18 23:59:43 +03: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
Trial97
a7e0c9db96 connected failed event for some tasks 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-15 12:01:07 +03: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
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
Rachel Powers
df4fd7df7f Merge remote-tracking branch 'upstream/develop' into refactor/net-split-headers-to-proxy-class 2023-06-25 12:43:48 -07:00
Rachel Powers
9c10965997 refactor: split out setting api headers for downloads 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-06-25 11:09:25 -07:00
Trial97
85bbab0e92 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into net_job_crash 2023-06-23 14:38:30 +03:00