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

9304 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Trial97
e3af4f9a78
Fixed playtime recording 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-22 20:34:12 +02:00
Trial97
85b4e1f24f
Made column hidden by default 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-22 19:23:24 +02:00
Trial97
140a55810d
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters 2023-11-22 14:20:30 +02:00
bit6tream
681e76c551 (#1693) Notify user if /tmp directory has noexec mount option 
Minecraft versions starting from 1.19 would not start at all if /tmp is mounted as `noexec`.

Signed-off-by: bit6tream <megapixel483@gmail.com>
 2023-11-22 01:48:31 +03: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
fn2006
cd9de42b7e
Update README.md 2023-11-21 10:42:40 +00: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
Sefa Eyeoglu
e499aa4783
Merge pull request #1873 from guihkx/sync-flatpak-manifest 2023-11-19 19:57:47 +01:00
guihkx
e3b7aed76b
chore: sync local flatpak manifest with flathub's 
Signed-off-by: guihkx <626206+guihkx@users.noreply.github.com>
 2023-11-19 11:08:52 -03:00
Tayou
24f2102596
Merge pull request #1869 from Trial97/icons_folder 
Added more open folder actions
 2023-11-19 15:06:30 +01:00
Trial97
26931475ae
made folder size reflect the number of elements 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-19 15:58:30 +02:00
Trial97
80c85aef99
fixed const stuff 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-19 15:37:18 +02:00
Alexandru Ionut Tripon
76216335b1
Update launcher/ui/pages/modplatform/ImportPage.cpp 
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2023-11-19 15:26:47 +02:00
Sefa Eyeoglu
71ee0e750c
Merge pull request #1868 from PrismLauncher/update_flake_lock_action 2023-11-19 10:38:56 +01:00
Trial97
a8aa214c0e
changed prism aniversary 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-19 09:01:59 +02:00
Trial97
e99926ea94
Added more open folder actions 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-19 02:40:25 +02:00
github-actions[bot]
69a49e85d0 chore(nix): update lockfile 
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/ec750fd01963ab6b20ee1f0cb488754e8036d89d' (2023-11-07)
  → 'github:nixos/nixpkgs/7414e9ee0b3e9903c24d3379f577a417f0aae5f1' (2023-11-16)
• Updated input 'pre-commit-hooks':
    'github:cachix/pre-commit-hooks.nix/ea758da1a6dcde6dc36db348ed690d09b9864128' (2023-11-06)
  → 'github:cachix/pre-commit-hooks.nix/e558068cba67b23b4fbc5537173dbb43748a17e8' (2023-11-15)
 2023-11-19 00:19:30 +00:00
Trial97
f7e478c755
Added all supported files filter 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-19 02:02:02 +02:00
fn2006
c3f65bb417
Update trigger_release.yml 2023-11-18 16:16:03 +00:00
TheKodeToad
40cfa145ee
Merge pull request #1860 from Trial97/env_vars2 
Add custom env vars to pre/post launch commands
 2023-11-18 11:15:49 +00:00
fn2006
439b618f46
Merge pull request #118 from unmojang/unmojang 
Fix authlib-injector not working w/other Java agents
 2023-11-18 10:44:31 +00:00
Trial97
1a06a1424b
Added custom env vars to pre/post launch commands 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-18 10:53:38 +02:00
Trial97
9f39e45b28
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into current_time 2023-11-18 10:45:24 +02:00
Evan Goode
bc709f8adc Fix authlib-injector not working w/other Java agents 
Signed-off-by: Evan Goode <mail@evangoo.de>
 2023-11-18 00:46:15 -05:00
fn2006
02a1d436ae Fix Polly background not showing up on halloween 2023-11-17 23:12:33 +00:00
fn2006
7eb8325de9 Fix license 2023-11-17 23:12:33 +00:00
fn2006
7c139a5608 Add Evan Goode to credits 2023-11-17 23:12:33 +00:00
Trial97
4e3132e8b2
reseted the setting 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-17 22:40:36 +02:00
Trial97
6b777653a5
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into resource_size 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-17 22:38:17 +02:00
Trial97
2bfb5fc138
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-17 22:26:17 +02: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
Tayou
b5f8054d8c
Merge pull request #1849 from Trial97/column_size 
Made resource columns resizable
 2023-11-17 20:19:02 +01:00
fn2006
53a79fbee9
Merge pull request #97 from fn2006/update_flake_lock_action 
chore(nix): update lockfile
 2023-11-17 14:43:28 +00:00
github-actions[bot]
5a5b0e9138 chore(nix): update lockfile 
Flake lock file updates:

• Updated input 'libnbtplusplus':
    'github:PrismLauncher/libnbtplusplus/a5e8fd52b8bf4ab5d5bcc042b2a247867589985f' (2023-07-22)
  → 'github:PrismLauncher/libnbtplusplus/23b955121b8217c1c348a9ed2483167a6f3ff4ad' (2023-11-06)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/9d5d25bbfe8c0297ebe85324addcb5020ed1a454' (2023-11-04)
  → 'github:nixos/nixpkgs/7414e9ee0b3e9903c24d3379f577a417f0aae5f1' (2023-11-16)
• Updated input 'pre-commit-hooks':
    'github:cachix/pre-commit-hooks.nix/dec10399e5b56aa95fcd530e0338be72ad6462a0' (2023-11-01)
  → 'github:cachix/pre-commit-hooks.nix/e558068cba67b23b4fbc5537173dbb43748a17e8' (2023-11-15)
 2023-11-17 14:42:42 +00:00
fn2006
fd95d6cb16 Rearrange release files 2023-11-17 08:52:17 +00:00
fn2006
ae6f14a9a0 Fix inaccurate warnings about needing a MS Account 2023-11-17 08:40:13 +00:00
fn2006
33ceacce4a
Merge pull request #112 from unmojang/unmojang 
Sync with Prism Launcher 8.0, rework custom account implementation
 2023-11-17 00:47:34 +00:00
fn2006
74e78507ec
Merge pull request #116 from unmojang/unmojang-8.0 
Merge PrismLauncher:8.0 to unmojang
 2023-11-17 00:28:24 +00:00
Evan Goode
8f540a5af1 Correctly save Mojang account type 
Signed-off-by: Evan Goode <mail@evangoo.de>
 2023-11-16 12:33:03 -05:00
Trial97
a531f32b69
fixed settings saving 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-16 13:26:29 +02:00
Evan Goode
dcc2d77ebb Fix offline accounts 
Original authlib-injector work had a bug making offline accounts not
save correctly.
 2023-11-16 01:15:17 -05:00
Evan Goode
518962c472 Replace 'Prism Launcher' with 'PollyMC' in updater 2023-11-15 23:01:22 -05:00
Evan Goode
cdb2f09bd4 Merge branch 'unmojang' into unmojang-8.0 2023-11-15 21:23:01 -05:00
fn2006
18db32dbec
Merge pull request #117 from unmojang/unmojang-elyby-migration 
Smooth Ely.by -> authlib-injector migration
 2023-11-15 20:47:50 +00:00
Evan Goode
be8c8ad9ad Auto migrate Ely.by accounts to authlib-injector 
Signed-off-by: Evan Goode <mail@evangoo.de>
 2023-11-15 15:23:24 -05: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
fn2006
c5dad685e9
Merge pull request #111 from unmojang/unmojang 
Merge develop -> unmojang, link to wiki page with common authlib-injector servers
 2023-11-15 18:29:21 +00:00
Evan Goode
b1738deffb authlib-injector: Mark correct account as in use 
Fixes a bug where the wrong account could be marked as "in use" when the
game is launched if there are multiple accounts that share the same
profile ID. This can lead to the launcher trying to refresh an account
that's currently in use by the game, leading to "Invalid session" errors
in-game.

Signed-off-by: Evan Goode <mail@evangoo.de>
 2023-11-15 12:11:12 -05:00