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

273 Commits

Author SHA1 Message Date
Trial97
6bbff310bc Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feat/launcher-updater 2023-10-15 17:42:39 +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
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
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
befa3baa6a Merge branch 'develop' into feat/launcher-updater 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-08-30 11:47:33 +01:00
Sefa Eyeoglu
fbf6833124 Merge pull request #1519 from TheKodeToad/better-export-pack 2023-08-28 10:29:32 +02: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
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
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
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
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
Trial97
e6ba2f4970 Added loaders check on versions load 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-23 12:52:51 +03:00
Trial97
f8f9ffa118 added loaders for flame version 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-23 11:33:45 +03:00
Trial97
4704c522e0 moved modloaderTypes to ModPlatform 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-23 10:26:57 +03:00
Trial97
254444470f renamed enum type 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-20 16:40:58 +03:00
Trial97
0138cd65cb feat:neoforge can download forge mods 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-19 09:00:59 +03:00
Trial97
ab6301d5a1 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop 2023-08-19 00:38:40 +03:00
Sefa Eyeoglu
3098aecf97 Merge pull request #1498 from Scrumplex/neoforge 2023-08-18 22:56:55 +02:00
Trial97
7ab391904a Flame support for neoforge 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-17 22:23:34 +02:00
Trial97
4a1d85f999 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop 2023-08-17 14:23:37 +03:00
Trial97
5e2d1ffdfb removed line 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-17 00:23:53 +03: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
cf27d2f9ab Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into download_threads 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-15 12:49:21 +03:00
Trial97
c94ee67077 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into curseforge-url-handle3 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-15 12:16:00 +03:00
Sefa Eyeoglu
62c14cea2a fix: allow NeoForge in resource APIs 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-08-15 11:06:14 +02:00
Sefa Eyeoglu
3a0aa353cc feat: add NeoForge to ModLoaderType 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-08-15 11:06:13 +02: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
Sefa Eyeoglu
215d7dbb74 chore: update license headers 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-08-14 18:17:05 +02:00
Sefa Eyeoglu
91ba4cf75e chore: reformat 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-08-14 18:16:53 +02:00
TheKodeToad
5056a51c18 Improvements and refinements to pack export 
- Persist fields
- Toggle optional files

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-08-12 21:20:51 +01:00
Alexandru Ionut Tripon
b3b2e9df35 Merge branch 'develop' into feat/acknowledge_release_type 
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2023-08-12 12:42:30 +03:00
Sefa Eyeoglu
019e5ca3e8 fix: use ApiDownload for CF URL handling 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-08-12 11:11:58 +02:00
Sefa Eyeoglu
ef6f9487f4 Merge remote-tracking branch 'upstream/staging' into chore/add-compiler-warnings 2023-08-10 20:38:32 +02:00
Trial97
b3da35be74 Fixed curseforge import 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-10 12:19:38 +03:00
Sefa Eyeoglu
74fe2fb2a6 Merge remote-tracking branch 'upstream/staging' into curseforge-url-handle 2023-08-06 21:54:00 +02:00