CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,258 Commits 10 Branches 30 Tags
b446bdf4a94e7d3fc7c184354630e63f48ddbf8f
Commit Graph

3024 Commits

Author SHA1 Message Date
Sefa Eyeoglu
00af385619 Merge pull request #1572 from Trial97/catpacks2 2023-09-16 18:22:13 +02:00
Sefa Eyeoglu
bf6dc10f35 Merge pull request #1605 from TheKodeToad/flame-shaders 2023-09-16 18:20:45 +02:00
Trial97
9445a555e4 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into packwiz 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-09-10 16:24:59 +03:00
Trial97
47d1f23568 added side for modrinth mods 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-09-10 16:22:57 +03:00
Sefa Eyeoglu
d483b613b1 Merge pull request #1578 from TheKodeToad/antialiasing 2023-09-04 17:05:29 +02:00
Sefa Eyeoglu
546d49e183 Merge pull request #1530 from Trial97/metadata_delete 2023-09-04 17:02:52 +02:00
TheKodeToad
94c1cd6bcf CurseForge shader downloading 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-09-04 14:15:37 +01:00
TheKodeToad
347228a246 Legacy settings override default -> false 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-09-02 22:29:26 +01:00
TheKodeToad
1213a5ab46 Merge remote-tracking branch 'upstream/develop' into skinfix 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-09-02 22:27:57 +01:00
Trial97
17f696bffc small tweaks to atl icons 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-09-01 22:25:15 +03:00
Trial97
e095780cc3 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into modrinth_pack 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-09-01 21:36:28 +03:00
Trial97
30ff417074 fix: make cached instead of file for ftb pack import 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-09-01 16:25:49 +03:00
TheKodeToad
25ce11d85d Merge pull request #1539 from Trial97/refactor_modpack_ux 
Improvements to modpack UX
 2023-08-31 14:58:54 +01: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
TheKodeToad
f23a8e4b4b Enable antialiasing for mod and pack icons 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-08-29 23:34:19 +01:00
TheKodeToad
8c30cb3706 Fix CI 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-08-29 13:27:06 +01:00
TheKodeToad
c1855c6ce3 Merge branch 'develop' into rename-groups 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-08-29 12:41:40 +01:00
TheKodeToad
0e67686295 Hide index folder in pack export dialog 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-08-28 17:25:07 +01:00
TheKodeToad
e98bca4749 Fix cancelling pack save 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-08-28 17:09:40 +01:00
Trial97
211865a1e1 handle gracefully the upload abort 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-28 13:31:19 +03:00
Sefa Eyeoglu
fbf6833124 Merge pull request #1519 from TheKodeToad/better-export-pack 2023-08-28 10:29:32 +02:00
Trial97
5d70f4dbca removed if 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-28 08:50:10 +03:00
Trial97
07d8598638 added catpacks tests 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-27 23:40:32 +03:00
Trial97
79652799bd Made text smaller 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-27 21:30:46 +03:00
Trial97
630145a1d0 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into welcome_background 2023-08-27 21:03:21 +03:00
Trial97
0680d2dceb Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-27 20:41:56 +03:00
TheKodeToad
9110fbf282 Merge pull request #1560 from Trial97/curse_multiple_loaders2 
Add suport for flame multiple loaders
 2023-08-27 18:21:14 +01:00
TheKodeToad
e3b04d10cf Merge pull request #1536 from Trial97/time3 
Allow showing playtime in hours
 2023-08-27 18:14:04 +01:00
Trial97
8c607ae734 removed extra if 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-27 20:02:12 +03:00
Trial97
c5aac24a93 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into curse_multiple_loaders2 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-27 15:53:35 +03:00
Trial97
4036cecfc0 Added progress widget to some modpack providers 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-27 15:04:42 +03:00
Sefa Eyeoglu
df14f88307 Merge pull request #1532 from Trial97/curseforge-url-handle 2023-08-27 12:26:57 +02:00
TheKodeToad
479335dfe0 Rewrite optional mod dialog 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-08-27 00:50:33 +01:00
TheKodeToad
d1566f2610 Merge branch 'develop' into env-vars 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-08-26 23:12:02 +01:00
Trial97
a2d44744fe do not update the metadata if mod is invalid 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-26 23:36:46 +03:00
Trial97
288d0d1fd4 Added back api loader filtering if just one is selected 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-26 22:26:01 +03:00
Trial97
abfd1a4205 minor dependency crash fix 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-25 18:35:25 +03:00
Trial97
c54fecf5d9 added condition for empty loader type 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-25 09:05:04 +03:00
Trial97
172680abf8 removed aditional header 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-24 13:42:36 +03:00
Trial97
5f3e9672cd made the loaders check more generic 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-24 13:31:57 +03:00
Trial97
f897b14e3e changed technic icon name retrival 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-24 13:05:27 +03:00
Trial97
bb4b89470d fixed icon importing 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-24 12:46:23 +03:00
Trial97
2990c5d0c9 Added optional mods dialog 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-24 12:44:11 +03:00
Trial97
ea384d59fb use qt separtor for file path 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-24 12:41:37 +03:00
Trial97
6c0492c0d1 return 0 for any 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-23 21:09:32 +03:00
Trial97
1515607060 updated getMappedModLoader 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-23 20:16:51 +03:00
Sefa Eyeoglu
85c23b26de chore: reformat 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-08-23 13:46:23 +02:00
Trial97
6178e5a975 reverted change for optional 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-23 13:55:38 +03:00
Trial97
aa065f2b51 Updated dependency resolution 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-23 13:28:23 +03:00
Sefa Eyeoglu
2283498ccb Merge pull request #1552 from Trial97/memory_quick_setup 2023-08-23 11:56:53 +02:00