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

491 Commits

Author SHA1 Message Date
Trial97
d77d1f3be3
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into coremods 2024-05-18 14:44:33 +03:00
Trial97
7a5348a179
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 2024-05-18 14:14:31 +03:00
SabrePenguin
51f4ede797 Fixing CI format issues 
Signed-off-by: SabrePenguin <lknofczynski@gmail.com>
 2024-05-01 00:11:53 -04:00
SabrePenguin
b9c010ffb2 Added patch to all setHtml calls 
Signed-off-by: SabrePenguin <lknofczynski@gmail.com>
 2024-04-30 23:43:36 -04:00
Trial97
89230c4f8a
Moved the export modlist out of the sub-menu 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-04-20 18:01:25 +03:00
Trial97
d88fb266a5
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into move_export2 2024-04-20 17:42:58 +03:00
Trial97
f6572c1244
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into shader 2024-03-27 18:55:34 +02:00
Evan Goode
96b4933326 Merge Prism Launcher 8.2 
Signed-off-by: Evan Goode <mail@evangoo.de>
 2024-03-21 10:59:32 -04: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
ad98f600d5
corecly display core mods tab 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-01-26 18:36:31 +02:00
Trial97
e897032383
Added java metadata 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-01-25 22:22:21 +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
Sefa Eyeoglu
fec1a00dc8 fix: simplify openPath calls 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
(cherry picked from commit 67d088dc53)
 2024-01-17 14:19:03 +00:00
Sefa Eyeoglu
6f5d074b4b fix: open paths directly 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
(cherry picked from commit 0ccdcd23e3)
 2024-01-17 14:19:03 +00:00
Sefa Eyeoglu
0b3e91ac62
Merge pull request #1954 from Scrumplex/fix/open-paths-immediately 2024-01-17 15:18:46 +01:00
Sefa Eyeoglu
67d088dc53
fix: simplify openPath calls 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2024-01-14 11:36:17 +01:00
Trial97
d94e641900
Load versions on first edit 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-01-07 22:00:31 +02:00
Trial97
4a17799449 Fixed openAL placeholder 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 219e2862f9)
 2024-01-06 23:23:49 +00:00
Trial97
219e2862f9
Fixed openAL placeholder 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-01-05 23:02:42 +02:00
TheKodeToad
f31bf5a1f1 Add online mode fix for legacy versions; minor refactors in legacy 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit 05e4533096)
 2024-01-03 17:25:14 +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
a108a01be7 Update ModFolderPage.cpp 
Signed-off-by: lumiscosity <averyrudelphe@gmail.com>
(cherry picked from commit 56397446db)
 2023-12-16 16:25:35 +00:00
lumiscosity
56397446db
Update ModFolderPage.cpp 
Signed-off-by: lumiscosity <averyrudelphe@gmail.com>
 2023-12-16 12:53:59 +01:00
Sefa Eyeoglu
0ccdcd23e3
fix: open paths directly 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-12-14 13:02:29 +01:00
Trial97
4498d32cc0
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into move_export2 2023-12-13 14:37:02 +02:00
Trial97
d10b075677
Sort mods before export 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-12-13 14:36:58 +02:00
Sefa Eyeoglu
2837ae8bff
Merge pull request #1738 from Trial97/some_removals 2023-12-11 11:31:55 +01:00
Sefa Eyeoglu
3e54d4ddbb
Merge pull request #1732 from Trial97/update_file2 2023-12-11 11:25:10 +01:00
Sefa Eyeoglu
79218cf13b
Merge pull request #1738 from Trial97/some_removals 2023-12-11 11:08:26 +01:00
Trial97
6f6b6312a5
Moved the button up 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-27 09:39:31 +02:00
Trial97
1a0fd5f993
Added mod reinstall dialog 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-25 00:18:10 +02:00
Trial97
ff5a968de0
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into update_file2 2023-11-23 23:57:20 +02:00
Trial97
1650237c8f
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into some_removals 2023-11-23 23:37:13 +02:00
Trial97
2318a83881
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into shader 2023-11-23 16:33:57 +02:00
Trial97
afcdb7595c
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into move_export2 2023-11-23 16:01:54 +02:00
Sefa Eyeoglu
a966289944
Merge pull request #1852 from Trial97/war_ning 2023-11-23 11:01:53 +01:00
Trial97
d8c5ed55c2
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into update_file2 2023-11-23 12:00:18 +02:00
Trial97
6169af70db
Added back the FIXME comment 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-23 11:59:35 +02:00
Trial97
6b3b54f061
format 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-23 10:48:11 +02:00
Trial97
d5d8b7be8d
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into move_export2 2023-11-23 10:45:35 +02:00
Trial97
673f82e884
Merge branch 'war_ning' of github.com:Trial97/PrismLauncher into war_ning 2023-11-23 10:45:06 +02:00
Trial97
f18f7147b5
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into war_ning 2023-11-23 10:44:49 +02:00
Sefa Eyeoglu
b42434bcb6
Merge remote-tracking branch 'upstream/develop' into const-in-declarations 2023-11-23 09:06:23 +01:00
Sefa Eyeoglu
364fb9808e
Merge pull request #1347 from HyperSoop/reduce-min-memory 2023-11-23 08:58:58 +01:00
Trial97
53c6493b9a
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into move_export2 2023-11-17 21:56:23 +02:00
TheKodeToad
7ef2bda269
Improve description 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-11-17 19:49:48 +00:00
Alexandru Ionut Tripon
1150249cec
Merge pull request #1746 from Trial97/toggle_deps 
separated dependecy check from mod update
 2023-11-17 19:42:22 +00:00
