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

340 Commits

Author SHA1 Message Date
Sefa Eyeoglu
3719ea21b0
Merge pull request #1355 from TheKodeToad/env-vars 
Custom environment variables
 2023-10-26 22:10:26 +02: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
LocalSpook
5be80df1ee Replace typedef with using 
Signed-off-by: LocalSpook <56512186+LocalSpook@users.noreply.github.com>
 2023-10-24 01:36:27 -07:00
Alexandru Ionut Tripon
2c4af7e793
Merge pull request #1290 from Trial97/refactor/NetActions 
Refactor ImgurUpload
 2023-10-21 12:32:16 +01: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
ca9b593483
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into refactor/NetActions 2023-10-15 20:44:45 +03:00
TheKodeToad
6fb7a98901
Fix small mistake 😭 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-10-15 14:45:05 +01: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
ca4b58d5d7
Merge pull request #1405 from Trial97/update_file 
Allow updating managed packs from local file
 2023-10-10 16:17:08 +01:00
Trial97
2cea7454ef
fix: do not update mods if no mod loader is selected 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-01 23:04:19 +03:00
Sefa Eyeoglu
e3a147f56d
Merge pull request #1656 from Trial97/remove_mojang2 2023-10-01 14:32:42 +02:00
Sefa Eyeoglu
2ff9ef0620
Merge pull request #1363 from Trial97/download_threads 2023-09-28 22:02:57 +02:00
seth
f370f0d749
chore: cleanup a few more mentions of mojang accounts 
Signed-off-by: seth <getchoo@tuta.io>
 2023-09-27 05:34:48 -04:00
Sefa Eyeoglu
546d49e183
Merge pull request #1530 from Trial97/metadata_delete 2023-09-04 17:02:52 +02:00
TheKodeToad
1213a5ab46
Merge remote-tracking branch 'upstream/develop' into skinfix 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-09-02 22:27:57 +01:00
Trial97
211865a1e1
handle gracefully the upload abort 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-28 13:31:19 +03:00
TheKodeToad
d1566f2610
Merge branch 'develop' into env-vars 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-08-26 23:12:02 +01:00
Sefa Eyeoglu
85c23b26de
chore: reformat 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-08-23 13:46:23 +02:00
Sefa Eyeoglu
2283498ccb
Merge pull request #1552 from Trial97/memory_quick_setup 2023-08-23 11:56:53 +02:00
Alexandru Ionut Tripon
06dbd381f8
Update launcher/ui/pages/instance/InstanceSettingsPage.cpp 
Co-authored-by: Tayou <31988415+TayouVR@users.noreply.github.com>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2023-08-22 16:16:57 +03:00
Trial97
09aca7a0b5
Added warning to settings page 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-22 10:52:35 +03:00
TheKodeToad
fff378b643
Merge pull request #1553 from TheKodeToad/list-fixes 
A few boring list-related fixes
 2023-08-21 15:33:16 +01:00
TheKodeToad
d7dadabfbf
List fixes 
Double-click to toggle profile components.
Restore double-click to toggle resources.
Fix clicking on checkbox to select account.
Double-click to select account.

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-08-21 14:44:46 +01:00
Danny Dorazio
8092c321a9 Replace instances of “Minecraft account” 2023-08-20 23:00:25 -04:00
Sefa Eyeoglu
5b4dcae7d9
Revert "feat: add toggle for quilt beacon" 
This reverts commit 89aaedc06c.

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-08-20 13:23:11 +02:00
Sefa Eyeoglu
963627fe98
Revert "chore: better explain quilt loader beacon" 
This reverts commit a2a09ffe01.

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-08-20 13:23:08 +02:00
TheKodeToad
f99b04bd16
Merge pull request #1320 from TheKodeToad/better-launch 
Combine launch buttons in instance window, persist profiler
 2023-08-19 11:08:02 +01:00
Trial97
044ce4df32
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into update_file 2023-08-17 15:24:14 +03:00
TheKodeToad
3e2733d840
Merge branch 'develop' into better-launch 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-08-16 22:23:38 +01:00
Trial97
b0e197de38
removed warning for one mod selected 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-16 21:26:43 +03:00
Alexandru Ionut Tripon
6c2c724bd9
Update launcher/ui/pages/instance/ExternalResourcesPage.ui 
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2023-08-16 21:03:09 +03:00
Trial97
f919d363b7
made safe for vegetarians 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-16 20:02:32 +03:00
Trial97
589d8b6923
feat:Added remove metadata button 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-16 19:53:39 +03:00
Trial97
cf27d2f9ab
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into download_threads 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-15 12:49:21 +03:00
Trial97
6c362afc21
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into refactor/NetActions 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-15 12:41:46 +03:00
Sefa Eyeoglu
06aba530d7
fix: add missing header 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-08-15 10:52:40 +02:00
Sefa Eyeoglu
83aa0062c7
feat: add custom native library path settings 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-08-15 10:51:21 +02:00
Sefa Eyeoglu
1939e3e6ed
chore: reformat 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-08-15 09:02:15 +02:00
Trial97
0ba88ff138
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into staging 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-15 00:33:24 +03:00
Sefa Eyeoglu
215d7dbb74
chore: update license headers 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-08-14 18:17:05 +02:00
Sefa Eyeoglu
91ba4cf75e
chore: reformat 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-08-14 18:16:53 +02:00
Sefa Eyeoglu
35358f8180
Merge remote-tracking branch 'upstream/staging' into chore/add-compiler-warnings 2023-08-12 11:17:11 +02:00
Sefa Eyeoglu
396f812496
Merge pull request #1230 from TheKodeToad/better-component-installation 
Revamp loader installation UI
 2023-08-11 08:24:14 +02:00
Sefa Eyeoglu
ef6f9487f4
Merge remote-tracking branch 'upstream/staging' into chore/add-compiler-warnings 2023-08-10 20:38:32 +02:00
Sefa Eyeoglu
2090f958c8
Merge pull request #1324 from leia-uwu/ui-tweaks 2023-08-10 12:24:41 +02:00
TheKodeToad
f25d0a4e0e
Merge branch 'develop' into env-vars 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-08-05 18:01:53 +01:00
Trial97
1d3f2674d1
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into refactor/NetActions 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-05 19:21:37 +03:00
Trial97
b2fdd83594
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into download_threads 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-05 19:09:10 +03:00
Trial97
91eb30f037
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into pack_changelog 2023-08-05 19:04:53 +03:00