Trial97
|
f9ebcb5d2e
|
Merge branch 'refactor/net-split-headers-to-proxy-class' of https://github.com/Ryex/PrismLauncher into refactor/NetActions
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-05 19:16:57 +03:00 |
|
Rachel Powers
|
f19e8dd086
|
Apply suggestions from code review
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
|
2023-08-01 18:53:51 -07:00 |
|
Rachel Powers
|
5a9f780cf8
|
fix(FlameInstanceCreationTask): include Net::Apidownload
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
|
2023-07-31 22:36:13 -07:00 |
|
Rachel Powers
|
2d1197f59f
|
Merge branch 'develop' into refactor/net-split-headers-to-proxy-class
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
|
2023-07-31 22:26:20 -07:00 |
|
Sefa Eyeoglu
|
566425166b
|
Merge pull request #1449 from Trial97/tehnic
Reintroduce parsing of INI files
|
2023-07-30 09:47:40 +02:00 |
|
Sefa Eyeoglu
|
bdec11c501
|
Merge pull request #1437 from LostLuma/instance-export-ignore-caches-2
|
2023-07-27 09:40:31 +02:00 |
|
LostLuma
|
4a9ea832ff
|
Ignore cache files entirely, also apply to modpack export
Signed-off-by: LostLuma <lilly@lostluma.net>
|
2023-07-27 01:42:14 +02:00 |
|
Trial97
|
b15f689ccf
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into refactor/NetActions
|
2023-07-27 00:03:42 +03:00 |
|
Trial97
|
1e82cb6a7c
|
fix: add support for QByteArray inifile
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-26 23:56:01 +03:00 |
|
seth
|
af59c41713
|
fix: typo in task.h
Signed-off-by: seth <getchoo@tuta.io>
|
2023-07-26 16:20:30 -04:00 |
|
LostLuma
|
a9fefb2eeb
|
Address review comments
Signed-off-by: LostLuma <lilly@lostluma.net>
|
2023-07-26 15:22:22 +02:00 |
|
TheKodeToad
|
ce2d2c9f32
|
Merge pull request #1427 from tjw123hh/develop
Add some missing strings to translations
|
2023-07-26 13:41:54 +01:00 |
|
LostLuma
|
361583edfc
|
Ignore cache files when exporting instances
Signed-off-by: LostLuma <lilly@lostluma.net>
|
2023-07-26 04:23:01 +02:00 |
|
tjw123hh
|
280f041acb
|
Delete some incorrect notr="true" tags
Signed-off-by: tjw123hh <tjw123hh@outlook.com>
|
2023-07-25 17:35:31 +08:00 |
|
Sefa Eyeoglu
|
4f00012268
|
Merge pull request #1426 from TheKodeToad/token-censor-fix
|
2023-07-24 20:41:23 +02:00 |
|
TheKodeToad
|
f505d43fc0
|
Fix token "0" being replaced
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-07-24 13:43:26 +01:00 |
|
tjw123hh
|
6a01c277e8
|
Delete some incorrect tags
|
2023-07-24 20:41:22 +08:00 |
|
Trial97
|
b31644e228
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into refactor/NetActions
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-22 18:16:03 +03:00 |
|
TheKodeToad
|
6ffcfcd7e9
|
Merge pull request #1402 from Trial97/flame_import
feat:made flame instace creation use metadata for recommended version
|
2023-07-22 11:14:12 +01:00 |
|
Trial97
|
f8d9cd9a03
|
use range for
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-19 23:08:16 +03:00 |
|
Trial97
|
b7bccb9058
|
removed subdirectory flag
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-19 12:27:02 +03:00 |
|
Trial97
|
f046bd7d50
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into catpacks
|
2023-07-19 12:26:12 +03:00 |
|
TheKodeToad
|
593f452986
|
Merge pull request #1399 from Scrumplex/offline-uuid
fix: generate predictable UUIDs for offline accounts
|
2023-07-19 10:16:27 +01:00 |
|
Trial97
|
f393aa684e
|
wait to load metadata
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-18 23:59:43 +03:00 |
|
Trial97
|
4c319c8f4f
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into flame_import
|
2023-07-18 23:49:52 +03:00 |
|
Sefa Eyeoglu
|
3728cbb62a
|
Merge pull request #1397 from Gaming32/develop
|
2023-07-18 22:47:55 +02:00 |
|
Sefa Eyeoglu
|
3fbc25155b
|
Merge pull request #1362 from Trial97/fix_warning
|
2023-07-18 22:28:27 +02:00 |
|
Sefa Eyeoglu
|
ecac05b2fc
|
Merge pull request #1378 from Trial97/prism_export
Added progress bar to Prism instance export
|
2023-07-18 22:26:56 +02:00 |
|
Trial97
|
391497645f
|
feat:made flame instace creation use metadata for recommended version
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-18 22:33:39 +03:00 |
|
Sefa Eyeoglu
|
f8fcb98c68
|
fix: generate predictable UUIDs for offline accounts
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-07-18 10:07:35 +02:00 |
|
Josiah Glosson
|
1fbb41f5e2
|
Make Launch Offline not launch online in 1.6+
Signed-off-by: Josiah Glosson <soujournme@gmail.com>
|
2023-07-17 17:07:06 -05:00 |
|
TheKodeToad
|
01afa8957f
|
Merge pull request #1387 from Scrumplex/fix-quilt-beacon
Check if any modloader is installed
|
2023-07-17 17:40:42 +01:00 |
|
Trial97
|
b0940d696b
|
Added QFutureWatcher
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
abort
forgot
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-17 17:52:00 +03:00 |
|
Trial97
|
fe73d696cb
|
replace emplace with insert
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-17 17:24:29 +03:00 |
|
Trial97
|
2ea4a78541
|
Upgraded ExportToZipTask
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-17 17:24:23 +03:00 |
|
Sefa Eyeoglu
|
2be630904f
|
fix: don't take modloaders by reference
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-07-17 14:33:01 +02:00 |
|
Tayou
|
e8c44e700d
|
Merge pull request #1286 from TayouVR/better-instance-group-separator
|
2023-07-17 11:55:31 +02:00 |
|
Sefa Eyeoglu
|
54a091ca59
|
fix: check if any modloader is installed
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-07-17 10:09:01 +02:00 |
|
Trial97
|
ec32618e11
|
reveted back to add years
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-17 10:20:22 +03:00 |
|
Sefa Eyeoglu
|
aaf1726965
|
Merge pull request #1357 from getchoo/quilt-beacon
feat: add toggle for quilt beacon
|
2023-07-17 06:42:46 +02:00 |
|
seth
|
5e0df9b696
|
Merge pull request #1276 from Scrumplex/print-build-platform
Print build platform on launch
|
2023-07-16 17:15:55 -04:00 |
|
Alexandru Ionut Tripon
|
ec41252535
|
Update launcher/MMCZip.h
Co-authored-by: Tayou <31988415+TayouVR@users.noreply.github.com>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
|
2023-07-16 23:47:54 +03:00 |
|
Alexandru Ionut Tripon
|
4df9df03ab
|
Update launcher/MMCZip.cpp
Co-authored-by: Tayou <31988415+TayouVR@users.noreply.github.com>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
|
2023-07-16 23:47:47 +03:00 |
|
Trial97
|
79222a56e3
|
use shared pointer
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
use shared pointer
|
2023-07-16 21:14:39 +03:00 |
|
Trial97
|
cadb7142f0
|
Added progress bar to Prism instance export
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-16 20:57:57 +03:00 |
|
Trial97
|
251055302e
|
format
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-16 20:53:58 +03:00 |
|
Trial97
|
de30a72c4e
|
made the date a object
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-16 15:16:16 +03:00 |
|
Trial97
|
0a956bbc73
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into catpacks
|
2023-07-16 14:18:26 +03:00 |
|
Trial97
|
1e9a596908
|
simplified code in cat packs
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-16 14:18:17 +03:00 |
|
Sefa Eyeoglu
|
fcdd9ea986
|
Merge pull request #1246 from Trial97/export
|
2023-07-16 12:24:42 +02:00 |
|