aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-02-11Merge pull request #841 from RaptaG/patch-1DioEgizio
2023-02-10Link license in the shield badgeRaptaG
So that no trash URL shows when hovering! Signed-off-by: RaptaG <77157639+RaptaG@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-10Merge pull request #839 from PrismLauncher/renovate/actions-cache-3.xSefa Eyeoglu
chore(deps): update actions/cache action to v3.2.5
2023-02-10chore(deps): update actions/cache action to v3.2.5renovate[bot]
2023-02-09Merge pull request #834 from pandaninjas/patch-2Sefa Eyeoglu
2023-02-08Merge pull request #832 from ktheticdev/developflow
Fix README COPR typo
2023-02-07Replace potentially ReDOSable regexPandaNinjas
Signed-off-by: PandaNinjas <admin@malwarefight.gq>
2023-02-07Fix README.md typoktheticdev
Signed-off-by: ktheticdev <64607352+ktheticdev@users.noreply.github.com>
2023-02-06chore(deps): update cachix/install-nix-action action to v19renovate[bot]
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-04Merge pull request #803 from TheLastRar/msys2-ccacheflow
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-03Merge pull request #815 from Scrumplex/fix-funnySefa Eyeoglu
2023-02-03fix: fix component uid regexSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-02-02Merge pull request #804 from flowln/improve_big_concurrent_task_testflow
2023-02-02Merge pull request #810 from ↵flow
flowln/error_on_bad_file_paths_as_we_should_catquake
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-01CI: Always update windows ccacheTheLastRar
Also change name to avoid pulling the stale cache Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
2023-02-01CI: Move mingw restore cache before setup ccacheTheLastRar
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
2023-02-01CI: Log ccache stats for msys2TheLastRar
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
2023-02-01fix(tests): improve the reliability of the Task's stack testflow
This actually takes into account the amount of stuff put into the stack in each iteration, and thus avoids having to change the stack size of the thread, and using ad-hoc values for the other stuff. It also reduces the time the test takes to run. Signed-off-by: flow <flowlnlnln@gmail.com>
2023-02-01thread-safe loggerKosmX
Signed-off-by: KosmX <kosmx.mc@gmail.com>
2023-01-30Merge pull request #798 from PrismLauncher/renovate/actions-cache-3.xflow
2023-01-30chore(deps): update actions/cache action to v3.2.4renovate[bot]
2023-01-29Merge pull request #795 from leo78913/mainwindow-fixesflow
closes https://github.com/PrismLauncher/PrismLauncher/issues/792
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-26Merge pull request #787 from flowln/make_shared_ptrs_explicitflow
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-25Merge pull request #779 from TheLastRar/zlib-undo-renameflow
2023-01-25refactor: add error handling to component importSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>