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 |
|
TheKodeToad
|
7112d04df5
|
Mark setting as optional
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-10-15 14:11:08 +01:00 |
|
TheKodeToad
|
d49f81d132
|
Drop leftover mod loader settings
I messed up the merge.
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-10-06 11:27:04 +01:00 |
|
Sefa Eyeoglu
|
2ff9ef0620
|
Merge pull request #1363 from Trial97/download_threads
|
2023-09-28 22:02:57 +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 |
|
TheKodeToad
|
e3b04d10cf
|
Merge pull request #1536 from Trial97/time3
Allow showing playtime in hours
|
2023-08-27 18:14:04 +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 |
|
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
|
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
|
6d1c67663d
|
feat:added option to show playtime in hours
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-18 12:24:28 +03:00 |
|
TheKodeToad
|
ffd8ed550f
|
Reformat
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-08-17 18:53:32 +01:00 |
|
Sefa Eyeoglu
|
e88418ab7f
|
Merge pull request #1392 from Scrumplex/feat-native-override
|
2023-08-17 16:09:16 +02: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
|
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
|
c94ee67077
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into curseforge-url-handle3
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-15 12:16:00 +03:00 |
|
Sefa Eyeoglu
|
b927e58126
|
fix: improve debug message
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-08-15 10:52:08 +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
|
7ba1e7d356
|
Merge pull request #1407 from TheKodeToad/icon-indexing
|
2023-08-15 10:43:29 +02:00 |
|
Sefa Eyeoglu
|
91ba4cf75e
|
chore: reformat
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-08-14 18:16:53 +02:00 |
|
TheKodeToad
|
e079cbb055
|
Fix actions
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-08-07 13:51:26 +01:00 |
|
Tayou
|
9afa7cc91f
|
Merge branch 'develop' into icon-indexing
Signed-off-by: Tayou <31988415+TayouVR@users.noreply.github.com>
|
2023-08-07 10:32:38 +02:00 |
|
Sefa Eyeoglu
|
74fe2fb2a6
|
Merge remote-tracking branch 'upstream/staging' into curseforge-url-handle
|
2023-08-06 21:54:00 +02:00 |
|
seth
|
efaf4024ab
|
Merge pull request #1464 from Ryex/fix/windows-console-attach
[Windows] Fix attaching logs to console
|
2023-08-06 15:37:44 -04: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
|
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 |
|
Sefa Eyeoglu
|
ae793f6cf1
|
Merge pull request #1459 from Scrumplex/format
|
2023-08-04 19:42:36 +02:00 |
|
TheKodeToad
|
c5bffed21e
|
Merge branch 'PrismLauncher:develop' into skinfix
|
2023-08-04 16:29:30 +01: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
|
fa2b784f7e
|
Merge branch 'develop' into sparkle-disable
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-08-02 19:27:48 +02:00 |
|
Sefa Eyeoglu
|
f561e7febf
|
Merge pull request #1476 from Scrumplex/fix-saving-metaurl
|
2023-08-02 19:24:24 +02:00 |
|
Sefa Eyeoglu
|
39d4f0df66
|
fix: don't reset meta url on launch
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-08-02 18:56:54 +02:00 |
|
Sefa Eyeoglu
|
1d468ac35a
|
chore: reformat
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-08-02 18:35:35 +02:00 |
|
Sefa Eyeoglu
|
ea56ff255d
|
Merge pull request #1339 from TheKodeToad/remove-direct-launch
|
2023-08-02 18:31:27 +02:00 |
|
Rachel Powers
|
186211244d
|
refactor(windows console): move to external file
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
|
2023-07-30 13:38:47 -07:00 |
|
Rachel Powers
|
5740ee0444
|
fix(windows console): properly bind windows console
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
|
2023-07-30 13:38:47 -07:00 |
|
Ash
|
d133b40b25
|
Merge branch 'PrismLauncher:develop' into develop
|
2023-07-28 21:22:35 +00:00 |
|
seth
|
51bfda937d
|
chore: don't include sparkle when not enabled
Signed-off-by: seth <getchoo@tuta.io>
|
2023-07-27 02:19:21 -04:00 |
|
TheKodeToad
|
57430fd189
|
Merge branch 'develop' into better-launch
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-07-22 11:26:02 +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
|
1a7c5693cc
|
Remove redundant methods
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-07-21 13:01:01 +01:00 |
|
TheKodeToad
|
f8b935ab37
|
Merge remote-tracking branch 'upstream/develop' into icon-indexing
|
2023-07-21 12:48:05 +01:00 |
|
TheKodeToad
|
842f08dcfc
|
(UX) Add open folder button next to combo boxes
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-07-20 11:54:15 +01:00 |
|
TheKodeToad
|
960093700a
|
Better theme reset
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-07-19 20:57:08 +01:00 |
|
Trial97
|
f046bd7d50
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into catpacks
|
2023-07-19 12:26:12 +03:00 |
|
TheKodeToad
|
97662f5c8e
|
Multiple icon themes!
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-07-18 22:51:34 +01:00 |
|
Tayou
|
e8c44e700d
|
Merge pull request #1286 from TayouVR/better-instance-group-separator
|
2023-07-17 11:55:31 +02:00 |
|
Sefa Eyeoglu
|
aaf1726965
|
Merge pull request #1357 from getchoo/quilt-beacon
feat: add toggle for quilt beacon
|
2023-07-17 06:42:46 +02:00 |
|
seth
|
5e0df9b696
|
Merge pull request #1276 from Scrumplex/print-build-platform
Print build platform on launch
|
2023-07-16 17:15:55 -04:00 |
|
Trial97
|
0a956bbc73
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into catpacks
|
2023-07-16 14:18:26 +03:00 |
|