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

5808 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
renovate[bot]
20525bec29
chore(deps): update actions/cache action to v3.3.1 2023-03-13 10:50:27 +00: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
Kenneth Chew
5ac3e5c958
Update tomlplusplus library 
Fix build on MinGW g++ 10

Signed-off-by: Kenneth Chew <kenneth.c0@protonmail.com>
 2023-03-12 18:33:48 -04:00
txtsd
abc2a529fb
Merge pull request #919 from PrismLauncher/renovate/actions-cache-3.x 2023-03-09 20:54:31 +05:30
renovate[bot]
c638fd9056
chore(deps): update actions/cache action to v3.3.0 2023-03-09 14:41:24 +00:00
Sefa Eyeoglu
1dd96898e1
Merge pull request #896 from TheKodeToad/modrinth-token 2023-03-09 15:10:40 +01:00
txtsd
3bd4ad7c93
Merge pull request #918 from Scrumplex/qt6-default 2023-03-08 21:18:53 +05:30
Sefa Eyeoglu
a8ffdeca2b
chore!: switch to Qt 6 by default 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-03-08 11:22:30 +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
6bdd6ce571
Merge pull request #912 from Scrumplex/bump-ghc-filesystem 
Bump ghc-filesystem
 2023-03-05 17:25:38 +01:00
Sefa Eyeoglu
dd96e1819d
fix: remove unneeded alias for ghc_filesystem 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-03-05 14:24:40 +01:00
Sefa Eyeoglu
07702d3be7
fix: drop unneeded GHC_FILESYSTEM_WITH_INSTALL 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-03-05 14:23:40 +01:00
Sefa Eyeoglu
b9dfcf6d2f
chore: bump ghc-filesystem 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-03-05 14:21:07 +01:00
Sefa Eyeoglu
f3f0652d2b
Merge pull request #853 from kumquat-ir/nil 
NilLoader mod metadata support
 2023-03-05 13:39:00 +01:00
Sefa Eyeoglu
aae60334d1
Merge pull request #911 from flowln/fix_zip_extract_windows 2023-03-05 13:09:25 +01:00
Sefa Eyeoglu
b38af948b9
Merge pull request #857 from Ryex/fix_windows_default_apps 2023-03-05 13:09:11 +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
flow
9f202caf93
Merge pull request #895 from Scrumplex/fix-component-creation 
Use makeShared for importing components
 2023-03-01 12:08:46 +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
b46aca52ee
Merge pull request #894 from PrismLauncher/renovate/cachix-install-nix-action-20.x 
chore(deps): update cachix/install-nix-action action to v20
 2023-03-01 11:22:59 +00: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
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