6505b0c065
Move logic to task
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-03-02 19:48:41 +00:00
88ef02474f
Minify index JSON
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-03-02 17:36:44 +00:00
9ec32b2561
Fix QuaZipFile usage
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-03-02 17:36:28 +00:00
a5dd6b6cd7
Export without file urls
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-03-02 16:41:09 +00:00
46cc325f7c
Add file tree
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-03-02 11:25:36 +00:00
0fadb5a2be
Add *basic* interaction
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-03-02 10:31:53 +00:00
8b897ac714
Fix menu being set as central widget
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-03-02 10:31:53 +00:00
a80b820e94
UI for mrpack export (broken)
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-03-02 10:31:53 +00:00
4efbf22089
Prism-ify more license headers
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-03-02 10:19:42 +00:00
5c913149c8
Merge branch 'PrismLauncher:develop' into modrinth-token
2023-03-02 10:10:46 +00:00
9265c319a9
Merge pull request #788 from flowln/other_resource_downloaders_two
...
Add resource pack, texture pack and shader pack downloaders
2023-03-02 10:08:45 +00:00
cbe6eff2fa
Move Modrinth before CurseForge for consistency
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-03-02 09:28:14 +00:00
1f3d18ec12
Replace with exact match and add TODO to improve
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-03-02 09:26:00 +00:00
89255e34bd
fix: change wording of TP/RP download buttons
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-03-02 09:42:28 +01:00
a7b8092296
Add link
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-03-01 14:41:16 +00:00
1feb630520
Allow custom Modrinth API token
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-03-01 14:24:56 +00:00
651e511ff0
fix: use makeShared for importing components
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-03-01 12:33:00 +01:00
0eae9355e6
Merge pull request #889 from flowln/fix_zip_extract
2023-03-01 09:51:08 +01:00
4878f1a438
Merge pull request #735 from Scrumplex/import-component
2023-03-01 09:49:47 +01:00
d5c6704475
fix: prevent crash when aborting import task while extracting pack
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2023-02-24 20:34:43 -03:00
fda9ca1e34
fix+refactor: fix fail to import modpacks and clean up a bit
...
QDir::cleanPath called by FS::PathCombine removes the trailing '/'...
Signed-off-by: flow <flowlnlnln@gmail.com >
2023-02-24 20:09:02 -03:00
dc8109658c
review fixes
...
Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com >
2023-02-22 13:20:13 -05:00
7973b01e81
fix metadata for mods with .nilmod extension
...
Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com >
2023-02-19 17:21:53 -05:00
256fc322a8
minor cleanup
...
Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com >
2023-02-16 12:57:35 -05:00
1f0fc61b53
Merge pull request from GHSA-gq28-qx55-mh2r
...
Don't extract files outside of target path
2023-02-15 21:48:06 +01:00
9c2a3231c5
do not create nilmods folder
...
"it cant be that easy" - me, clueless
Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com >
2023-02-13 01:45:23 -05:00
80840f1fdb
fix: add missing header to Application.cpp
...
fails to compile on KISS Linux without
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-02-12 22:32:34 -07:00
c07fff7503
switch to qdcss for parsing
...
make it not horrible to look at
Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com >
2023-02-12 17:23:15 -05:00
7896dd19c1
nilmods instance page
...
mostly copied from the coremod page impl
Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com >
2023-02-11 17:46:17 -05:00
f5f2d33f93
parse nil metadata
...
Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com >
2023-02-11 17:46:17 -05:00
e70a5a47ee
fix: ignore absolute paths when extracting
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-02-10 10:46:21 +01:00
6be7eed878
fix: don't extract files outside of target path
...
This should fix a security issue regarding path traversal in zip files.
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-02-10 09:17:48 +01:00
d886d32bd8
Replace potentially ReDOSable regex
...
Signed-off-by: PandaNinjas <admin@malwarefight.gq >
2023-02-07 17:21:00 +00:00
f36c3a3f6c
Merge pull request #819 from Scrumplex/fix-launch-script
2023-02-06 16:26:54 +01:00
46c6cc2d2b
chore: add my copyright headers
...
.-.
Signed-off-by: flow <flowlnlnln@gmail.com >
2023-02-05 17:02:56 -03:00
ada5e88eb9
feat(RD): add texture pack downloader
...
This extends the resource pack downloader, with the custom behavior of
filtering the versions that shows up, to those <= 1.6. As always, Flame
is funky and requires a bit more workarounds than average.
This will also get a nice improvement when the Version parsing and
comparison PR gets merged! :D
Signed-off-by: flow <flowlnlnln@gmail.com >
2023-02-05 17:02:56 -03:00
b724607e31
feat(RD): add shader pack downloader
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2023-02-05 17:02:56 -03:00
c3ea303a37
feat(RD): add resource pack downloader
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2023-02-05 17:02:52 -03:00
e89a10945c
Merge pull request #823 from BalkanMadman/linux-java
...
Fix https://github.com/PrismLauncher/PrismLauncher/issues/790
2023-02-05 19:09:48 +01:00
8ddc89fa01
Merge pull request #825 from Ryex/cmd_env_native_sep
...
fix https://github.com/PrismLauncher/PrismLauncher/issues/824
2023-02-05 18:42:19 +01:00
a47bf72b07
Merge pull request #751 from Edgars-Cirulis/develop
2023-02-05 17:48:26 +01:00
34460dd77a
ensure command env vars use native path seperators
...
fix #824
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2023-02-04 12:28:52 -07:00
c125c96e88
Java installations detection fix for Linux
...
Signed-off-by: BalkanMadman <zurabid2016@gmail.com >
2023-02-04 16:48:06 +02:00
d2fd0fd8e8
Merge pull request #802 from KosmX/develop
2023-02-04 14:43:28 +01:00
edaa66f622
fix: use /usr/bin/env bash in launch script
...
This should make it possible to run these scripts on any system, as
/bin/bash is not standard! Notably this fixes the script on NixOS.
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-02-04 01:06:16 +01:00
6ac073e779
fix: fix component uid regex
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-02-03 18:32:57 +01:00
4166d9ab7b
fix: give error when components have bad uids
...
This allows other code to reject proceeding when the UID is bad, which
is generally a good idea. :p
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net >
Signed-off-by: flow <flowlnlnln@gmail.com >
2023-02-02 17:11:24 -03:00
435273e08a
fix(Inst.Import): don't allow bad file path in mrpack import
...
This checks the URL of the path of the file to be downloaded,
ensuring that it always contains the root .minecraft target folder,
following the warning in the mrpack documentation.
Signed-off-by: flow <flowlnlnln@gmail.com >
2023-02-02 17:11:24 -03:00
35a62d9787
commit requested change, make the lock static
...
Signed-off-by: KosmX <kosmx.mc@gmail.com >
2023-02-01 23:31:12 +01:00
ec5bb944b2
thread-safe logger
...
Signed-off-by: KosmX <kosmx.mc@gmail.com >
2023-02-01 14:59:11 +01:00
