Commit Graph

632 Commits

Author SHA1 Message Date
Alexandru Ionut Tripon
eb0d0450e3
Merge pull request #2382 from Trial97/neoforge_technic
Add neoforge support for technic packs and atlauncher packs
2024-05-18 10:40:45 +03:00
Trial97
a95c1768a7
Add neoforge support for technic packs and atlauncher packs
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-05-08 14:16:12 +03:00
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
Trial97
8121a6536b
Fixed pack update
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-04-12 23:45:31 +03:00
timoreo
e4742fdb3d
Merge pull request #2221 from Trial97/fix_curseforge3
Set Forge version correctly when exporting to CurseForge
2024-03-28 09:41:11 +01:00
Tayou
0f178270be
Merge pull request #1786 from Trial97/deps_improve
Make dependency checking more lax
2024-03-27 20:42:26 +01:00
Alexandru Ionut Tripon
e212c019a0
Merge pull request #2209 from chouzz/add-totalPlayTime-ftb-import
Add totalTimePlayed for FTBApp import
2024-03-27 16:20:21 +02:00
Trial97
05487152fe
Fixed curesforge export
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-03-17 20:53:26 +02:00
chouzz
92113e233a Add totalTimePlayed for FTBApp import
Signed-off-by: chouzz <zhouhua852@gmail.com>
2024-03-09 19:36:40 +08:00
TheKodeToad
138df66355
Fix server side mods being marked as unsupported on client
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-03-01 00:03:20 +00:00
DioEgizio
99cbb5d0b2
Merge pull request #2110 from Trial97/fix_curseforge 2024-02-18 12:42:09 +01: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
TheKodeToad
ded77e6183
Fix NetJob use-after-free
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-02-11 15:43:36 +00: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
TheKodeToad
f54ac25614
Use minecraft instead of .minecraft for better accessibility
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-01-21 02:28:55 +00:00
Trial97
a7d293b3f2
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into deps_improve
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-01-10 09:17:52 +02:00
lumiscosity
c29af83dc3 fix styling
Signed-off-by: lumiscosity <averyrudelphe@gmail.com>
2023-12-23 14:16:29 +01:00
lumiscosity
358cf5b348 add archived project warning
Signed-off-by: lumiscosity <averyrudelphe@gmail.com>
2023-12-22 22:04:33 +01: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
3234bb5a8c
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into deps_improve 2023-11-23 17:05:37 +02:00
Trial97
d8c5ed55c2
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into update_file2 2023-11-23 12:00:18 +02: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
Trial97
a4978946d5
disabled lax deps
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-11-04 00:07:51 +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
Trial97
dba54332fb
fixed some asan stuf
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-10-26 18:31:52 +03:00
Trial97
04acd27dab
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into concurrent 2023-10-26 13:45:47 +03: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
Trial97
2aeb829176
removed the concurent task destructor behaivior
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-10-22 19:58:10 +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
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