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

5825 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
renovate[bot]
f986b4cd56
chore(deps): update cachix/install-nix-action action to v20 2023-03-01 07:20:11 +00:00
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
kumquat-ir
01c4ed232e license stuff 
Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com>
 2023-02-24 15:01:59 -05:00
kumquat-ir
dc8109658c review fixes 
Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com>
 2023-02-22 13:20:13 -05: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
kumquat-ir
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
Sefa Eyeoglu
b977ac6df5
Merge pull request #865 from Scrumplex/codesign-windows 2023-02-17 17:56:55 +01:00
kumquat-ir
256fc322a8 minor cleanup 
Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com>
 2023-02-16 12:57:35 -05: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
kumquat-ir
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
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
Rachel Powers
7d02e1f866 feat: make shell association an optional section 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-02-12 17:34:37 -07:00
Rachel Powers
d93cb751b0 fix: oversight caused prism to be .zip windows default 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-02-12 16:23:33 -07:00
kumquat-ir
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
kumquat-ir
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
kumquat-ir
f5f2d33f93 parse nil metadata 
Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com>
 2023-02-11 17:46:17 -05: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
flow
46c6cc2d2b
chore: add my copyright headers 
.-.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2023-02-05 17:02:56 -03:00
flow
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
flow
b724607e31
feat(RD): add shader pack downloader 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2023-02-05 17:02:56 -03:00
flow
c3ea303a37
feat(RD): add resource pack downloader 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2023-02-05 17:02:52 -03: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