Evan Goode
9430026192 Merge tag '8.0' into unmojang-8.0 
Upstream changelog: https://github.com/PrismLauncher/PrismLauncher/releases/tag/8.0

(Imcomplete) list of changes in 8.0 relevant to PollyMC:
- Prism has dropped support for Mojang accounts
  - https://github.com/PrismLauncher/PrismLauncher/pull/1656
  - Added it back to PollyMC primarily since the Mojang authentication
    code is also used for authlib-injector accounts. Some users may also
    still want to be able to log in to Mojang accounts for some reason:
    https://github.com/fn2006/PollyMC/issues/115#issuecomment-1805384658,
    even if they do not provide authentication to multiplayer servers.
  - To my surprise, I could still log in to a Mojang account, get its
    skin, and launch the game. Authentication to servers, of course, did
    not work.
  - Tested: logging into authlib-injector, Mojang, and MSA accounts and
    launching the game.
- Prism has added a built-in updater for Windows and Linux that I assume
  provides similar functionality to Sparkle on macOS:
  https://github.com/PrismLauncher/PrismLauncher/pull/1268. There is a
  Launcher_UPDATER_GITHUB_REPO variable in CMakeLists.txt that specifies
  the repo checked by the updater. I have changed this to the PollyMC
  repository, and since PollyMC follows almost the same CI/release
  patterns as Prism Launcher, it might work with PollyMC, too, but I
  have not tested it yet.
- Add macOS support to Nix
  - https://github.com/PrismLauncher/PrismLauncher/pull/1485
  - Untested
- The "PollyMC-Linux-8.0.tar.gz" and similar build artifacts were
  renamed to "PollyMC-Linux-8.0-Qt5.tar.gz" to match their
  "PollyMC-Linux-8.0-Qt6.tar.gz" counterparts.
- Removed Windows MSVC Legacy builds
- Removed Quilt Beacon toggle, the beacon is now always disabled:
  https://github.com/PrismLauncher/PrismLauncher/pull/1547,
  https://github.com/PrismLauncher/meta/pull/23
- Prism removed FTB support in 7.0, but I tested creating an FTB
  instance to make sure it still works in 8.0

Signed-off-by: Evan Goode <mail@evangoo.de>
 2023-11-15 14:37:14 -05:00
