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

6252 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Trial97
cf2393a509
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into settings 2023-07-02 15:56:39 +03:00
Sefa Eyeoglu
b51f1f1d41
Merge pull request #1298 from TurboWafflz/develop 2023-07-02 09:52:59 +02:00
Finian Wright
3fe518ff2b Fix compiling on OpenBSD 
Signed-off-by: Finian Wright <turbowafflz@gmail.com>
 2023-07-02 00:36:21 -04:00
seth
c523765c19
Merge pull request #1292 from Trial97/export5 
Removed logs from instance export
 2023-07-01 04:14:35 +00:00
Trial97
18e628e873
removed extra condition 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-30 12:10:00 +03:00
Trial97
81207c6502
Made sure the logs are ignored when collecting files 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-30 10:52:10 +03:00
Trial97
87efa700ab
Removed logs from instance export 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-30 00:01:36 +03:00
Trial97
0f64ee6a5f
Added warnings for running instances 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-28 18:28:25 +03:00
Trial97
c23bf2fd22
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into settings 2023-06-28 17:46:01 +03:00
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
seth
90fc720190
Merge pull request #1281 from Trial97/screenshot 
Added more information to the screenshot upload warning
 2023-06-27 20:01:18 +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
41d0f74750
Merge pull request #1275 from Scrumplex/git-blame-ignore 2023-06-26 10:56:26 +02:00
Sefa Eyeoglu
f8f1c3cf23
chore: add Git Blame ignore file 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-06-26 09:08:03 +02:00
Sefa Eyeoglu
ed4dce2fb6
fix: install logo to multimc theme in genicons.sh 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-06-26 08:59:48 +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
1bd778d0ae
Merge pull request #1270 from TheKodeToad/fix-unchecked-value 
Fix unsafe usage of std::optional::value in FlameAPI
 2023-06-25 18:24:29 +01: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
TheKodeToad
bcf45c74a1
Merge pull request #986 from Trial97/develop 
Mod dependencies
 2023-06-24 14:04: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
Rachel Powers
68865353cf
Merge pull request #1259 from PrismLauncher/update-devs 
Update developers
 2023-06-23 21:38:16 -07: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
TheKodeToad
741c23a72a
Merge pull request #1256 from Trial97/fix11 
Fixed hashers
 2023-06-23 19:53:44 +01: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
Rachel Powers
046d510134
Merge pull request #1200 from Trial97/net_job_crash 
Made ByteSynkArray to use shared_ptr
 2023-06-23 09:13:52 -07:00