Trial97
|
45463dcd75
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_zip
|
2024-06-04 11:04:02 +03:00 |
|
Trial97
|
f4f0a61bf2
|
fix vanilla technic modpacks
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-31 16:15:12 +03:00 |
|
Alexandru Ionut Tripon
|
2145f9f0ac
|
Merge pull request #1847 from Trial97/move_export2
Improvements to modlist export
|
2024-05-31 09:58:32 +03:00 |
|
Trial97
|
a7a1b28765
|
improve invalid path name
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-30 13:49:23 +03:00 |
|
Trial97
|
e94243f99b
|
fix blocked mods api
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-30 09:56:55 +03:00 |
|
Trial97
|
5a598db608
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into disablemods
|
2024-05-18 17:40:54 +03:00 |
|
Trial97
|
5bd28e2cc8
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters
|
2024-05-18 17:11:41 +03:00 |
|
Trial97
|
ba947993c2
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_zip
|
2024-05-18 12:47:01 +03:00 |
|
Tayou
|
acd23ff163
|
Merge pull request #2402 from Trial97/refactor_auth
Improve Microsoft login
|
2024-05-18 11:07:16 +02:00 |
|
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
|
3336f8107c
|
Removed AuthRequest and NetAction
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-14 00:21: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
|
e07e182e95
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters
|
2024-04-24 23:51:43 +03: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
|
d88fb266a5
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into move_export2
|
2024-04-20 17:42:58 +03:00 |
|
Trial97
|
8121a6536b
|
Fixed pack update
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-04-12 23:45:31 +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 |
|
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
|
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 |
|
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 |
|
Trial97
|
031a9f4738
|
Replaced QFile::remove with FS::deletePath
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-02-10 11:03:51 +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 |
|
Trial97
|
6b637a8797
|
Display minecraft version if not mentioned for modrinth packs
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-01-22 22:32:42 +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 |
|
Trial97
|
763eab6b96
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters
|
2023-12-13 14:48:31 +02:00 |
|
Trial97
|
4498d32cc0
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into move_export2
|
2023-12-13 14:37:02 +02:00 |
|
Sefa Eyeoglu
|
f8a6a099c7
|
Merge pull request #1732 from Trial97/update_file2
|
2023-12-11 11:08:07 +01:00 |
|
Trial97
|
657416fe30
|
Removed header
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-12-03 21:29:02 +02:00 |
|
Trial97
|
20e0cb43b9
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into concurrent
|
2023-11-23 23:58:47 +02:00 |
|
Trial97
|
2db5677281
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters
|
2023-11-23 23:57:44 +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
|
afcdb7595c
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into move_export2
|
2023-11-23 16:01:54 +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 |
|
Sefa Eyeoglu
|
b42434bcb6
|
Merge remote-tracking branch 'upstream/develop' into const-in-declarations
|
2023-11-23 09:06:23 +01: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 |
|
Trial97
|
bedb4da869
|
Added filename to the modlist export
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-11-14 19:37:23 +02:00 |
|
Trial97
|
926942a973
|
Fixed modrinth sort swap
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-11-10 20:00:35 +02: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 |
|
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
|
d151e97e3a
|
Fixed some headers
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-10-21 22:40:37 +03:00 |
|
Trial97
|
41c9ca4f8a
|
Added categories filter
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-10-21 22:15:07 +03:00 |
|
Trial97
|
9aac8e389f
|
made release type visible
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-10-21 18:48:55 +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
|
fea4c4eba8
|
Updated filters
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-10-18 09:00:45 +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 |
|
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
|
fe14e48d72
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into disablemods
|
2023-10-15 21:06:40 +03: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 |
|
Trial97
|
749975e8ef
|
made side and loaders visible to user
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-10-15 12:46:23 +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
|
32eaaa25d9
|
removed the better release for modrinth modpacks
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-10-13 00:04:36 +03: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 |
|
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
|
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
|
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 |
|