Mirrors/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2025-06-12 05:07:46 +02:00
Code Issues Packages Projects Releases Wiki Activity
8,836 Commits 9 Branches 38 Tags
6fc386cfe9ab9d1c9ae777550b8adf6ca195b211
Commit Graph

367 Commits

Author SHA1 Message Date
Trial97
30ce8ecb5f Fixed imports 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-04-30 23:20:24 +03:00
Trial97
5400c24c73 Ensure valid file names for resource names 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-04-30 23:04:50 +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
a5b059ebad Fixed curseforge export 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-04-29 00:27:15 +03:00
TheKodeToad
60bd8104c4 Merge remote-tracking branch 'upstream/develop' into resource-meta 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-04-26 01:53:51 +01: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
Trial97
a0eba1ace6 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters 2024-03-31 21:15:49 +03:00
Trial97
28cfd31269 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into disablemods 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-03-29 10:30:42 +02:00
Trial97
3c12e27226 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters 2024-03-23 23:53:25 +02:00
Trial97
05487152fe Fixed curesforge export 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-03-17 20:53:26 +02:00
Trial97
fdaaee64d1 Fixed curseforge neoforge export for 1.20.1 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-02-11 21:49:28 +02: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
TheKodeToad
82d0f204e2 De-OOP ProviderCapabilities 
There was no reason for it to be a class, and imo it created quite a code-smell needing to initialise it everywhere.

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-01-26 03:06:05 +00:00
TheKodeToad
97ee0a19b5 Refactor updating mechanisms to work with all resources 
Summary:
- It compiles
- I need to go to bed

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-01-26 02:53:57 +00:00
TheKodeToad
35b5c8097c Merge branch 'develop' into resource-meta 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-01-23 23:20:40 +00:00
Trial97
763eab6b96 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters 2023-12-13 14:48:31 +02:00
Sefa Eyeoglu
f8a6a099c7 Merge pull request #1732 from Trial97/update_file2 2023-12-11 11:08:07 +01:00
Trial97
20e0cb43b9 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into concurrent 2023-11-23 23:58:47 +02:00
Trial97
80383d237a Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into disablemods 2023-11-23 13:38:11 +02:00
Trial97
c2fc2d330b Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_zip 2023-11-23 12:57:31 +02:00
Trial97
d8c5ed55c2 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into update_file2 2023-11-23 12:00:18 +02:00
Trial97
2bfb5fc138 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-17 22:26:17 +02:00
TheKodeToad
f4940e26c6 Merge remote-tracking branch 'upstream/develop' into resource-meta 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-11-12 19:02:14 +00: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
LocalSpook
54305397e4 Localize sorting options for resource and shader packs 
Signed-off-by: LocalSpook <56512186+LocalSpook@users.noreply.github.com>
 2023-10-28 12:50:40 -07:00
Trial97
41c9ca4f8a Added categories filter 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-21 22:15:07 +03:00
Trial97
9e85297f7a Connected filters 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-21 18:28:33 +03: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
b54376062e Added mcVersion column 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-17 19:25:01 +03:00
Trial97
9001d9eb75 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters 2023-10-17 18:32:18 +03:00
Trial97
fe14e48d72 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into disablemods 2023-10-15 21:06:40 +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
ab725eeb18 corected side and added loaders 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-15 11:52:28 +03:00
Tayou
7015b8f7b2 Merge pull request #1563 from Trial97/modrinth_pack 
Pack import fixes and improvements
 2023-10-13 16:38:37 +02:00
Trial97
5f7513d61c Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into disablemods 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-10 19:49:40 +03:00
Trial97
7e6a08548d Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feat/launcher-updater 2023-10-09 19:58:43 +03:00
Trial97
77979b4c95 revert back the release order 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-03 17:23:26 +03:00
Trial97
4802f6950e Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feat/acknowledge_release_type 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-09-28 23:06:18 +03:00
Sefa Eyeoglu
531b58093e Merge pull request #1263 from Trial97/develop 2023-09-28 22:03:14 +02:00
Sefa Eyeoglu
2ff9ef0620 Merge pull request #1363 from Trial97/download_threads 2023-09-28 22:02:57 +02:00
Trial97
5b7c5607a9 removed flame consturctor 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-09-28 22:53:40 +03:00
Trial97
9acbf98f94 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feat/acknowledge_release_type 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-09-28 22:50:12 +03:00
Trial97
ebde563648 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feat/launcher-updater 2023-09-26 20:16:46 +03:00
TheKodeToad
94c1cd6bcf CurseForge shader downloading 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-09-04 14:15:37 +01: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
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
TheKodeToad
93876e27f8 Generalise resource metadata 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-08-31 17:54:22 +01:00