CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,797 Commits 10 Branches 30 Tags 34 MiB
1b8b044b52
Commit Graph

1893 Commits

Author SHA1 Message Date
Sefa Eyeoglu
a988111507
fix: do not apply system theme on launch 
Closes PrismLauncher/PrismLauncher#490

Regression introduced by PrismLauncher/PrismLauncher#249

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-04-08 18:48:05 +02:00
seth
4055e34320
chore: use system architecture to detect vulkan layers 
Signed-off-by: seth <getchoo@tuta.io>
 2023-04-01 13:09:09 -04:00
seth
3e3b92d4c1
chore: improve detection of newer vulkan layers 
i've been scrump'd

Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
Signed-off-by: seth <getchoo@tuta.io>
 2023-03-31 20:09:26 +00:00
seth
c7dc115365
fix: search for newer mangohud vulkan layers 
Signed-off-by: seth <getchoo@tuta.io>
 2023-03-31 15:49:09 -04:00
Sefa Eyeoglu
9418c62d95
refactor: reprocess log lines per instance 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-03-22 10:32:17 +01:00
Sefa Eyeoglu
44bf32e729
fix: handle partial lines in LoggedProcess 
Fixes PrismLauncher/PrismLauncher#930

Co-authored-by: flow <flowlnlnln@gmail.com>
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-03-21 18:30:46 +01:00
Sefa Eyeoglu
05b6969ee5
fix: add mnemonic to downloads directory setting 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-03-14 13:35:16 +01:00
Janrupf
c17f6e37e5 feat: Add setting for downloads directory 
Closes #641

Signed-off-by: Janrupf <business.janrupf@gmail.com>
 2023-03-13 21:58:22 +01:00
Kenneth Chew
430369feb8
fix: explicit conversion to C string to fix MinGW g++ 10 build 
Signed-off-by: Kenneth Chew <kenneth.c0@protonmail.com>
 2023-03-12 18:33:48 -04:00
Sefa Eyeoglu
1dd96898e1
Merge pull request #896 from TheKodeToad/modrinth-token 2023-03-09 15:10:40 +01:00
TheKodeToad
59b15c5f08
Fix another duplicate name 🤦 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-03-07 21:03:09 +00:00
TheKodeToad
59cf8f678f
(hopefully) Fix duplicates names 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-03-07 20:50:19 +00:00
TheKodeToad
088be050b2
Apply flowln's suggestion :) 
Co-authored-by: flow <flowlnlnln@gmail.com>
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-03-07 20:46:27 +00:00
TheKodeToad
76f66148db Apply flowln's suggestion 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-03-05 18:21:24 +00:00
Sefa Eyeoglu
f3f0652d2b
Merge pull request #853 from kumquat-ir/nil 
NilLoader mod metadata support
 2023-03-05 13:39:00 +01:00
flow
06de728aa7 fix: use toLocalFile() instead of path() 
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-05 08:24:56 -03:00
TheKodeToad
4efbf22089 Prism-ify more license headers 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-03-02 10:19:42 +00:00
TheKodeToad
5c913149c8
Merge branch 'PrismLauncher:develop' into modrinth-token 2023-03-02 10:10:46 +00:00
Sefa Eyeoglu
9265c319a9
Merge pull request #788 from flowln/other_resource_downloaders_two 
Add resource pack, texture pack and shader pack downloaders
 2023-03-02 10:08:45 +00:00
TheKodeToad
cbe6eff2fa Move Modrinth before CurseForge for consistency 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-03-02 09:28:14 +00:00
TheKodeToad
1f3d18ec12 Replace with exact match and add TODO to improve 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-03-02 09:26:00 +00:00
Sefa Eyeoglu
89255e34bd
fix: change wording of TP/RP download buttons 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-03-02 09:42:28 +01:00
TheKodeToad
a7b8092296 Add link 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-03-01 14:41:16 +00:00
TheKodeToad
1feb630520 Allow custom Modrinth API token 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-03-01 14:24:56 +00:00
Sefa Eyeoglu
651e511ff0
fix: use makeShared for importing components 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-03-01 12:33:00 +01:00
Sefa Eyeoglu
0eae9355e6
Merge pull request #889 from flowln/fix_zip_extract 2023-03-01 09:51:08 +01:00
Sefa Eyeoglu
4878f1a438
Merge pull request #735 from Scrumplex/import-component 2023-03-01 09:49:47 +01: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
dc8109658c review fixes 
Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com>
 2023-02-22 13:20:13 -05: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
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
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
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
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
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
PandaNinjas
d886d32bd8
Replace potentially ReDOSable regex 
Signed-off-by: PandaNinjas <admin@malwarefight.gq>
 2023-02-07 17:21:00 +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