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 |
|
Sefa Eyeoglu
|
b54d1651ab
|
Merge pull request #1373 from Scrumplex/backport-bot
|
2023-07-16 19:42:09 +02:00 |
|
Trial97
|
002430db46
|
added path to flatpack
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-16 15:43:47 +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
|
b9568279dc
|
Merge pull request #1010 from TayouVR/add_default_editorconfig
|
2023-07-16 12:30:22 +02:00 |
|
Sefa Eyeoglu
|
fcdd9ea986
|
Merge pull request #1246 from Trial97/export
|
2023-07-16 12:24:42 +02:00 |
|
Sefa Eyeoglu
|
c145bfa524
|
Merge pull request #1369 from Trial97/autoselect
|
2023-07-16 12:21:17 +02:00 |
|
Sefa Eyeoglu
|
18ebc858fd
|
feat(actions): add backport action
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-07-16 11:47:54 +02:00 |
|
github-actions[bot]
|
6597a5c860
|
chore(nix): update lockfile
Flake lock file updates:
• Updated input 'flake-parts':
'github:hercules-ci/flake-parts/267149c58a14d15f7f81b4d737308421de9d7152' (2023-07-01)
→ 'github:hercules-ci/flake-parts/8e8d955c22df93dbe24f19ea04f47a74adbdc5ec' (2023-07-04)
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/cd99c2b3c9f160cd004318e0697f90bbd5960825' (2023-07-01)
→ 'github:nixos/nixpkgs/46ed466081b9cad1125b11f11a2af5cc40b942c7' (2023-07-15)
• Updated input 'pre-commit-hooks':
'github:cachix/pre-commit-hooks.nix/42587d3414d1747999a5f71e92a83cf6547b62da' (2023-07-03)
→ 'github:cachix/pre-commit-hooks.nix/5e28316db471d1ac234beb70031b635437421dd6' (2023-07-14)
|
2023-07-16 00:23:55 +00:00 |
|
Trial97
|
a3ffa64550
|
Upgraded pack changelog
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-16 01:59:08 +03:00 |
|
Tayou
|
a6305ac891
|
Merge pull request #1368 from Trial97/crash_curse_import
|
2023-07-15 23:13:00 +02:00 |
|
Trial97
|
06fc8358d9
|
auto focus search line on resource download
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-15 23:57:32 +03:00 |
|
Trial97
|
c346d875a2
|
make FileResolvingTask accept empty modlist
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-15 23:26:52 +03:00 |
|
seth
|
a2a09ffe01
|
chore: better explain quilt loader beacon
Signed-off-by: seth <getchoo@tuta.io>
|
2023-07-15 14:25:05 -04:00 |
|
Alexandru Ionut Tripon
|
da87e825a1
|
Update launcher/ui/dialogs/ExportToModListDialog.ui
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
|
2023-07-15 15:59:19 +03:00 |
|
Trial97
|
7befd63cce
|
fixed settings
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-15 00:28:58 +03:00 |
|
Alexandru Ionut Tripon
|
2c2c39b42c
|
Update launcher/modplatform/import_ftb/PackInstallTask.cpp
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
|
2023-07-15 00:17:48 +03:00 |
|
Alexandru Ionut Tripon
|
0692cbe701
|
Update launcher/modplatform/import_ftb/PackInstallTask.cpp
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
|
2023-07-15 00:17:32 +03:00 |
|
Trial97
|
ab10524cd7
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into export
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-14 23:45:40 +03:00 |
|
Trial97
|
1ccfba13eb
|
renames
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-14 23:41:51 +03:00 |
|
Trial97
|
b9ed8283b7
|
Added buttons
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-14 23:41:45 +03:00 |
|
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 |
|
Trial97
|
149b6d59cf
|
fixed tests
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-14 23:22:11 +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 |
|
Trial97
|
db9f5f44e0
|
Split in two the options
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-14 22:26:22 +03: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 |
|
Trial97
|
cebb4dd17a
|
made the number of concurrent tasks configurable
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-14 20:39:53 +03: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
|
520594e529
|
Merge branch 'develop' into chore/add-compiler-warnings
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
|
2023-07-13 20:05:16 -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 |
|