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

442 Commits

Author SHA1 Message Date
renovate[bot]
3263a706b4
chore(deps): update determinatesystems/update-flake-lock action to v22 2024-06-03 18:39:15 +00:00
renovate[bot]
4917287292
chore(deps): update korthout/backport-action action to v3 2024-05-28 14:35:10 +00:00
Alexandru Ionut Tripon
529dc7c6b7
Merge pull request #2412 from DioEgizio/update-upstreamflatpak 
fix: update bundled flatpak to switch it to Qt 6
 2024-05-19 22:54:35 +03:00
Alexandru Ionut Tripon
5cf7466e4c
Merge pull request #2404 from PrismLauncher/renovate/cachix-install-nix-action-27.x 
Update cachix/install-nix-action action to v27
 2024-05-18 19:49:58 +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
DioEgizio
3ba84cb844 fix: update bundled flatpak 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2024-05-18 12:57:09 +02:00
renovate[bot]
1d384544d3
chore(deps): update cachix/install-nix-action action to v27 2024-05-15 19:40:15 +00:00
Trial97
8b051b97fd
Fix CI2 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-15 17:54:35 +03:00
Trial97
849c3faeb4
Fix CI 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-15 14:07:03 +03:00
Trial97
80d8e3ee06
Remove katabasis 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-15 12:53:06 +03:00
Evan Goode
08b3a1d956 s/Prism/Fjord in .github 2024-05-15 00:01:58 -04:00
Alexandru Ionut Tripon
f15981d786
Merge pull request #2358 from DioEgizio/nosystem-portablewithqt 
Remove prebuilt system tarballs on Linux, bundle Qt with Linux portable
 2024-05-09 08:22:43 +03:00
Evan Goode
920731eefd CI: rename PollyMC to Fjord Launcher 2024-05-08 01:00:39 -04:00
Evan Goode
c8265567aa Merge tag '8.3' into develop 2024-05-03 19:21:17 -04:00
DioEgizio
cb9a83320c chore: make Qt 5 Linux use official Qt builds 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2024-04-29 15:51:31 +02:00
DioEgizio
be8ac0b5bb fix: make portable builds bundle Qt 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2024-04-29 15:08:10 +02:00
DioEgizio
ccf0b01de7 chore!: make install_bundle work on linux, removed prebuilt tarballs 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2024-04-27 11:06:08 +02:00
renovate[bot]
46b291d02e
chore(deps): update hendrikmuhs/ccache-action action to v1.2.13 2024-04-27 07:16:54 +00:00
Trial97
565c7d81b3
Removed java from appimage 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-04-23 00:04:51 +03:00
Trial97
1c8d333bfd
Fixed build 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-04-21 15:07:10 +03:00
Trial97
a96f957b02
Removed java from appimage 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-04-21 14:48:27 +03:00
DioEgizio
95cfcedc96 chore: update to qt 6.6.3 on 8.x 
qt bug fix release

Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2024-04-06 20:23:01 +02:00
DioEgizio
5f11b2e77f
chore: update to Qt 6.7.0 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2024-04-02 19:10:40 +02:00
renovate[bot]
e6a9badb73
chore(deps): update korthout/backport-action action to v2.5.0 2024-03-30 10:42:48 +00:00
Trial97
45028ddc61
Added java downloader to CI build 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-03-28 14:58:05 +02:00
Alexandru Ionut Tripon
99203cbd9b
Merge pull request #2253 from Trial97/manual_backport 
Manual backport to 8.x
 2024-03-28 14:47:45 +02:00
DioEgizio
4642c13ca4
fix: include libbz2.so.1.0 
fixes portable installs not working on fedora anymore

i did this only on portable builds and not system installs so that it doesn't create problems to people packaging them, as to fix system installs i would have to put it in bin/

Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2024-03-28 14:42:04 +02:00
Alexandru Ionut Tripon
ccf3a1582d
Merge pull request #2231 from DioEgizio/bzip2-fix 
fix: include libbz2.so.1.0
 2024-03-27 16:19:53 +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
DioEgizio
37d348e60e fix: include libbz2.so.1.0 
fixes portable installs not working on fedora anymore

