Evan Goode
|
48689d1b79
|
Merge remote-tracking branch 'upstream/release-9.x' into develop
|
2025-04-06 18:16:05 -05:00 |
|
Trial97
|
5073fc19d4
|
fix java autodetect when instance settings are open
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-09-14 00:36:31 +03:00 |
|
Trial97
|
ca298d1ed5
|
add automatic java switch on minecraft version switch
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-08-20 01:08:03 +03:00 |
|
Trial97
|
b5bbe93775
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-08-17 00:20:40 +03:00 |
|
Trial97
|
c9809fff6d
|
add setting for quickplay singleplayer
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-08-08 16:53:26 +03:00 |
|
Trial97
|
0ac62f9ddf
|
Recommend java major
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-07-23 01:41:41 +03:00 |
|
Alexandru Ionut Tripon
|
555c4a7c59
|
Apply suggestions from code review
Co-authored-by: seth <getchoo@tuta.io>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
|
2024-06-25 15:33:11 +03:00 |
|
Trial97
|
abb628edb3
|
remove OverrideJava
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-20 18:23:43 +03:00 |
|
Trial97
|
09c2c6793b
|
Improve UI
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-03-20 00:15:02 +02:00 |
|
Trial97
|
1322277ae6
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader
|
2024-03-17 20:57:53 +02:00 |
|
Trial97
|
9120848278
|
Made java downloader as a build option
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-03-06 19:33:14 +02:00 |
|
Alexandru Ionut Tripon
|
da96172b0b
|
Apply suggestions from code review
Co-authored-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
|
2024-02-26 22:00:40 +02:00 |
|
DioEgizio
|
44327980db
|
feat: add "use zink" button
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
|
2024-02-18 13:30:55 +01:00 |
|
Trial97
|
b4f3a969b3
|
Updated strings that are displayed to user
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-02-18 14:30:38 +02:00 |
|
Trial97
|
c0fb053ccc
|
Added warning for x86 java
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-02-09 23:14:49 +02:00 |
|
Trial97
|
3c58fb0677
|
Moving files around
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-02-02 15:51:32 +02:00 |
|
Trial97
|
7317105e4d
|
Code spaghetti and more chaos
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-01-27 22:47:28 +02:00 |
|
Trial97
|
25bca28707
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader
|
2024-01-24 18:26:48 +02:00 |
|
Trial97
|
219e2862f9
|
Fixed openAL placeholder
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-01-05 23:02:42 +02:00 |
|
Trial97
|
2256850cb6
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-10-27 00:12:50 +03: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 |
|
TheKodeToad
|
cc990c4f94
|
Merge branch 'develop' into env-vars
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-10-15 21:57:20 +01: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 |
|
TheKodeToad
|
d1566f2610
|
Merge branch 'develop' into env-vars
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-08-26 23:12:02 +01: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 |
|
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 |
|
TheKodeToad
|
8778313170
|
Merge remote-tracking branch 'upstream/develop' into feature/java-downloader
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-08-16 13:39:14 +01: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
|
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 |
|
TheKodeToad
|
f25d0a4e0e
|
Merge branch 'develop' into env-vars
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-08-05 18:01:53 +01:00 |
|
Sefa Eyeoglu
|
1d638e018a
|
chore: update license headers
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-08-04 19:41:47 +02:00 |
|
TheKodeToad
|
d48dd7eb6a
|
Use override-based setting for online fixes
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-08-04 16:00:02 +01:00 |
|
Sefa Eyeoglu
|
1d468ac35a
|
chore: reformat
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-08-02 18:35:35 +02:00 |
|
Rachel Powers
|
b9fe37aec1
|
Merge branch 'develop' into chore/add-compiler-warnings
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
|
2023-07-30 15:33:46 -07:00 |
|
TheKodeToad
|
d4ea9c2717
|
Merge branch 'develop' into feature/java-downloader
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-07-28 14:50:59 +01:00 |
|
TheKodeToad
|
bfafbdc51e
|
Merge branch 'develop' into env-vars
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-07-21 14:30:24 +01:00 |
|
TheKodeToad
|
c37e1fb9f1
|
Merge branch 'develop' into skinfix
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-07-20 18:11:27 +01:00 |
|
TheKodeToad
|
5f37e339fb
|
Merge branch 'develop' into feature/java-downloader
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-07-16 12:32:31 +01:00 |
|
Rachel Powers
|
520594e529
|
Merge branch 'develop' into chore/add-compiler-warnings
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
|
2023-07-13 20:05:16 -07:00 |
|
seth
|
89aaedc06c
|
feat: add toggle for quilt beacon
Signed-off-by: seth <getchoo@tuta.io>
|
2023-07-12 21:10:48 -04:00 |
|
TheKodeToad
|
997a3709d4
|
Custom environment variables UI and implementation
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-07-12 19:21:38 +01:00 |
|
Rachel Powers
|
8d7dcdfc5b
|
chore: fix shadowed member and signed/unsigned mismatch
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
chore: supress unused with [[maybe_unused]]
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
chore: unshadow ^&^& static_cast implicit return
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
chore: deshadow and mark unused in parse task
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
chore: mark unused in folder models
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
chore: deshadow and mark unused with instances
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
chore: more deshadow and unused
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
chore: remove uneeded simicolons
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
chore: mark unused
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
chore: prevent shadow
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
|
2023-07-01 23:39:38 -07:00 |
|
Trial97
|
c23bf2fd22
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into settings
|
2023-06-28 17:46:01 +03:00 |
|
TheKodeToad
|
c75ba0f855
|
Fix big mistake :iea:
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-06-25 12:46:07 +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 |
|
Trial97
|
820892d7cc
|
Made settings editable when instance is running
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-21 22:42:08 +03:00 |
|
TheKodeToad
|
3526d00a23
|
Merge branch 'develop' into feat/dont-hide-settings
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-06-14 20:05:02 +01:00 |
|