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

2256 Commits

Author SHA1 Message Date
Sefa Eyeoglu
faec21d572
Merge pull request #1266 from TheKodeToad/smol-tweaks 2023-06-28 08:47:53 +02:00
seth
213f03351f
Merge pull request #1280 from Trial97/shortcut 
Fixed illegal characters in shortcuts name
 2023-06-27 20:01:48 +00:00
Trial97
54cb077b40
Added more information to the screenshot upload warning 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-27 19:31:36 +03:00
Trial97
92847b9774
omit icon remove on macos 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-27 19:15:20 +03:00
Trial97
6e5716f097
Fixed illegal characters in shortcuts name 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-27 19:05:32 +03:00
TheKodeToad
904b128afe
Merge pull request #1277 from Trial97/remove_mojang 
Removed unused files
 2023-06-26 23:09:27 +01:00
Trial97
dffffc784e
Removed unused files 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-26 22:33:10 +03:00
Sefa Eyeoglu
d25452a64e
Merge pull request #1274 from TheKodeToad/java-signature 2023-06-26 11:19:53 +02:00
Sefa Eyeoglu
4d49486cc9
Merge pull request #1065 from leo78913/gamescope-close-button 2023-06-26 08:45:28 +02:00
TheKodeToad
8bebd7f042 Generate special signature ✨ composed of multiple elements instead of relying on timestamp for Java version cache invalidation 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-06-26 01:30:47 +01:00
seth
903fae94be
Merge pull request #1272 from Trial97/fix_selected 
fix: Page container extra info set on logs page
 2023-06-25 21:16:18 +00:00
Trial97
6d0e255ca1
fix: Page container extra info set on logs page 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-25 22:00:33 +03:00
TheKodeToad
4745ab64cd Deduplicate launcher icon 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-06-25 15:02:25 +01:00
Leo
953a2590e2
Add fixme comment for no SSD detection 
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
Signed-off-by: Leo <leo3758@riseup.net>
 2023-06-25 10:11:58 -03:00
TheKodeToad
02b628653b Fix markdown header 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-06-25 13:43:03 +01:00
TheKodeToad
c75ba0f855
Fix big mistake :iea: 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-06-25 12:46:07 +01:00
TheKodeToad
514080653f Fix unsafe usage of std::optional::value in FlameAPI 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-06-25 11:56:28 +01:00
TheKodeToad
603ed22015 Replace accidental usages of QAbstractButton::pressed 
This signal is not usually what you want, and creates an inconsistent experience.

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-06-25 10:36:54 +01:00
TheKodeToad
5eb71fc6a9 Revert "feat(Mods): hide 'Provider' column when no mods have providers" 
With Ryex's change, this causes issues. Apparently you need to sign off reverts! That's just weird...

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-06-24 23:36:32 +01:00
TheKodeToad
8a3aba1634 Fix Open Global Settings, why not 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-06-24 23:30:51 +01:00
TheKodeToad
bb8e6ef35e Fix flat white launcher icon 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-06-24 23:27:01 +01:00
TheKodeToad
529e2054ea A few tweaks, with inspiration from Zeke :3 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-06-24 23:26:27 +01:00
Trial97
8b576fd2bd
Added translation 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-24 15:59:55 +03:00
Trial97
7fdd68d768
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop 2023-06-24 15:58:55 +03:00
Sefa Eyeoglu
df6d46de9e
Merge pull request #1261 from telans/modrinthexport-url 2023-06-24 10:51:14 +02:00
Rachel Powers
4322222acc
Merge pull request #1255 from Trial97/export4 
Added Thumbs.db to excluded files in MrPackExport
 2023-06-23 21:40:55 -07:00
seth
cce6a54701
Merge pull request #1258 from leo78913/resources-pack-page-crash-fix 
fix: fix crash when hiding columns on resource packs page
 2023-06-24 00:39:47 -04:00
James Beddek
20ba6e5fb5
modrinth: use encoded url when exporting pack 
Ensures that necessary url components such as spaces are encoded.
Prevents an error when submitting the resulting file to modrinth.

See https://discord.com/channels/734077874708938864/1120070731242410024

Fixes: #1226
Signed-off-by: James Beddek <telans@posteo.de>
 2023-06-24 15:42:58 +12:00
TheKodeToad
d74a23d5b2
Update developers 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-06-23 21:00:55 +01:00
leo78913
750209b8bb
fix: fix crash when hiding columns on resource packs page 
Signed-off-by: leo78913 <leo3758@riseup.net>
 2023-06-23 16:55:51 -03:00
Trial97
28de461067
Fixed hashers 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-23 21:38:41 +03:00
Trial97
69c709b05a
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-23 20:01:17 +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
Trial97
763b3c3236
Added Thumbs.db to excluded files in MrPackExport 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-23 10:38:26 +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
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