i did this only on portable builds and not system installs so that it doesn't create problems to people packaging them, as to fix system installs i would have to put it in bin/

Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2024-03-21 10:39:12 +01:00
renovate[bot]
7ffebcad72
chore(deps): update actions/cache action to v4.0.2 2024-03-19 17:41:32 +00:00
renovate[bot]
03def913ad
chore(deps): update softprops/action-gh-release action to v2 2024-03-08 21:26:24 +00:00
renovate[bot]
6591379a8a
chore(deps): update cachix/install-nix-action action to v26 2024-03-08 07:47:18 +00:00
renovate[bot]
e1146455a3
chore(deps): update actions/cache action to v4.0.1 2024-02-29 23:16:59 +00:00
renovate[bot]
322a8899ed
chore(deps): update determinatesystems/update-flake-lock action to v21 2024-02-29 17:19:39 +00:00
seth
f747ae949c
ci: fix permissions for backport workflow 
Signed-off-by: seth <getchoo@tuta.io>
 2024-02-22 06:13:27 -05:00
DioEgizio
c6441d231b fix: fix sparkle signing 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2024-02-22 11:53:48 +01:00
DioEgizio
4421746c0e fix: fix sparkle signing 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2024-02-22 10:00:21 +01:00
DioEgizio
d8e34e6c39 Merge pull request #2130 from DioEgizio/updates 2024-02-18 12:58:09 +01:00
DioEgizio
5d36067c74 chore: update libraries 
updated qt to 6.6.2
updated some submodules
updated sparkle framework to the latest version

Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2024-02-16 16:21:53 +01:00
renovate[bot]
ab4974629c
chore(deps): update hendrikmuhs/ccache-action action to v1.2.12 2024-01-26 07:12:13 +00:00
renovate[bot]
72e6218df9
chore(deps): update korthout/backport-action action to v2.4.1 2024-01-23 19:21:30 +00:00
renovate[bot]
0dc4a10f48
chore(deps): update korthout/backport-action action to v2.4.0 2024-01-22 17:26:37 +00:00
Sefa Eyeoglu
bcb5b9c9c2
Merge pull request #2034 from Scrumplex/feat/macos-signing 2024-01-18 17:00:00 +01:00
Sefa Eyeoglu
2c0274159f
Merge pull request #2034 from Scrumplex/feat/macos-signing 2024-01-18 16:56:39 +01:00
renovate[bot]
bfd1262c14
chore(deps): update actions/cache action to v4 2024-01-17 20:29:50 +00:00
Sefa Eyeoglu
de9232783e
chore: remove cachix auth token secret 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2024-01-17 13:12:38 +01:00
Sefa Eyeoglu
27c52eff8b
feat: add macOS notarization 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2024-01-17 13:12:36 +01:00
Sefa Eyeoglu
baebef982e
feat: add macOS code signing 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2024-01-17 13:10:14 +01:00
renovate[bot]
9c610b616a
chore(deps): update cachix/install-nix-action action to v25 2024-01-12 18:02:43 +00:00
renovate[bot]
b0f65476d9
chore(deps): update actions/cache action to v3.3.3 2024-01-11 18:59:17 +00:00
renovate[bot]
73f956c897
chore(deps): update hendrikmuhs/ccache-action action to v1.2.11 2024-01-02 07:30:12 +00:00
Sefa Eyeoglu
e227826a90
Merge pull request #1955 from PrismLauncher/renovate/actions-download-artifact-4.x 
chore(deps): update actions/download-artifact action to v4
 2023-12-16 17:27:02 +01:00
Sefa Eyeoglu
211e62cedb
Merge pull request #1956 from PrismLauncher/renovate/actions-upload-artifact-4.x 
chore(deps): update actions/upload-artifact action to v4
 2023-12-16 17:26:28 +01:00
renovate[bot]
8f29cdf195
chore(deps): update korthout/backport-action action to v2.3.0 2023-12-16 15:27:48 +00:00
renovate[bot]
317d52b44a
chore(deps): update actions/upload-artifact action to v4 2023-12-14 20:23:30 +00:00
renovate[bot]
d0fe700b53
chore(deps): update actions/download-artifact action to v4 2023-12-14 20:23:26 +00:00
renovate[bot]
469aaf6051
chore(deps): update github/codeql-action action to v3 2023-12-13 16:16:06 +00:00
Sefa Eyeoglu
a39e2a1145
Merge pull request #1916 from PrismLauncher/renovate/korthout-backport-action-2.x 2023-12-11 11:10:04 +01:00
DioEgizio
1ba6ed9fe9 chore: update qt to qt 6.6.1 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
(cherry picked from commit eb011e6729)
 2023-12-11 10:00:43 +00:00
