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

6076 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TheKodeToad
b1fe4d1d93
Merge pull request #1228 from Trial97/curent_pack_crash 
Fixes #1212
 2023-07-16 20:42:25 +02:00
DioEgizio
80463f9761
Merge pull request #1231 from telans/modrinth-default-icon 
Modrinth: use default icon for non-managed packs
 2023-07-16 20:42:25 +02:00
TheKodeToad
567af5b22d
Merge pull request #1233 from p2js/ui-consistency-fix 
Remove inconsistent/unneeded question marks in UI
 2023-07-16 20:42:24 +02:00
seth
7ed15b2687
Merge pull request #1214 from PrismLauncher/renovate/cachix-install-nix-action-22.x 
chore(deps): update cachix/install-nix-action action to v22
 2023-07-16 20:42:24 +02:00
Sefa Eyeoglu
3d502b12a9
Merge pull request #1224 from DioEgizio/add-appstream 2023-07-16 19:59:30 +02:00
seth
f0d1df9139
Merge pull request #1210 from getchoo/opengl-appimage 
fix(appimage): bundle generic opengl lib
 2023-07-16 19:59:30 +02:00
Sefa Eyeoglu
0fcaa336dc
Merge pull request #1377 from PrismLauncher/backport-1184-to-release-7.x 2023-07-16 19:55:45 +02:00
clickdevin
949da6b50e Fix bugs when updating curseforge modpacks 
Signed-off-by: clickdevin <git@clickdevin.me>
(cherry picked from commit d4f2059b78)
 2023-07-16 17:55:05 +00:00
Sefa Eyeoglu
fd0ba70080
Merge pull request #1376 from PrismLauncher/backport-1234-to-release-7.x 2023-07-16 19:52:08 +02:00
Jakub Wroński
89dd981dd7 Fix compiling on FreeBSD 
Signed-off-by: Jakub Wroński <kubawronski161@gmail.com>
(cherry picked from commit a32a3e25ad)
 2023-07-16 17:51:53 +00:00
Sefa Eyeoglu
30fda57c64
Merge pull request #1375 from PrismLauncher/backport-1218-to-release-7.x 2023-07-16 19:49:45 +02:00
flow
1d75c58d6c 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>
(cherry picked from commit 2d00a727f6)
 2023-07-16 17:49:15 +00:00
Sefa Eyeoglu
34d80a8c75
Merge pull request #1181 from DioEgizio/bump-7.1 2023-06-16 13:07:25 +02:00
DioEgizio
05360c1103
chore: bump to 7.1 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2023-06-16 12:50:08 +02: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
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
seth
9908e115aa
Merge pull request #1067 from RedsonBr140/feat/dont-hide-settings 
feat: Don't hide the settings tab when an instance is running
 2023-06-15 02:20:00 -04:00
Trial97
811c79423f
Fixed version comparation 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-15 00:43:05 +03:00
Trial97
cf4c1605eb
Fixed qt5 build 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-15 00:37:32 +03:00
Trial97
e0b901169a
Added new migration for special characters 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-15 00:27:20 +03:00
seth
3f1548ae0e
Merge pull request #1099 from Trial97/logdir 
store logs in seperate directory
 2023-06-14 15:38:47 -04:00
TheKodeToad
3526d00a23
Merge branch 'develop' into feat/dont-hide-settings 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-06-14 20:05:02 +01:00
DioEgizio
a4502f44c2
Merge pull request #1145 from Trial97/net_job_crash 2023-06-14 12:46:00 +02:00
TheKodeToad
18c436c2bc
Merge pull request #1174 from Trial97/pre-lauch 2023-06-14 11:32:55 +01:00
Trial97
b77fb05908
Added back the INIFile read function 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-13 21:07:05 +03:00
seth
703f7698c1
Merge pull request #1140 from guihkx/ci-exclude-git-folder-from-sources-tarball 
CI: Exclude `.git` directory from the source code tarball
 2023-06-13 12:47:35 -04:00
DioEgizio
69bfb55397
Merge pull request #1166 from TheKodeToad/mrpack-export-oops 2023-06-13 18:00:44 +02:00
Tayou
b174f82261
Merge pull request #1162 from leo78913/i-hate-naming-branches 2023-06-12 21:41:17 +02:00
Tayou
9406022e70
Merge pull request #1151 from TayouVR/rainbow-konami 2023-06-12 21:25:17 +02:00
TheKodeToad
f4a814b5e6
Remove unnecessary code 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-06-12 15:46:15 +01:00
TheKodeToad
94ddc8bbf7
Could this work? 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-06-12 14:14:50 +01:00
leo78913
d6c7b4e813 add icons to export menu 
Signed-off-by: leo78913 <leo3758@riseup.net>
 2023-06-11 21:50:29 -03:00
seth
ad0493390b
fix(nix): use prismlauncher-unwrapped in devShell 
Signed-off-by: seth <getchoo@tuta.io>
 2023-06-11 14:02:36 -04:00
Tayou
5aa1c340dc
rainbow konami & toggle 
Signed-off-by: Tayou <tayou@gmx.net>
 2023-06-11 01:58:37 +02:00
Trial97
47372c2fbd
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into installed_mods 2023-06-10 22:04:12 +03:00
Trial97
ae9e8dbafd
Removed const specification 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-10 22:04:08 +03:00
Trial97
b3d743635c
Updated the messages 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-09 21:29:12 +03:00