ONIMAI-SMP/ShatteredPrism
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity
8,568 Commits 4 Branches 5 Tags 40 MiB
78ceae9c17
Commit Graph

307 Commits

Author SHA1 Message Date
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
4c76f7afe0
Made auto java checkbox dependent 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-02-18 09:46:44 +02:00
Trial97
a7dad96a70
Added refresh button on managed java list 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-02-18 09:32:31 +02:00
Trial97
2941307581
Added basic java auto-detect and auto-download 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-02-16 23:42:39 +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
27d662e642
Added management for downloaded javas from prism 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-02-09 22:47:39 +02:00
Trial97
b3fc07d444
Added extra java search paths 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-02-08 21:47:59 +02:00
Trial97
3d29da916d
Made Java path configurable 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-02-08 20:15:19 +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
9bbeb5ef3a
Made updater interval configurable 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-01-22 21:26:46 +02:00
TheKodeToad
f285c3fe13
Merge pull request #1972 from lumiscosity/feature/cat_opacity 
Add a cat opacity option
 2024-01-06 19:42:17 +00:00
TheKodeToad
05e4533096
Add online mode fix for legacy versions; minor refactors in legacy 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-01-02 18:11:54 +00:00
lumiscosity
43306350e0 Add cat opacity 
Signed-off-by: lumiscosity <averyrudelphe@gmail.com>
 2023-12-22 15:02:41 +01:00
Trial97
908072710a
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-23 14:34:56 +02:00
Sefa Eyeoglu
d60d089cbc
Merge pull request #1751 from LocalSpook/account_type 2023-11-23 10:27:06 +01:00
Trial97
a7be21733f
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector 2023-11-23 10:41:55 +02:00
Sefa Eyeoglu
48e9753fb5
Merge pull request #1880 from Trial97/link 2023-11-23 09:07:34 +01:00
Sefa Eyeoglu
364fb9808e
Merge pull request #1347 from HyperSoop/reduce-min-memory 2023-11-23 08:58:58 +01:00
Trial97
196d24330a
Fixed open link on settings page 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-21 17:47:59 +02:00
Trial97
54c308e5b5
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-19 21:15:12 +02:00
Trial97
361329d5d1
Made resource columns resizable 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-14 23:21:53 +02:00
Desoroxxx
6093399f5c
Update LauncherPage.ui 
Signed-off-by: Desoroxxx <desoroxxx@gmail.com>
 2023-11-08 17:32:30 +01:00
Trial97
7a0b2a316a
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-06 23:19:58 +02:00
TheKodeToad
bd9d5e0990
Reword 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-11-05 20:31:48 +00:00
Trial97
9a8667e99c
Added Global Dependenicies toggle 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-05 22:22:49 +02: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
127a31ba3a
Added warning for remove account 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-03 10:31:40 +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
LocalSpook
9d972ccc63 Localize account type in account list 
Signed-off-by: LocalSpook <56512186+LocalSpook@users.noreply.github.com>
 2023-10-26 13:32:33 -07: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
Trial97
869f654a10
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-16 22:46:11 +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
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
Trial97
0b6373e4df
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-10 19:46:27 +03:00
Sefa Eyeoglu
e3a147f56d
Merge pull request #1656 from Trial97/remove_mojang2 2023-10-01 14:32:42 +02:00
Trial97
2e4fcd6aa3
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-09-28 23:26:15 +03: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
Trial97
7c636d4608
Removed mojang 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-09-25 17:44:04 +03:00
Trial97
c86b8b0f70
added skin manage dialog 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-09-05 00:18:36 +03: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
9ad029e028
added skins directory 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-09-01 23:10:33 +03:00
Trial97
609eaa67ab
refactored skin apis 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-09-01 21:23:51 +03: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
2283498ccb
Merge pull request #1552 from Trial97/memory_quick_setup 2023-08-23 11:56:53 +02:00
Alexandru Ionut Tripon
3574d89e0f
Update launcher/ui/pages/global/JavaPage.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:50 +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
3638fc0a7d Update “Welcome” message on account list page 2023-08-20 23:00:50 -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
Alexandru Ionut Tripon
28ffa8bf44
Update launcher/ui/pages/global/MinecraftPage.ui 
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2023-08-18 12:57:08 +03: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
f3baa420b2
Fix broken tab order 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-08-16 13:45:22 +01: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
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
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
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
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
1d638e018a
chore: update license headers 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-08-04 19:41:47 +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
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
tjw123hh
280f041acb Delete some incorrect notr="true" tags 
Signed-off-by: tjw123hh <tjw123hh@outlook.com>
 2023-07-25 17:35:31 +08:00
tjw123hh
6a01c277e8 Delete some incorrect tags 2023-07-24 20:41:22 +08:00
TheKodeToad
bfafbdc51e
Merge branch 'develop' into env-vars 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-07-21 14:30:24 +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
TheKodeToad
5f37e339fb
Merge branch 'develop' into feature/java-downloader 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-07-16 12:32:31 +01:00
seth
a2a09ffe01
chore: better explain quilt loader beacon 
Signed-off-by: seth <getchoo@tuta.io>
 2023-07-15 14:25:05 -04:00
Trial97
db9f5f44e0
Split in two the options 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-14 22:26:22 +03:00
Trial97
cebb4dd17a
made the number of concurrent tasks configurable 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-14 20:39:53 +03: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
HyperSoop
bca120e798 Reduce mininmum memory amounts 
Signed-off-by: HyperSoop <pasha.mirus@gmail.com>
 2023-07-11 21:25:26 +03:00
TheKodeToad
91c9082d19
Merge pull request #1249 from Trial97/curse 
Curseforge modpack export
 2023-07-10 14:20:29 +01:00
Sefa Eyeoglu
51e62761ee
fix: improve QUrl construction 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-07-07 19:25:12 +02:00
Sefa Eyeoglu
073cb91f88
fix(ui): validate meta override url 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-07-07 15:56:07 +02:00
leo78913
f9578066d6
make "browse" buttons and java pages more consistent 
Signed-off-by: leo78913 <leo3758@riseup.net>
 2023-07-06 01:39:59 -03: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
Tayou
1dc7f80034
4 clang-tidy changes, update copyright info 
while already at it I updated all my emails to use one from my domain
Signed-off-by: Tayou <tayou@gmx.net>
 2023-06-28 23:08:04 +02:00
Sefa Eyeoglu
0aaec9ae4f
chore: remove obsolete macOS warning 
We don't support that macOS version. This check also never worked, as we
never set the platform to that value.

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-06-26 11:53:48 +02:00
Trial97
30ef5475c7
Made sure CurseForge string is corect 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-24 14:50:05 +03:00
Alfio
f769b0b4c6 Remove inconsistent/unneeded question marks in UI 
Signed-off-by: P2 <tomarchioalfio5@gmail.com>
 2023-06-20 10:40:27 +02:00
Tayou
e884341795
save meta custom url as string, not QUrl 
Signed-off-by: Tayou <tayou@gmx.net>
 2023-06-06 18:15:26 +02:00
Sefa Eyeoglu
d535f73a58
Merge pull request #950 from DioEgizio/resize-settings 
fix: divide minecraftpage into tabs
 2023-05-06 08:28:46 +02:00