ONIMAI-SMP/ShatteredPrism
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity
7,485 Commits 4 Branches 5 Tags 40 MiB
d9b133a28d
Commit Graph

605 Commits

Author SHA1 Message Date
chouzz
ca3516d26d Add totalTimePlayed for FTBApp import 
Signed-off-by: chouzz <zhouhua852@gmail.com>
(cherry picked from commit 92113e233a)
 2024-03-28 12:36:36 +00:00
Trial97
1a379280b8 Fixed curesforge export 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 05487152fe)
 2024-03-28 08:41:26 +00:00
TheKodeToad
e349e24548 Fix server side mods being marked as unsupported on client 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit 138df66355)
 2024-03-03 15:30:54 +00:00
Trial97
72c4a52119 Fixed curseforge neoforge export for 1.20.1 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit fdaaee64d1)
 2024-02-18 11:42:43 +00:00
Alexandru Ionut Tripon
8eba326f62 Update launcher/modplatform/flame/FlameInstanceCreationTask.cpp 
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
(cherry picked from commit 29bf6cc68c)
 2024-02-18 11:42:43 +00:00
Trial97
69d675dc76 Fixed curseforge neoforge import for 1.20.1 versions 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 830ce246e1)
 2024-02-18 11:42:43 +00:00
TheKodeToad
6badd694c5 Fix NetJob use-after-free 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit ded77e6183)
 2024-02-13 08:14:52 +00:00
TheKodeToad
25ba275230
Revert "[Backport release-8.x] Use minecraft instead of .minecraft for better accessibility" 2024-02-04 16:08:16 +00:00
TheKodeToad
5e3b7d88ec Use minecraft instead of .minecraft for better accessibility 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit f54ac25614)
 2024-02-01 17:16:29 +00:00
lumiscosity
f4617d7c90 fix styling 
Signed-off-by: lumiscosity <averyrudelphe@gmail.com>
(cherry picked from commit c29af83dc3)
 2024-01-03 20:46:44 +00:00
lumiscosity
568734eb8a add archived project warning 
Signed-off-by: lumiscosity <averyrudelphe@gmail.com>
(cherry picked from commit 358cf5b348)
 2024-01-03 20:46:44 +00:00
Sefa Eyeoglu
3e54d4ddbb
Merge pull request #1732 from Trial97/update_file2 2023-12-11 11:25:10 +01:00
Sefa Eyeoglu
426deb4454
Merge pull request #1694 from Trial97/concurrent 2023-12-11 11:20:17 +01:00
Sefa Eyeoglu
b42434bcb6
Merge remote-tracking branch 'upstream/develop' into const-in-declarations 2023-11-23 09:06:23 +01:00
Trial97
926942a973
Fixed modrinth sort swap 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-10 20:00:35 +02:00
LocalSpook
0de4d8902e Remove top-level const qualifiers in function declarations 
Signed-off-by: LocalSpook <56512186+LocalSpook@users.noreply.github.com>
 2023-10-28 22:12:09 -07: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
LocalSpook
5be80df1ee Replace typedef with using 
Signed-off-by: LocalSpook <56512186+LocalSpook@users.noreply.github.com>
 2023-10-24 01:36:27 -07:00
Tayou
436db23ffc
Merge pull request #1268 from Ryex/feat/launcher-updater 
Feat: Windows (And portable linux / appimage) Auto Updater
 2023-10-16 19:53:50 +02:00
Trial97
9d15255e0a
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into atlauncher_browser 2023-10-15 20:52:38 +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
Alexandru Ionut Tripon
2ab48a43dd
Merge pull request #1706 from Trial97/develop 
removed the better release for modrinth modpacks
 2023-10-15 12:24:20 +01: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
32eaaa25d9
removed the better release for modrinth modpacks 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-13 00:04:36 +03:00
Alexandru Ionut Tripon
4eb8db16f1
Merge pull request #1543 from Trial97/packwiz 
refactor packwiz file write
 2023-10-10 16:16:57 +01:00
Alexandru Ionut Tripon
a7842ecc33
Merge pull request #1591 from Trial97/ftb_import_fix 
fix: make cached instead of file for ftb pack import
 2023-10-10 16:16:40 +01: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
b8d9c3d779
format 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-09-26 20:19:35 +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
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
TheKodeToad
94c1cd6bcf
CurseForge shader downloading 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-09-04 14:15:37 +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
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
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
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