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

210 Commits

Author SHA1 Message Date
Luna
c95eedd72c Update copyright dates to 2025 2025-02-25 22:32:05 -06:00
Luna
f70084972a Fix builds, restore PollyMC to contributors list. 2024-10-29 23:00:35 -05:00
Luna
a03b3d8c7a Fix overlooked branding errors 2024-10-29 03:36:32 -05:00
Luna
f6c44570af correct copyright and license 2024-10-29 03:33:17 -05:00
Luna
1b95061bcf Adjust branding to that of ShatteredPrism 2024-10-29 03:29:24 -05:00
Luna
168b980d7a Remove DRM, Bump Version, Re-enable Updater. 
Doing this in hopes it is easier to base upon the new version, alongside hopes of the patch system not breaking the updater.
 2024-10-29 02:57:00 -05:00
Evan Goode
95af313f49 Merge tag '9.1' into evan-goode/merge-9.0 2024-10-26 17:54:34 -04:00
Evan Goode
c15afbda4a Fix build? 2024-10-26 16:12:01 -04:00
Evan Goode
7dbaa896a6 Merge tag '9.0' into develop 
This is an intermediate/halfway commit, more refactoring is needed to
get this to build.
 2024-10-25 15:34:57 -04:00
TheKodeToad
78e24962f9
Fix /norestart 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-10-21 14:41:48 +01:00
Rachel Powers
63172540fb
fix: nisi needs !include "x64.nsh" now. also, there were some broken varible 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2024-10-03 22:38:30 -07:00
Rachel Powers
bcb1d456d4
fix: version NSCurl plugin in workflow, detect and use arm64 vc_redist for arm64 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2024-10-03 21:56:19 -07:00
Rachel Powers
ed15a28eb3
fix : baking the redist into the installer breaks GPL, download at runtime instead 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2024-09-28 14:58:13 -07:00
Rachel Powers
00f4221a83
reorg MSVC set(CMAKE_INSTALL_SYSTEM_RUNTIMES_LIBS_SKIP true) call 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2024-09-27 19:16:50 -07:00
Rachel Powers
8fa4467a36
use /norestart with redist install 
Co-authored-by: seth <getchoo@tuta.io>
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2024-09-27 13:29:00 -07:00
Rachel Powers
37d3b2a4f6
prevent the unauthorised reditribution of MSVC CRT files 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2024-09-27 00:49:00 -07:00
Rachel Powers
2dc6f7504b
add vc_redist as a NSIS install section 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2024-09-27 00:18:35 -07:00
Evan Goode
17da1f266c Oops, guess it's easier to not rename the qrc file 2024-07-20 21:15:02 -04:00
Evan Goode
d080962acf Use fjordlauncher icns and qrc icons 2024-07-20 20:37:43 -04:00
Evan Goode
1b98be00f6 Disable updater, users should use package managers 2024-06-23 23:51:46 -04:00
Evan Goode
51da756e19 Merge remote-tracking branch 'prismlauncher/release-8.x' into develop 2024-06-23 11:34:11 -04:00
Trial97
3db4f4dc2b
fix build 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-14 13:00:59 +03:00
Trial97
74a86df53c
update the desktop file 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-14 12:41:37 +03:00
Trial97
c4a65dd861
update login flow 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-12 00:34:39 +03:00
deadmeu
c728f43533 refactor: shorten desktop entry comment field 
Signed-off-by: deadmeu <dmu@duck.com>
(cherry picked from commit ac223a29ef)
 2024-06-09 17:59:36 +00:00
Alexandru Ionut Tripon
6c76ba5163
Merge pull request #1032 from deadmeu/shorten-description 
refactor: shorten desktop entry comment field
 2024-06-09 20:59:23 +03:00
Evan Goode
1e0cbf730c Correct copyright strings and credits 2024-05-07 00:55:40 -04:00
Evan Goode
4173436ba8 Fjord Launcher icons 2024-05-07 00:55:12 -04:00
Evan Goode
cb2f9b4e14 Crude s/PollyMC/Fjord Launcher 2024-05-04 00:08:42 -04: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
f9ba4a746e Updated application manifest 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit aac6fea724)
 2024-03-03 14:07:08 +00:00
Trial97
aac6fea724
Updated application manifest 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-02-22 20:34:34 +02:00
TheKodeToad
6816364354 Happy new year :D 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit 1130fe8510)
 2024-01-03 17:13:30 +00:00
TheKodeToad
1130fe8510
Happy new year :D 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-01-02 18:04:42 +00:00
deadmeu
ac223a29ef
refactor: shorten desktop entry comment field 
Signed-off-by: deadmeu <dmu@duck.com>
 2023-11-24 00:03:33 +10: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
IThundxr
364cb4ff6a
chore: remove windows 7/8 support 
With 8.0 windows legacy support was dropped, this just removes it from the manifest

Signed-off-by: IThundxr <contact@ithundxr.dev>
 2023-10-28 07:39:32 -04:00
Trial97
ebde563648
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feat/launcher-updater 2023-09-26 20:16:46 +03:00
fn2006
be1d2a6070 Merge remote-tracking branch 'upstream/develop' into develop 2023-09-04 00:45:11 +01:00
fn2006
b6904ba50a Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop 2023-09-04 00:39:20 +01:00
kumquat-ir
984e870bca actually it can handle multiple files just fine 
Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com>
 2023-09-01 10:32:35 -04:00
kumquat-ir
eb66e37b83 fix opening files from curseforge: links on linux 
Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com>
 2023-09-01 10:29:56 -04: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
fn2006
0bd4a644a1 Update metadata 2023-08-10 10:52:30 +01:00
fn2006
847430b113 Merge branch 'release-7.x' of https://github.com/PrismLauncher/PrismLauncher into develop 2023-08-10 10:09:08 +01:00
tjw123hh
ba49afcc6a
Update org.prismlauncher.PrismLauncher.desktop.in 
Signed-off-by: tjw123hh <56749271+tjw123hh@users.noreply.github.com>
(cherry picked from commit 4ab630b832)
 2023-07-26 14:45:59 +02:00
tjw123hh
29fde6a322
Delete some incorrect tags 
(cherry picked from commit 6a01c277e8)
 2023-07-26 14:45:42 +02:00
Sefa Eyeoglu
316ef9b725
Merge pull request #1266 from TheKodeToad/smol-tweaks 2023-07-16 20:42:48 +02:00
Rachel Powers
9957aeb003
Merge branch 'develop' into curseforge-url-handle 2023-07-11 21:42:29 -07:00
Rachel Powers
b67844e74c
fix(windows installer): old installers didn't uninstall first. 
now they do so ensure shortcuts stay selected by default

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-06-30 23:04:55 -07:00