aboutsummaryrefslogtreecommitdiff
path: root/launcher
AgeCommit message (Collapse)Author
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>
2023-02-01commit requested change, make the lock staticKosmX
Signed-off-by: KosmX <kosmx.mc@gmail.com>
2023-02-01thread-safe loggerKosmX
Signed-off-by: KosmX <kosmx.mc@gmail.com>
2023-01-28Fix: fix some regressions in the main windowleo78913
this removes the update action from the help button and fixes the add to path action not showing on macos Signed-off-by: leo78913 <leo3758@riseup.net>
2023-01-27Merge pull request #724 from leo78913/dot-ui-mainwindowflow
Closes https://github.com/PrismLauncher/PrismLauncher/issues/594 Closes https://github.com/PrismLauncher/PrismLauncher/issues/69 Closes https://github.com/PrismLauncher/PrismLauncher/issues/473
2023-01-27better fix for WideBar::insertSeparatorleo78913
Signed-off-by: leo78913 <leo3758@riseup.net>
2023-01-27Remove unused BarEntry variableleo78913
Signed-off-by: leo78913 <leo3758@riseup.net>
2023-01-27Update launcher/ui/MainWindow.uileo78913
Co-authored-by: flow <flowlnlnln@gmail.com> Signed-off-by: leo78913 <leo3758@riseup.net>
2023-01-27Update launcher/ui/MainWindow.uileo78913
Co-authored-by: flow <flowlnlnln@gmail.com> Signed-off-by: leo78913 <leo3758@riseup.net>
2023-01-26refactor: clean up some MainWindow stuffleo78913
this makes the accounts button and menubar item share the same QMenu and also refactors some code Signed-off-by: leo78913 <leo3758@riseup.net>
2023-01-25refactor: make shared_qobject_ptr ctor explicitflow
This turns issues like creating two shared ptrs from a single raw ptr from popping up at runtime, instead making them a compile error. Signed-off-by: flow <flowlnlnln@gmail.com>
2023-01-25refactor: add error handling to component importSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-01-25Merge pull request #784 from flowln/fix_resource_folder_double_smart_ptrsSefa Eyeoglu
2023-01-25Merge pull request #458 from Scrumplex/remove-updaterSefa Eyeoglu
2023-01-24fix(Tasks): don't try to start more tasks than necessaryflow
Signed-off-by: flow <flowlnlnln@gmail.com>
2023-01-24fix(ResourceFolder): don't create two smart ptrs for the same raw ptrflow
Signed-off-by: flow <flowlnlnln@gmail.com>
2023-01-24Update launcher/Application.cppRachel Powers
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net> Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-01-24Merge branch 'develop' into remove-updaterSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-01-24remove NDEBUG check per Scrumplex's ordersRachel Powers
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-01-23fix: let jars be found from inside build dir for debug buildsRachel Powers
debug bug builds run form inside the build dir before they are bundled can't find the jars Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>