aboutsummaryrefslogtreecommitdiff
path: root/launcher
AgeCommit message (Collapse)Author
2023-03-14fix: add mnemonic to downloads directory settingSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-03-13feat: Add setting for downloads directoryJanrupf
Closes #641 Signed-off-by: Janrupf <business.janrupf@gmail.com>
2023-03-12fix: explicit conversion to C string to fix MinGW g++ 10 buildKenneth Chew
Signed-off-by: Kenneth Chew <kenneth.c0@protonmail.com>
2023-03-09Merge pull request #896 from TheKodeToad/modrinth-tokenSefa Eyeoglu
2023-03-07Fix another duplicate name :facepalm:TheKodeToad
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-03-07(hopefully) Fix duplicates namesTheKodeToad
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-03-07Apply flowln's suggestion :)TheKodeToad
Co-authored-by: flow <flowlnlnln@gmail.com> Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-03-05Apply flowln's suggestionTheKodeToad
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-03-05Merge pull request #853 from kumquat-ir/nilSefa Eyeoglu
NilLoader mod metadata support
2023-03-05fix: use `toLocalFile()` instead of `path()`flow
QUrl::path() adds a '/' at the beginning of the path on Windows, causing the world to explode every once in a while. Signed-off-by: flow <flowlnlnln@gmail.com>
2023-03-02Prism-ify more license headersTheKodeToad
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-03-02Merge branch 'PrismLauncher:develop' into modrinth-tokenTheKodeToad
2023-03-02Merge pull request #788 from flowln/other_resource_downloaders_twoSefa Eyeoglu
Add resource pack, texture pack and shader pack downloaders
2023-03-02Move Modrinth before CurseForge for consistencyTheKodeToad
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-03-02Replace with exact match and add TODO to improveTheKodeToad
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-03-02fix: change wording of TP/RP download buttonsSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-03-01Add linkTheKodeToad
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-03-01Allow custom Modrinth API tokenTheKodeToad
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-03-01fix: use makeShared for importing componentsSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-03-01Merge pull request #889 from flowln/fix_zip_extractSefa Eyeoglu
2023-03-01Merge pull request #735 from Scrumplex/import-componentSefa Eyeoglu
2023-02-24fix: prevent crash when aborting import task while extracting packflow
Signed-off-by: flow <flowlnlnln@gmail.com>
2023-02-24fix+refactor: fix fail to import modpacks and clean up a bitflow
QDir::cleanPath called by FS::PathCombine removes the trailing '/'... Signed-off-by: flow <flowlnlnln@gmail.com>
2023-02-22review fixeskumquat-ir
Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com>
2023-02-19fix metadata for mods with `.nilmod` extensionkumquat-ir
Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com>
2023-02-16minor cleanupkumquat-ir
Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com>
2023-02-15Merge pull request from GHSA-gq28-qx55-mh2rSefa Eyeoglu
Don't extract files outside of target path
2023-02-13do not create nilmods folderkumquat-ir
"it cant be that easy" - me, clueless Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com>
2023-02-12fix: add missing header to Application.cppRachel Powers
fails to compile on KISS Linux without Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-02-12switch to qdcss for parsingkumquat-ir
make it not horrible to look at Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com>
2023-02-11nilmods instance pagekumquat-ir
mostly copied from the coremod page impl Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com>
2023-02-11parse nil metadatakumquat-ir
Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com>
2023-02-10fix: ignore absolute paths when extractingSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-02-10fix: don't extract files outside of target pathSefa Eyeoglu
This should fix a security issue regarding path traversal in zip files. Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-02-07Replace potentially ReDOSable regexPandaNinjas
Signed-off-by: PandaNinjas <admin@malwarefight.gq>
2023-02-06Merge pull request #819 from Scrumplex/fix-launch-scriptDioEgizio
2023-02-05chore: add my copyright headersflow
.-. Signed-off-by: flow <flowlnlnln@gmail.com>
2023-02-05feat(RD): add texture pack downloaderflow
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-05feat(RD): add shader pack downloaderflow
Signed-off-by: flow <flowlnlnln@gmail.com>
2023-02-05feat(RD): add resource pack downloaderflow
Signed-off-by: flow <flowlnlnln@gmail.com>
2023-02-05Merge pull request #823 from BalkanMadman/linux-javaSefa Eyeoglu
Fix https://github.com/PrismLauncher/PrismLauncher/issues/790
2023-02-05Merge pull request #825 from Ryex/cmd_env_native_sepSefa Eyeoglu
fix https://github.com/PrismLauncher/PrismLauncher/issues/824
2023-02-05Merge pull request #751 from Edgars-Cirulis/developSefa Eyeoglu
2023-02-04ensure command env vars use native path seperatorsRachel Powers
fix #824 Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-02-04Java installations detection fix for LinuxBalkanMadman
Signed-off-by: BalkanMadman <zurabid2016@gmail.com>
2023-02-04Merge pull request #802 from KosmX/developSefa Eyeoglu
2023-02-04fix: use /usr/bin/env bash in launch scriptSefa Eyeoglu
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-03fix: fix component uid regexSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-02-02fix: give error when components have bad uidsflow
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-02fix(Inst.Import): don't allow bad file path in mrpack importflow
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>