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 |
|