CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,262 Commits 10 Branches 30 Tags
d13db1109f47a64b3d2528bd5a97ddfa2a495e1e
Commit Graph

3025 Commits

Author SHA1 Message Date
Alex
cf4144cb50 Fixed link to Fulmine's website 
Signed-off-by: Alex <akim8@emich.edu>
 2023-11-05 00:46:05 -04:00
TheKodeToad
b446bdf4a9 Merge pull request #1783 from Trial97/visual_bug 
Fixed visual bug with Modlist export
 2023-11-03 15:20:57 +00:00
Alexandru Ionut Tripon
1bd69ecbb2 Update launcher/ui/pages/global/AccountListPage.cpp 
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2023-11-03 11:42:40 +02:00
Trial97
b18082376d Fixed visual bug with Modlist export 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-03 11:04:13 +02:00
Trial97
127a31ba3a Added warning for remove account 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-03 10:31:40 +02:00
Alexandru Ionut Tripon
f8bb1a872a Merge pull request #1766 from TheKodeToad/groups-fix 
Fix group issues
 2023-11-01 15:26:41 +00:00
Tayou
86e2f6c58c Merge pull request #1685 from Trial97/java 
Autodetect Java bundled with official launcher
 2023-10-31 18:03:41 +01:00
TheKodeToad
2526275c5e Better check 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-10-30 09:51:37 +00:00
TheKodeToad
5a54d80c6e Fix group issues 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-10-30 09:26:38 +00:00
Tayou
69c2720872 Merge pull request #1691 from Trial97/no_color 
Add no_color env variable
 2023-10-28 18:02:53 +02:00
Tayou
df2a92d5f4 Merge pull request #1742 from TayouVR/fix-resourcepack-crash 
fix switch/case fallthrough in resource parse tasks
 2023-10-28 12:44:40 +02:00
Sefa Eyeoglu
3719ea21b0 Merge pull request #1355 from TheKodeToad/env-vars 
Custom environment variables
 2023-10-26 22:10:26 +02:00
TheKodeToad
bd11b93a0c Use hidden tab bar like other pages 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-10-26 21:01:24 +01:00
Trial97
12d567a9b8 made env vars behave like the rest of the settings 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-26 22:51:38 +03:00
txtsd
38d77b58cd Merge pull request #1748 from LocalSpook/using 2023-10-25 16:08:42 +00:00
Tayou
a161f5cfe2 Merge pull request #1747 from Trial97/fix_initial_java 
fix: java memory not set on initial setup
 2023-10-24 19:04:56 +02:00
LocalSpook
5be80df1ee Replace typedef with using 
Signed-off-by: LocalSpook <56512186+LocalSpook@users.noreply.github.com>
 2023-10-24 01:36:27 -07:00
Trial97
87f2f88d4c fix: java memory not set on initial setup 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-23 23:38:03 +03:00
Sefa Eyeoglu
b376888f43 Merge pull request #1515 from TheKodeToad/sysprops 2023-10-22 21:57:11 +02:00
Tayou
0fe3241df6 remove now unneeded Q_ASSERTs 
Signed-off-by: Tayou <git@tayou.org>
 2023-10-22 21:25:06 +02:00
Tayou
7d5206818b fix switch/case fallthrough 
Signed-off-by: Tayou <git@tayou.org>
 2023-10-22 21:25:00 +02:00
Sefa Eyeoglu
db19362a97 feat: add launcher brand and version props 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-10-22 21:19:44 +02:00
Alexandru Ionut Tripon
2c4af7e793 Merge pull request #1290 from Trial97/refactor/NetActions 
Refactor ImgurUpload
 2023-10-21 12:32:16 +01:00
Alexandru Ionut Tripon
f0fd1bd5e5 Merge pull request #1737 from Trial97/fix_ftb_app_import_icon 
Fixed FTBApp import icon
 2023-10-21 07:48:21 +01:00
Trial97
80723eeca1 Fixed FTBApp import icon 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-20 16:41:32 +03:00
TheKodeToad
e9fd02baca Fix code style 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-10-20 13:12:16 +01:00
Alexandru Ionut Tripon
7ad48d8677 Merge pull request #1692 from Trial97/msa_account 
Fix wrong account selection
 2023-10-19 20:09:28 +01:00
Tayou
b9c1dc7325 Merge pull request #1374 from Trial97/welcome_background 
Added welcome screen
 2023-10-19 20:42:47 +02:00
TheKodeToad
cf33927f21 Merge remote-tracking branch 'upstream/develop' into sysprops 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-10-19 11:28:07 +01:00
TheKodeToad
c638a63a03 Merge pull request #1726 from Trial97/contrib 
Added Trial97 as maintainer in about dialog
 2023-10-18 09:34:12 +01:00
Sefa Eyeoglu
2081fcd3f5 Merge pull request #1722 from Scrumplex/fix/readonly-themes 2023-10-18 09:25:48 +02:00
Trial97
165d218300 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into contrib 2023-10-18 09:07:36 +03:00
seth
069bc887f1 fix: don't always build updater on platforms besides mac 
Signed-off-by: seth <getchoo@tuta.io>
 2023-10-17 19:12:00 -04:00
Sefa Eyeoglu
d348f20dd9 fix: allow loading themes with missing resources folder 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-10-17 10:00:17 +02:00
Tayou
436db23ffc Merge pull request #1268 from Ryex/feat/launcher-updater 
Feat: Windows (And portable linux / appimage) Auto Updater
 2023-10-16 19:53:50 +02:00
Alexandru Ionut Tripon
0927035a26 Merge pull request #1549 from Trial97/atlauncher_browser 
added suport for atlauncher browser download
 2023-10-16 06:39:12 +01:00
Tayou
5985d8b118 Merge pull request #1383 from TheKodeToad/rename-groups 
Rename groups
 2023-10-15 23:38:27 +02:00
TheKodeToad
cc990c4f94 Merge branch 'develop' into env-vars 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-10-15 21:57:20 +01:00
TheKodeToad
c4882e7162 Merge pull request #443 from TheKodeToad/skinfix 
Add legacy skin fix
 2023-10-15 21:46:29 +01:00
Trial97
9d15255e0a Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into atlauncher_browser 2023-10-15 20:52:38 +03:00
Trial97
ca9b593483 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into refactor/NetActions 2023-10-15 20:44:45 +03:00
Trial97
6bbff310bc Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feat/launcher-updater 2023-10-15 17:42:39 +03:00
TheKodeToad
6fb7a98901 Fix small mistake 😭 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-10-15 14:45:05 +01:00
Tayou
9705e6325a Merge pull request #1673 from Trial97/win_attr 
fix folder attributes on windows copy
 2023-10-15 15:15:36 +02:00
TheKodeToad
7112d04df5 Mark setting as optional 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-10-15 14:11:08 +01:00
Alexandru Ionut Tripon
2ab48a43dd Merge pull request #1706 from Trial97/develop 
removed the better release for modrinth modpacks
 2023-10-15 12:24:20 +01:00
Trial97
023b3e3c39 Fixed arch build 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-14 09:41:04 +03:00
Tayou
7015b8f7b2 Merge pull request #1563 from Trial97/modrinth_pack 
Pack import fixes and improvements
 2023-10-13 16:38:37 +02:00
Trial97
32eaaa25d9 removed the better release for modrinth modpacks 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-13 00:04:36 +03:00
Alexandru Ionut Tripon
ca4b58d5d7 Merge pull request #1405 from Trial97/update_file 
Allow updating managed packs from local file
 2023-10-10 16:17:08 +01:00