Sefa Eyeoglu
|
01e17806f6
|
Merge pull request #1391 from Trial97/prism_export2
|
2023-08-02 19:27:14 +02:00 |
|
Sefa Eyeoglu
|
f561e7febf
|
Merge pull request #1476 from Scrumplex/fix-saving-metaurl
|
2023-08-02 19:24:24 +02:00 |
|
Sefa Eyeoglu
|
39d4f0df66
|
fix: don't reset meta url on launch
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-08-02 18:56:54 +02:00 |
|
Sefa Eyeoglu
|
ea56ff255d
|
Merge pull request #1339 from TheKodeToad/remove-direct-launch
|
2023-08-02 18:31:27 +02:00 |
|
Sefa Eyeoglu
|
01d3eea379
|
Merge pull request #1359 from Trial97/import
|
2023-08-02 18:25:51 +02:00 |
|
Alexandru Ionut Tripon
|
f13eccb03d
|
Update launcher/ui/pages/modplatform/import_ftb/ImportFTBPage.h
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
|
2023-08-02 19:24:58 +03:00 |
|
Sefa Eyeoglu
|
39d7bc6c24
|
Merge pull request #1294 from ashuntu/develop
|
2023-08-02 18:24:54 +02:00 |
|
TheKodeToad
|
bb039d4bc7
|
Merge pull request #1445 from Trial97/curse
feat: removed flame quilt warning
|
2023-08-02 12:55:49 +01:00 |
|
Apix
|
16e6a01881
|
fix: fix copyright year
Signed-off-by: Apix <apix0n@outlook.com>
|
2023-08-02 11:35:54 +02:00 |
|
Sefa Eyeoglu
|
566425166b
|
Merge pull request #1449 from Trial97/tehnic
Reintroduce parsing of INI files
|
2023-07-30 09:47:40 +02:00 |
|
Ash
|
d133b40b25
|
Merge branch 'PrismLauncher:develop' into develop
|
2023-07-28 21:22:35 +00: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
|
62aa7a52c4
|
fiexed conflicts
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-27 00:07:38 +03:00 |
|
Trial97
|
3c472fd7e0
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into prism_export2
|
2023-07-27 00:05:59 +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 |
|
Alexandru Ionut Tripon
|
31b62203a7
|
Update launcher/ui/MainWindow.cpp
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
|
2023-07-26 23:44:35 +03:00 |
|
seth
|
af59c41713
|
fix: typo in task.h
Signed-off-by: seth <getchoo@tuta.io>
|
2023-07-26 16:20:30 -04:00 |
|
Trial97
|
e6b4fc9182
|
removed quilt warning
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-26 21:36:40 +03: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 |
|
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
|
0b74b3833a
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import
|
2023-07-21 19:30:06 +03:00 |
|
Trial97
|
ef21879df4
|
replaced require with ensure for jvmArgs
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-21 19:30:00 +03: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 |
|
Trial97
|
477b72ad33
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into prism_export2
|
2023-07-18 23:48:02 +03:00 |
|
Sefa Eyeoglu
|
3728cbb62a
|
Merge pull request #1397 from Gaming32/develop
|
2023-07-18 22:47:55 +02:00 |
|
Trial97
|
015f88bf83
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-18 23:46:19 +03: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
|
5162203c7d
|
Merge branch 'prism_export' of github.com:Trial97/PrismLauncher into prism_export2
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-17 17:58:42 +03: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 |
|
Trial97
|
cd9310afed
|
replace emplace with insert
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-17 16:57:52 +03:00 |
|
Trial97
|
64041a84a2
|
handle file removal in ExportToZipTask
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-17 16:55:26 +03:00 |
|