CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,230 Commits 10 Branches 30 Tags 34 MiB
1495bfb73e
Commit Graph

6230 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Lane
9ad29e8d85
Remove extra spaces in one more Java checker debug 
Signed-off-by: Chris Lane <git@chrislane.com>
 2023-06-20 15:51:31 +01:00
Chris Lane
07f3d27fb8
Clean up 'Running java checker' debug msg code 
Signed-off-by: Chris Lane <git@chrislane.com>
 2023-06-20 15:36:25 +01:00
Chris Lane
f2692e60f3
Add missing space in java checker debug message 
Signed-off-by: Chris Lane <git@chrislane.com>
 2023-06-20 12:44:44 +01:00
James Beddek
009623823d
Modrinth: use default icon for non-managed packs 
Fixes: #317
Signed-off-by: James Beddek <telans@posteo.de>
 2023-06-20 23:00:13 +12:00
Jakub Wroński
a32a3e25ad
Fix compiling on FreeBSD 
Signed-off-by: Jakub Wroński <kubawronski161@gmail.com>
 2023-06-20 12:59:47 +02:00
Trial97
3e3be9ae6f
Added fallback for quilt if the API or Kotilin is not present 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-20 13:28:57 +03:00
TheKodeToad
3c648ff9fd
Merge pull request #1233 from p2js/ui-consistency-fix 
Remove inconsistent/unneeded question marks in UI
 2023-06-20 11:05:26 +01:00
Alfio
f769b0b4c6 Remove inconsistent/unneeded question marks in UI 
Signed-off-by: P2 <tomarchioalfio5@gmail.com>
 2023-06-20 10:40:27 +02:00
Trial97
b62e4c0cc7
Fixed build 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-19 21:32:19 +03:00
Trial97
f6f0fbbd9f
Fixed removeIf 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-19 21:23:48 +03:00
Trial97
c13a90540c
Added overide for Quilt/Fabric 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-19 21:20:35 +03:00
Trial97
6fd729e285
Fixed regresion regarding modrinth project_id in dependence array 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-19 17:42:16 +03:00
Trial97
8ad9692daa
Changed qWarning to qDebug for raw data 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-19 14:10:29 +03:00
Trial97
d02858040e
Fixes #1212 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-19 13:09:37 +03:00
Trial97
3ee0fec729
Removed mods from lambda 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-19 12:22:22 +03:00
Trial97
ec063470d7
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into mods_txt 2023-06-19 12:20:50 +03:00
Trial97
b2ed2bf810
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into net_job_crash 2023-06-19 12:01:35 +03:00
Sefa Eyeoglu
af6bf11793
Merge pull request #1224 from DioEgizio/add-appstream 2023-06-19 09:35:56 +02:00
DioEgizio
d5b5f0503c chore: change xml name to what linuxdeploy wants 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2023-06-19 09:17:15 +02:00
DioEgizio
555cb40efd chore: install appstream in appimage 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2023-06-19 09:17:15 +02:00
seth
9d22fce53f
Merge pull request #1214 from PrismLauncher/renovate/cachix-install-nix-action-22.x 
chore(deps): update cachix/install-nix-action action to v22
 2023-06-18 22:06:47 -04:00
seth
aee0999daa
Merge pull request #1210 from getchoo/opengl-appimage 
fix(appimage): bundle generic opengl lib
 2023-06-18 22:06:03 -04:00
Trial97
1bdde1f947
Small fixes 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-19 00:36:37 +03:00
Trial97
319ce8c19f
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop 2023-06-19 00:06:44 +03:00
Trial97
4e66f55d84
Removed extra headers 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-18 23:32:17 +03:00
Trial97
6826f1d605
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into net_job_crash 2023-06-18 23:27:41 +03:00
Trial97
0161520b33
Fixed leaks 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-18 23:27:26 +03:00
Sefa Eyeoglu
12cd8a7bea
Merge pull request #1218 from flowln/bad_commit_string_in_bundled_package 
Hide the Git commit entry on the About dialog when the build doesn't have git stuff support
 2023-06-17 18:04:54 +02:00
flow
2d00a727f6
fix: hide git commit when the build doesn't have git stuff support 
This fixes the Git commit string being "GITDIR-NOTFOUND" on the About
page when building a package from the bundled source archive.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2023-06-17 11:09:05 -03:00
renovate[bot]
b123f4f948
chore(deps): update cachix/install-nix-action action to v22 2023-06-16 21:58:32 +00:00
seth
fd9a8d1551
Merge pull request #1110 from TheKodeToad/version-search 
Add a search bar to version lists
 2023-06-16 14:47:39 -04:00
seth
6bc1150ad0
Merge pull request #1187 from getchoo/rel-8.0 
chore: bump to 8.0
 2023-06-16 14:46:25 -04:00
seth
45cce1d19a
fix(appimage): bundle generic opengl lib 
Signed-off-by: seth <getchoo@tuta.io>
 2023-06-16 14:34:44 -04:00
DioEgizio
412349ac58
Merge pull request #1135 from Trial97/installed_mods 2023-06-16 09:56:51 +02:00
Sefa Eyeoglu
000f4386a2
Merge pull request #1192 from Trial97/pre-lauch 2023-06-16 09:46:24 +02:00
Sefa Eyeoglu
5d3329b1ef
Merge pull request #1198 from TheKodeToad/remove-a-space 2023-06-16 09:42:41 +02:00
Trial97
147366bc0a
Made ByteSynkArray to use shared_ptr 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-15 22:59:41 +03:00
TheKodeToad
13804f80de Fix trailing space in instance name 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-06-15 16:37:03 +01:00
Trial97
1d354df1f8
Fix tests for window 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-15 16:51:58 +03:00
Trial97
1b42b9a08e
Fixed tests 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-15 14:25:58 +03:00
Trial97
535fb2c4d6
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into pre-lauch 2023-06-15 14:13:30 +03:00
Trial97
98a07da39b
Renamed variable 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-15 14:12:29 +03:00
TheKodeToad
8bf5ba2836
Merge pull request #1195 from Scrumplex/fix-javavendor-instance 
Add JavaVendor as an instance override
 2023-06-15 12:11:32 +01:00
Sefa Eyeoglu
798e1abb58
Merge pull request #1159 from getchoo/fix-devshell 2023-06-15 12:49:58 +02:00
Sefa Eyeoglu
90a4f622d2
Merge pull request #1063 from RedsonBr140/feat/RootFolder 2023-06-15 12:49:21 +02:00
Sefa Eyeoglu
6812823b55
fix: simplify resolving of data path 
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-06-15 12:48:22 +02:00
Sefa Eyeoglu
7ad9abf9bc
fix: add JavaVendor as an instance override 
This should suppress a critical error that gets printed every time an
instance gets launched, as JavaCheck wants to store the vendor in the
instance settings.

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-06-15 12:45:03 +02:00
Trial97
cb52be433d
Made the installed mods more apparent 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-15 13:20:08 +03:00
Trial97
1f2b0ad698
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into installed_mods 2023-06-15 12:39:20 +03:00
Trial97
6667ff9330
Updated text and fixed mod page text update 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-15 12:32:48 +03:00