Trial97
|
1495bfb73e
|
Made custom template enabled all time
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-14 23:41:37 +03:00 |
|
Trial97
|
9b02c31f8d
|
escaped text for html export
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-14 23:35:18 +03:00 |
|
Trial97
|
50dae9d4f3
|
Moved to separate functions
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-14 23:34:28 +03:00 |
|
Trial97
|
9a3931dac6
|
Added json and csv format
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-14 23:34:21 +03:00 |
|
Trial97
|
515197fba2
|
fix: html sintax for modlist export
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-14 23:34:03 +03:00 |
|
Rachel Powers
|
37fb52aada
|
Merge pull request #1351 from Trial97/ftb_import
fixed substatus on ftb_import
|
2023-07-14 12:41:21 -07:00 |
|
seth
|
094af0f78f
|
Merge pull request #1336 from Ryex/packaging/fix-duplicate-share-directories
packaging: fix duplicate share directories (use only lowercase)
|
2023-07-14 14:19:44 -04:00 |
|
Rachel Powers
|
3487e1cb64
|
Update launcher/Application.cpp
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
|
2023-07-14 03:56:18 -07:00 |
|
Trial97
|
440afcedb0
|
fixed warning
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-14 13:32:18 +03:00 |
|
Trial97
|
b0a21c9389
|
insert header
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-14 13:31:28 +03:00 |
|
Trial97
|
fc4a1ef193
|
format
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-14 13:31:13 +03:00 |
|
Trial97
|
c8533c0b0d
|
fixed substatus on ftb_import
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-14 12:29:03 +03:00 |
|
Trial97
|
b0a018d823
|
format
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-14 12:28:23 +03:00 |
|
Sefa Eyeoglu
|
3becd4386b
|
Merge pull request #1306 from Ryex/ci/address-sanitiser_on_debug_builds
|
2023-07-14 10:11:34 +02:00 |
|
seth
|
3099a70edc
|
Merge pull request #1335 from Ryex/fix/gh-1322-old-zip-mods-in-wrong-place
fix(flame install): don't assume .zip is a resource pack. default to mod
|
2023-07-14 00:16:43 -04:00 |
|
Rachel Powers
|
cde85947c7
|
Update launcher/minecraft/mod/tasks/LocalResourceParse.cpp
Co-authored-by: seth <getchoo@tuta.io>
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
|
2023-07-13 21:12:12 -07:00 |
|
Rachel Powers
|
5d10045cc8
|
Merge pull request #1352 from Trial97/crash_after_abort
Do not reset shared pointer if it's already empty
|
2023-07-13 21:11:47 -07:00 |
|
Rachel Powers
|
95b300f1ea
|
packaging: use PascalCase folder name instead
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
|
2023-07-13 19:56:36 -07:00 |
|
Trial97
|
bd6e8533ad
|
send by reference
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-13 19:58:08 +03:00 |
|
Trial97
|
843c2d67eb
|
Added FTBAPP Import
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-13 18:41:29 +03:00 |
|
seth
|
89aaedc06c
|
feat: add toggle for quilt beacon
Signed-off-by: seth <getchoo@tuta.io>
|
2023-07-12 21:10:48 -04:00 |
|
Tayou
|
94d4d12ee0
|
Merge pull request #1345 from Trial97/time2
feat:Added option to use system locale
|
2023-07-13 01:56:12 +02:00 |
|
Trial97
|
76cc8ce043
|
renamed setting
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-12 21:05:13 +03:00 |
|
Rachel Powers
|
9499066375
|
Merge pull request #1350 from Trial97/fix_managed_pack_crash
fixed crash if no version is loaded on managed page
|
2023-07-12 09:55:31 -07:00 |
|
Trial97
|
25f7cf23d3
|
the other place
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-12 19:55:11 +03:00 |
|
Trial97
|
9ee68b9268
|
small pointer check
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-12 18:12:31 +03:00 |
|
Sefa Eyeoglu
|
06a7d447f6
|
Merge pull request #1333 from Ryex/fix/null_instance_edit_crash
|
2023-07-12 15:53:46 +02:00 |
|
Trial97
|
766e833a73
|
fixed crash if no version is loaded
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-12 16:25:05 +03:00 |
|
Trial97
|
634612ae81
|
added missing header
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-11 18:20:44 +03:00 |
|
Trial97
|
f0d2aab784
|
feat:Added option to use system locale
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-11 18:05:43 +03:00 |
|
seth
|
640aaa8c23
|
Merge pull request #1331 from TheKodeToad/hungry-trash
Fix updating trashing resources
|
2023-07-10 16:31:43 -04:00 |
|
Rachel Powers
|
1aa5fa03f9
|
Update launcher/ui/MainWindow.cpp
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
|
2023-07-10 12:05:01 -07:00 |
|
Nathan
|
99ba02afb6
|
Shortcuts on macOS (#1081)
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-07-10 20:26:25 +02:00 |
|
TheKodeToad
|
9aedb5afff
|
Merge pull request #1334 from TheKodeToad/litemod-dl
LiteMod downloading
|
2023-07-10 16:42:38 +01:00 |
|
TheKodeToad
|
e21756ea8c
|
Remove direct launch
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-07-10 16:22:37 +01:00 |
|
Trial97
|
35ccfdb799
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into catpacks
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-10 16:25:15 +03:00 |
|
TheKodeToad
|
91c9082d19
|
Merge pull request #1249 from Trial97/curse
Curseforge modpack export
|
2023-07-10 14:20:29 +01:00 |
|
TheKodeToad
|
4f4ccdaa59
|
Merge pull request #1338 from Trial97/unlockVersionPage
feat:unlocked versions page
|
2023-07-10 13:06:32 +01:00 |
|
Rachel Powers
|
01e058d8c1
|
Merge pull request #1337 from getchoo/fix-flake-workflow
fix(actions): give update-flake content write perms
|
2023-07-09 14:11:33 -07:00 |
|
TheKodeToad
|
f816e3cd3f
|
Merge pull request #1241 from Trial97/settings
Allow editing of running instances
|
2023-07-09 22:10:43 +01:00 |
|
Rachel Powers
|
49109b9213
|
Merge pull request #1332 from TheKodeToad/widebar-pain
Fix crash when editing instance and prevent similar crashes in future
|
2023-07-09 14:07:34 -07:00 |
|
Rachel Powers
|
d43399c2b4
|
Merge pull request #1321 from TheKodeToad/mr-optional
Optional mods in mrpack export
|
2023-07-09 14:03:47 -07:00 |
|
Trial97
|
308877aa8f
|
removed redundant code
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-09 23:18:38 +03:00 |
|
Trial97
|
159f14c076
|
feat:unlocked versions page
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-09 22:47:38 +03:00 |
|
seth
|
8e4de055b8
|
chore(actions): only run update-flake in our repo
Signed-off-by: seth <getchoo@tuta.io>
|
2023-07-09 15:43:54 -04:00 |
|
Trial97
|
d7f4e40f85
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into curse
|
2023-07-09 19:38:17 +03:00 |
|
TheKodeToad
|
6e2fcc9e11
|
Replace string manipulation in favour of QFileInfo
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-07-09 12:08:15 +01:00 |
|
seth
|
0d31e31282
|
fix(actions): give update-flake content write perms
Signed-off-by: seth <getchoo@tuta.io>
|
2023-07-09 01:56:21 -04:00 |
|
Rachel Powers
|
4dc4c589ba
|
packaging: fix duplicate share directories (use only lowercase)
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
|
2023-07-08 15:44:09 -07:00 |
|
TheKodeToad
|
d53d58a5d4
|
LiteMod downloading
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-07-08 22:16:43 +01:00 |
|