Trial97
890965746f
Added warning on mods update while running 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-15 11:07:46 +02:00
Trial97
361329d5d1
Made resource columns resizable 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-14 23:21:53 +02:00
Trial97
6804e2ba59
moved export to list to the mods page 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-14 18:40:45 +02:00
Trial97
0e57eeca69
Added missing variable from lambda capture 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-13 09:28:59 +02:00
Alexandru Ionut Tripon
32a8d9b9c6
Update launcher/ui/pages/instance/ModFolderPage.cpp 
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2023-11-13 09:23:56 +02:00
Trial97
463608b289
fixed shader packs detection 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-10 19:37:11 +02:00
Trial97
ae62e48c7c
Moved some buttons around 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-08 12:25:56 +02:00
Trial97
a7bfe385ea
Renamed Remove Metadata button 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-08 12:10:39 +02:00
Trial97
5d5adbd7da
add update menu conditionaly 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-07 09:48:07 +02:00
Trial97
6506e93e4a
Removed some buttons 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-07 09:44:27 +02:00
Trial97
011e87b421
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into toggle_deps 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-06 23:38:14 +02:00
Alexandru Ionut Tripon
3e7f9083ca
Update launcher/ui/pages/instance/ModFolderPage.cpp 
Co-authored-by: seth <getchoo@tuta.io>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2023-11-05 23:41:54 +02:00
Trial97
9a8667e99c
Added Global Dependenicies toggle 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-05 22:22:49 +02:00
LocalSpook
0de4d8902e Remove top-level const qualifiers in function declarations 
Signed-off-by: LocalSpook <56512186+LocalSpook@users.noreply.github.com>
 2023-10-28 22:12:09 -07: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
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
Trial97
f7c9972db0
separated dependecy check from mod update 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-23 19:46:30 +03:00
Alexandru Ionut Tripon
2c4af7e793
Merge pull request #1290 from Trial97/refactor/NetActions 
Refactor ImgurUpload
 2023-10-21 12:32:16 +01:00
Trial97
a9d7af9096
removed some unused stuff 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-20 16:44:37 +03:00
Trial97
03a27d5b5a
Updated Managed Packs 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-19 19:47:48 +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
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
Evan Goode
aa589701ed Automatically install authlib-injector when missing 
Add MissingAuthlibInjectorBehavior setting to control this behavior

Signed-off-by: Evan Goode <mail@evangoo.de>
 2023-09-23 18:53:14 -04:00
Evan Goode
a980b4d537 Clean up authlib-injector merge, mostly clang-format 
Signed-off-by: Evan Goode <mail@evangoo.de>
 2023-09-05 00:13:50 -04:00
Evan Goode
9d442a0348 authlib-injector 
* 'Custom Yggdrasil' AccountType

Signed-off-by: Evan Goode <mail@evangoo.de>

* Allow multiple accounts with the same player UUID

Signed-off-by: Evan Goode <mail@evangoo.de>

* Use correct services server URL for SkinDelete

Signed-off-by: Evan Goode <mail@evangoo.de>

* Correctly use CustomYggdrasilRefresh, add warning message

Signed-off-by: Evan Goode <mail@evangoo.de>

* Custom Yggdrasil: Readability fixes

Also made the MinecraftEntitlement for Custom Yggdrasil accounts work
just like offline accounts---instead of checking the reply from the auth
server, Custom Yggdrasil accounts are granted canPlayMinecraft and
ownsMinecraft when they are created, in MinecraftAccount.cpp.

Signed-off-by: Evan Goode <mail@evangoo.de>

* Custom Yggdrasil: Add extra confirmation dialog

Signed-off-by: Evan Goode <mail@evangoo.de>

* Add install authlib-injector button

Signed-off-by: Evan Goode <mail@evangoo.de>

* authlib-injector accounts

Signed-off-by: Evan Goode <mail@evangoo.de>

* Suggest installing authlib-injector when needed

Signed-off-by: Evan Goode <mail@evangoo.de>

* Use Unmojang metadata

Signed-off-by: Evan Goode <mail@evangoo.de>

* Use std::string for MANAGED_AGENTS, not QString

---------

Signed-off-by: Evan Goode <mail@evangoo.de>

Resolve X-Authlib-Injector-API-Location

Signed-off-by: Evan Goode <mail@evangoo.de>

Prefetch authlib-injector metadata

Resolves https://github.com/unmojang/PrismLauncher/issues/4

See https://github-com.translate.goog/yushijinhun/authlib-injector/wiki/%E5%90%AF%E5%8A%A8%E5%99%A8%E6%8A%80%E6%9C%AF%E8%A7%84%E8%8C%83?_x_tr_sl=auto&_x_tr_tl=en&_x_tr_hl=en-US#%E9%85%8D%E7%BD%AE%E9%A2%84%E8%8E%B7%E5%8F%96

Signed-off-by: Evan Goode <mail@evangoo.de>

drag-and-drop authlib-injector URL, clang-format

Resolves https://github.com/unmojang/PrismLauncher/issues/2

Signed-off-by: Evan Goode <mail@evangoo.de>
 2023-09-04 19:00:18 +01:00
Sefa Eyeoglu
546d49e183
Merge pull request #1530 from Trial97/metadata_delete 2023-09-04 17:02:52 +02:00
fn2006
b6904ba50a Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop 2023-09-04 00:39: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
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