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

2174 Commits

Author SHA1 Message Date
Trial97
823cd3862d
Fixed hash checking 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-23 22:41:01 +03:00
Trial97
222a10891c
Fixed merge 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-23 19:41:55 +03:00
Trial97
cb2671a02c
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into curse 2023-06-23 19:35:47 +03:00
Trial97
0a56631831
Added curseforge search 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-23 19:35:41 +03:00
Trial97
90df092174
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into curse 2023-06-23 17:29:58 +03:00
Trial97
85bbab0e92
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into net_job_crash 2023-06-23 14:38:30 +03:00
Trial97
67db141203
Renamed getResults to resultsReady 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-23 14:38:23 +03:00
seth
8df5ab8aa7
Merge pull request #1251 from getchoo/github-clarify 
chore: add 'suggest a feature' message in help
 2023-06-22 17:13:00 -04:00
seth
83efdccfe1
Merge pull request #1252 from getchoo/import-hehe 
chore: avoid confusion in file/url import dialog
 2023-06-22 17:12:35 -04:00
Rachel Powers
f1ebec641a
Merge pull request #1058 from Ryex/feature/images-for-resource-page 
Feature: image coumn for Mod, Resource Pack, and Texturepack pages
 2023-06-22 13:26:47 -07:00
seth
a4521ac0bb
chore: avoid confusion in file/url import dialog 
Signed-off-by: seth <getchoo@tuta.io>
 2023-06-22 16:15:03 -04:00
Tayou
c5f16276d7
Merge pull request #1235 from ChrisLane/java-check-debug-msg-fix 2023-06-22 22:03:30 +02:00
seth
03361e51ef
chore: add 'suggest a feature' message in help 
Signed-off-by: seth <getchoo@tuta.io>
 2023-06-22 15:58:53 -04:00
Trial97
85495c794d
changed map tipe 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-22 21:12:02 +03:00
Trial97
049b02cee4
finished up the curesforge export 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-22 21:06:01 +03:00
Trial97
377f27b16f
Updated slug for url 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-22 20:04:06 +03:00
Trial97
58321f3491
Added curseforge export 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-22 20:03:44 +03:00
Trial97
4e07f9574a
Use slug for url 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-22 18:11:25 +03:00
Trial97
9ad356d66f
Added ExportModsToStringTask 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-22 17:44:12 +03:00
Trial97
2e82c1d40c
Added regex expresion to exclude .DS_Store files 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-21 23:22:25 +03:00
TheKodeToad
0975dbc3dd
Merge pull request #1228 from Trial97/curent_pack_crash 
Fixes #1212
 2023-06-21 15:35:09 +01:00
DioEgizio
8aa02320e0
Merge pull request #1231 from telans/modrinth-default-icon 
Modrinth: use default icon for non-managed packs
 2023-06-21 12:25:26 +02:00
Rachel Powers
470518eb3a
fix: resize columns on hide ^& uniform heights 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-06-21 02:31:40 -07:00
seth
ca659136e2
Merge pull request #1119 from Trial97/mods_txt 
Added dynamic page extra info
 2023-06-20 19:56:38 -04:00
seth
f1a6dc5332
Merge pull request #1184 from clickdevin/develop 
Fix bugs when updating curseforge modpacks
 2023-06-20 19:55:48 -04:00
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
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
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
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
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
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
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
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