renovate[bot]
132344df1c
chore(deps): update korthout/backport-action action to v2.2.0 2023-12-04 12:06:39 +00:00
DioEgizio
eb011e6729 chore: update qt to qt 6.6.1 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2023-12-02 17:42:24 +01:00
renovate[bot]
a74c3d57b4
chore(deps): update cachix/install-nix-action action to v24 2023-11-28 20:27:48 +00: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
fn2006
c3f65bb417
Update trigger_release.yml 2023-11-18 16:16:03 +00:00
fn2006
fd95d6cb16 Rearrange release files 2023-11-17 08:52:17 +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
renovate[bot]
d4b479a186
chore(deps): update korthout/backport-action action to v2.1.1 2023-11-07 23:55:40 +00:00
renovate[bot]
64bbcb2834
chore(deps): update korthout/backport-action action to v2.1.0 2023-11-05 15:57:06 +00:00
renovate[bot]
9dcb7e9759
chore(deps): update korthout/backport-action action to v2 2023-10-28 16:03:11 +00:00
Trial97
b1bd0ceade
fixed code signing for appImage 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-17 09:29:47 +03:00
Tayou
aae65e3e4e
Merge branch 'develop' into update-qt660 
Signed-off-by: Tayou <git@tayou.org>
 2023-10-16 19:57:05 +02:00
DioEgizio
6c9856b9dc chore: bump Qt to Qt 6.6.0 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2023-10-16 15:42:16 +02:00
Trial97
ef0813754b
added explicit qt version for linux portable 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-15 20:23:46 +03:00
Trial97
6bbff310bc
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feat/launcher-updater 2023-10-15 17:42:39 +03:00
Trial97
b67c2c71d1
removed windows legacy builds 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-05 22:44:49 +03:00
Trial97
606c12ffeb
more fixing 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-09-28 18:47:21 +03:00
Trial97
ebde563648
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feat/launcher-updater 2023-09-26 20:16:46 +03:00
renovate[bot]
e7d6be531f
chore(deps): update actions/cache action to v3.3.2 2023-09-08 17:22:12 +00:00
renovate[bot]
7dd2530027
chore(deps): update actions/checkout action to v4 2023-09-04 15:02:01 +00:00
renovate[bot]
e155844671
chore(deps): update cachix/install-nix-action action to v23 2023-09-04 10:22:11 +00:00
fn2006
b6904ba50a Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop 2023-09-04 00:39:20 +01:00
TheKodeToad
befa3baa6a
Merge branch 'develop' into feat/launcher-updater 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-08-30 11:47:33 +01:00
renovate[bot]
783af2c06a
chore(deps): update determinatesystems/update-flake-lock action to v20 2023-08-24 04:32:25 +00:00
renovate[bot]
07f25d6cca
chore(deps): update korthout/backport-action action to v1.4.0 2023-08-15 14:19:42 +00:00
Trial97
1faf741004
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feat/launcher-updater 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-15 13:29:42 +03:00
Sefa Eyeoglu
740ca54c87
Merge pull request #1462 from getchoo/labels 2023-08-15 10:38:28 +02:00
Trial97
0ba88ff138
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into staging 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-15 00:33:24 +03:00
fn2006
847430b113 Merge branch 'release-7.x' of https://github.com/PrismLauncher/PrismLauncher into develop 2023-08-10 10:09:08 +01:00
renovate[bot]
d9cd6f9c50
chore(deps): update hendrikmuhs/ccache-action action to v1.2.10 2023-08-08 18:20:26 +00:00
Sefa Eyeoglu
7004388105
Merge pull request #1227 from Ryex/packaging/appimage-updates 2023-08-07 13:18:06 +02:00
Rachel Powers
9a9a4fcfd4
Apply suggestions from code review 
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-08-06 13:16:30 -07:00
DioEgizio
b013133cc1 chore: update to qt 6.5.2 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2023-08-03 09:24:47 +02:00
Rachel Powers
7c1a465ec9
Merge branch 'develop' into feat/launcher-updater 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-07-30 14:19:31 -07:00
seth
945939ba68
chore(actions): add new labels to update-flake 
Signed-off-by: seth <getchoo@tuta.io>
 2023-07-30 04:46:44 -04:00
seth
b92d617df0 chore(ci): remove nix job 
we're using garnix now

Signed-off-by: seth <getchoo@tuta.io>
(cherry picked from commit fbf29274e8)
 2023-07-26 13:47:58 +00:00
seth
fbf29274e8
chore(ci): remove nix job 
we're using garnix now

Signed-off-by: seth <getchoo@tuta.io>
 2023-07-25 19:23:17 -04:00
Sefa Eyeoglu
82a9e7d372 fix(actions): set all build platforms to official 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
(cherry picked from commit 40fb387185)
 2023-07-16 21:16:11 +00: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
Rachel Powers
6cd259becd
Merge pull request #1337 from getchoo/fix-flake-workflow 
fix(actions): give update-flake content write perms
 2023-07-16 20:43:10 +02:00