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

2139 Commits

Author SHA1 Message Date
seth
6f86e8b66e
Merge pull request #1331 from TheKodeToad/hungry-trash 
Fix updating trashing resources
 2023-07-16 20:43:15 +02:00
Rachel Powers
d9de326f22
Merge pull request #1321 from TheKodeToad/mr-optional 
Optional mods in mrpack export
 2023-07-16 20:43:02 +02:00
seth
1d4cf0fd03
Merge pull request #1329 from Ryex/fix/progress_dialog_centering 
fix(progress dialog): if there is a parent center on creation
 2023-07-16 20:43:02 +02:00
Rachel Powers
a65e4af365
Merge pull request #1302 from Ryex/fix/progress-dialog-segfault 
fix: segfault in progress dialog
 2023-07-16 20:43:02 +02:00
seth
721ac015f3
Merge pull request #1325 from Scrumplex/validate-meta-url 
Validate Meta URL
 2023-07-16 20:42:55 +02:00
Sefa Eyeoglu
81757717f7
Merge pull request #1284 from Ryex/fix/properly-track-failed-copies-and-clones 2023-07-16 20:42:48 +02:00
Tayou
7025f75903
Merge pull request #1127 from Trial97/scale_cat 2023-07-16 20:42:48 +02:00
TheKodeToad
3cc68fcea4
Merge pull request #1232 from telans/screenshots-update 
ScreenshotsPage fixes
 2023-07-16 20:42:48 +02:00
Sefa Eyeoglu
34be098f12
Merge pull request #1298 from TurboWafflz/develop 2023-07-16 20:42:48 +02:00
seth
fb5655085f
Merge pull request #1292 from Trial97/export5 
Removed logs from instance export
 2023-07-16 20:42:48 +02:00
Sefa Eyeoglu
316ef9b725
Merge pull request #1266 from TheKodeToad/smol-tweaks 2023-07-16 20:42:48 +02:00
seth
5fdbc9d75e
Merge pull request #1280 from Trial97/shortcut 
Fixed illegal characters in shortcuts name
 2023-07-16 20:42:48 +02:00
seth
6464127d05
Merge pull request #1281 from Trial97/screenshot 
Added more information to the screenshot upload warning
 2023-07-16 20:42:48 +02:00
TheKodeToad
c349eff522
Merge pull request #1277 from Trial97/remove_mojang 
Removed unused files
 2023-07-16 20:42:47 +02:00
Sefa Eyeoglu
5fdf73a2ff
Merge pull request #1274 from TheKodeToad/java-signature 2023-07-16 20:42:47 +02:00
Sefa Eyeoglu
a25a5a7c9f
Merge pull request #1065 from leo78913/gamescope-close-button 2023-07-16 20:42:47 +02:00
Sefa Eyeoglu
20e9bf0e11
Merge pull request #1261 from telans/modrinthexport-url 2023-07-16 20:42:26 +02:00
Rachel Powers
21ccf47ea7
Merge pull request #1255 from Trial97/export4 
Added Thumbs.db to excluded files in MrPackExport
 2023-07-16 20:42:26 +02:00
Rachel Powers
6856c2f922
Merge pull request #1259 from PrismLauncher/update-devs 
Update developers
 2023-07-16 20:42:26 +02:00
TheKodeToad
e52fd9d4fe
Merge pull request #1256 from Trial97/fix11 
Fixed hashers
 2023-07-16 20:42:25 +02:00
Rachel Powers
05056e1abf
Merge pull request #1200 from Trial97/net_job_crash 
Made ByteSynkArray to use shared_ptr
 2023-07-16 20:42:25 +02:00
seth
9df3c5d3c0
Merge pull request #1251 from getchoo/github-clarify 
chore: add 'suggest a feature' message in help
 2023-07-16 20:42:25 +02:00
seth
1a4ea3b1cd
Merge pull request #1252 from getchoo/import-hehe 
chore: avoid confusion in file/url import dialog
 2023-07-16 20:42:25 +02:00
Tayou
0a7a7d9bfd
Merge pull request #1235 from ChrisLane/java-check-debug-msg-fix 2023-07-16 20:42:25 +02:00
Sefa Eyeoglu
8b017f9a5f
Merge pull request #1243 from Trial97/export 
Added regex expresion to exclude .DS_Store files
 2023-07-16 20:42:25 +02:00
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
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
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
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
TheKodeToad
13804f80de Fix trailing space in instance name 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-06-15 16:37:03 +01: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
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
Trial97
b77fb05908
Added back the INIFile read function 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-13 21:07:05 +03:00