0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,707 Commits 1 Branch 0 Tags 29 MiB
d5c6704475
Commit Graph

5707 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
flow
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
flow
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
Sefa Eyeoglu
8ce8055aeb
Merge pull request #846 from PrismLauncher/renovate/vedantmgoyal2009-winget-releaser-2.x 2023-02-22 16:19:11 +01:00
flow
a71b743ee3
Merge pull request #881 from PrismLauncher/renovate/actions-cache-3.x 2023-02-22 07:07:55 -08:00
renovate[bot]
c50e9ac418
chore(deps): update actions/cache action to v3.2.6 2023-02-21 12:33:23 +00:00
Sefa Eyeoglu
b977ac6df5
Merge pull request #865 from Scrumplex/codesign-windows 2023-02-17 17:56:55 +01:00
Sefa Eyeoglu
33bf85a387
fix(actions): don't fail if code signing certificate is missing 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-02-16 16:41:40 +01:00
Sefa Eyeoglu
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
Sefa Eyeoglu
89c945ecc8
feat(ci): add Windows codesigning 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-02-15 20:43:33 +01:00
Sefa Eyeoglu
c15962c6c1
Merge pull request #859 from Ryex/fix-KISS-Linux-build 
Add missing header to Application.cpp: Fix build failure on KISS Linux
 2023-02-13 08:37:39 +01:00
Rachel Powers
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
renovate[bot]
4331eaae2e
chore(deps): update vedantmgoyal2009/winget-releaser action to v2 2023-02-11 15:48:00 +00:00
DioEgizio
d5d4f87236
Merge pull request #831 from PrismLauncher/renovate/cachix-install-nix-action-19.x 2023-02-11 16:47:30 +01:00
DioEgizio
5d49433326
Merge pull request #841 from RaptaG/patch-1 2023-02-11 08:45:42 +01:00
RaptaG
381d7413c8
Link license in the shield badge 
So that no trash URL shows when hovering!

Signed-off-by: RaptaG <77157639+RaptaG@users.noreply.github.com>
 2023-02-10 19:47:08 +02:00
Sefa Eyeoglu
e70a5a47ee
fix: ignore absolute paths when extracting 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-02-10 10:46:21 +01:00
Sefa Eyeoglu
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
Sefa Eyeoglu
a6ac832f8f
Merge pull request #839 from PrismLauncher/renovate/actions-cache-3.x 
chore(deps): update actions/cache action to v3.2.5
 2023-02-10 08:27:00 +01:00
renovate[bot]
104863846b
chore(deps): update actions/cache action to v3.2.5 2023-02-10 06:24:45 +00:00
Sefa Eyeoglu
5883c30b84
Merge pull request #834 from pandaninjas/patch-2 2023-02-09 09:29:13 +01:00
flow
cebaae76b4
Merge pull request #832 from ktheticdev/develop 
Fix README COPR typo
 2023-02-08 14:32:16 -08:00
PandaNinjas
d886d32bd8
Replace potentially ReDOSable regex 
Signed-off-by: PandaNinjas <admin@malwarefight.gq>
 2023-02-07 17:21:00 +00:00
ktheticdev
8440c2819b
Fix README.md typo 
Signed-off-by: ktheticdev <64607352+ktheticdev@users.noreply.github.com>
 2023-02-07 11:10:43 +04:00
renovate[bot]
8114d8778f
chore(deps): update cachix/install-nix-action action to v19 2023-02-06 15:31:42 +00:00
DioEgizio
f36c3a3f6c
Merge pull request #819 from Scrumplex/fix-launch-script 2023-02-06 16:26:54 +01:00
Sefa Eyeoglu
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
Sefa Eyeoglu
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
Sefa Eyeoglu
a47bf72b07
Merge pull request #751 from Edgars-Cirulis/develop 2023-02-05 17:48:26 +01:00
Rachel Powers
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
BalkanMadman
c125c96e88 Java installations detection fix for Linux 
Signed-off-by: BalkanMadman <zurabid2016@gmail.com>
 2023-02-04 16:48:06 +02:00
Sefa Eyeoglu
d2fd0fd8e8
Merge pull request #802 from KosmX/develop 2023-02-04 14:43:28 +01:00
flow
74a875bdce
Merge pull request #803 from TheLastRar/msys2-ccache 2023-02-04 05:37:23 -08:00
Sefa Eyeoglu
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
Sefa Eyeoglu
c392db7e0d
Merge pull request #815 from Scrumplex/fix-funny 2023-02-03 18:44:07 +01:00
Sefa Eyeoglu
6ac073e779
fix: fix component uid regex 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-02-03 18:32:57 +01:00
flow
58d9ceda4b
Merge pull request #804 from flowln/improve_big_concurrent_task_test 2023-02-02 13:47:51 -08:00
flow
3781c64d41
Merge pull request #810 from flowln/error_on_bad_file_paths_as_we_should_catquake 2023-02-02 13:47:36 -08:00
flow
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
flow
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
KosmX
35a62d9787
commit requested change, make the lock static 
Signed-off-by: KosmX <kosmx.mc@gmail.com>
 2023-02-01 23:31:12 +01:00
TheLastRar
75683039c5 CI: Always update windows ccache 
Also change name to avoid pulling the stale cache

Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
 2023-02-01 20:13:26 +00:00
TheLastRar
1a609612f2 CI: Move mingw restore cache before setup ccache 
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
 2023-02-01 20:13:26 +00:00
TheLastRar
121a7a9e23 CI: Log ccache stats for msys2 
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
 2023-02-01 20:13:26 +00:00
flow
e593faf245
fix(tests): improve the reliability of the Task's stack test 
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-01 16:58:33 -03:00
KosmX
ec5bb944b2
thread-safe logger 
Signed-off-by: KosmX <kosmx.mc@gmail.com>
 2023-02-01 14:59:11 +01:00
flow
deed49574a
Merge pull request #798 from PrismLauncher/renovate/actions-cache-3.x 2023-01-30 07:02:51 -08:00
renovate[bot]
7cc39cd357
chore(deps): update actions/cache action to v3.2.4 2023-01-30 13:29:47 +00:00
flow
a714d5966e
Merge pull request #795 from leo78913/mainwindow-fixes 
closes https://github.com/PrismLauncher/PrismLauncher/issues/792
 2023-01-29 10:35:26 -08:00
leo78913
2b0252d4ae Fix: fix some regressions in the main window 
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-28 15:09:26 -03:00
flow
c78db5459e
Merge pull request #724 from leo78913/dot-ui-mainwindow 
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-27 10:55:49 -08:00