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

686 Commits

Author SHA1 Message Date
Evan Goode
48689d1b79 Merge remote-tracking branch 'upstream/release-9.x' into develop 2025-04-06 18:16:05 -05:00
Luna
62fdcd5c33
Bump to 1.6 2025-02-26 01:27:51 -06:00
Evan Goode
491cb1e5a2 Merge remote-tracking branch 'prismlauncher/release-9.x' into develop 2025-01-12 12:46:48 -06:00
Luna
41e90afbab Revert "Merge in Changes from Prism 9.2" 
This reverts commit b4b9051793.
 2025-01-11 14:19:46 -06:00
Luna
b4b9051793 Merge in Changes from Prism 9.2 2025-01-11 13:58:12 -06:00
Luna
d08118b05a restore original versioning without causing nix breakage(?) 2024-11-29 08:31:50 -06:00
Luna
72a8ff070e Revert "Remove patch system as updater breaks." 
This reverts commit fec49be639.
 2024-11-29 08:31:27 -06:00
Luna
6f8fc48839 Revert "fix nix builds again(?)" 
This reverts commit 25d90beb12.
 2024-11-29 08:31:13 -06:00
Luna
25d90beb12 fix nix builds again(?) 2024-10-30 03:48:52 -05:00
Luna
fec49be639 Remove patch system as updater breaks. 2024-10-30 00:11:37 -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
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
07addf2449
Bump version to 9.1 2024-10-24 13:32:23 +01:00
Trial97
2d234b127b
make sure that tests are only disabled fro cmark 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-10-19 22:07:31 +03:00
Trial97
2030041fcc
Fix tests segfault 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-10-19 21:42:14 +03:00
Trial97
b4ecb38ae5
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into cmake_fields 2024-09-16 20:06:18 +03:00
Alexandru Ionut Tripon
2e537e55de
Apply suggestions from code review 
Co-authored-by: seth <getchoo@tuta.io>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2024-09-16 17:47:58 +03:00
Alexandru Ionut Tripon
db3c7d01fd
Apply suggestions from code review 
Co-authored-by: seth <getchoo@tuta.io>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2024-09-16 16:36:05 +03:00
Trial97
ca6b62c773
move some URLs in cmake 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-09-16 15:51:51 +03:00
Trial97
2c2defb266
add Launcher_ prefix to enable java option 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-09-16 14:30:23 +03:00
Evan Goode
b00305e8d3 Bump version to 8.4.3 2024-09-05 21:51:26 -04:00
Evan Goode
7aeffa561f Add patch version number 2024-08-20 19:38:35 -04:00
Evan Goode
c3bdc0f79b
Merge pull request #15 from unmojang/evan-goode/disable-updater 
Disable updater, news
 2024-06-24 00:10:14 -04:00
Evan Goode
b8f9d18e26 Remove news toolbar 2024-06-23 23:51:52 -04:00
Evan Goode
1b98be00f6 Disable updater, users should use package managers 2024-06-23 23:51:46 -04:00
Evan Goode
bf997aa117
Merge pull request #14 from unmojang/evan-goode/msa 
Use Nintendo Switch client ID
 2024-06-23 23:16:59 -04:00
Evan Goode
62f87c423f Use Nintendo Switch client ID 
Reputable projects such as prismarine-auth and azalea-auth hardcode the
Nintendo Switch client ID instead of their own custom Azure application,
so we should be fine to go ahead and do the same.

Unfortunately, client IDs created for custom Azure applications, such as
Prism Launcher's client ID, will no longer work with Fjord Launcher, so
users who manually supplied a client ID will need to clear theirs.
 2024-06-23 22:57:31 -04:00
Evan Goode
810ab868b3 Fetch CurseForge API key from official files 
Instead of fetching the CurseForge API key from PolyMC's server, fetch
it from the files of the CurseForge app, mirrored by archive.org. We can
do this without downloading the entire 100MiB+ application by
range-requesting the specific DEFLATE block where the key is and
decompressing just that block.
 2024-06-23 22:35:06 -04:00
Evan Goode
51da756e19 Merge remote-tracking branch 'prismlauncher/release-8.x' into develop 2024-06-23 11:34:11 -04:00
Trial97
7a5348a179
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 2024-05-18 14:14:31 +03:00
Trial97
80d8e3ee06
Remove katabasis 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-15 12:53:06 +03:00
Evan Goode
cb2f9b4e14 Crude s/PollyMC/Fjord Launcher 2024-05-04 00:08:42 -04:00
Evan Goode
c8265567aa Merge tag '8.3' into develop 2024-05-03 19:21:17 -04: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
Trial97
46a9880e2e
chore: bump to 8.4 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-04-29 13:48:56 +03: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
Sefa Eyeoglu
f221b08f11
chore: bump to 8.3 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2024-04-06 15:12:41 +02:00
Alexandru Ionut Tripon
93f6315b16
Update CMakeLists.txt 
Co-authored-by: seth <getchoo@tuta.io>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2024-03-27 19:34:04 +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
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
DioEgizio
d6abcb73c5 chore: bump develop to 9.0 
until it's too late lol

Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2024-03-04 16:32:45 +01:00
Sefa Eyeoglu
a7bfd08ce3
chore: bump to 8.2 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2024-03-03 20:35:43 +01:00
DioEgizio
d8e34e6c39 Merge pull request #2130 from DioEgizio/updates 2024-02-18 12:58:09 +01:00
DioEgizio
25b69b4c0d fix: fix sparkle hash 
:/ oops

Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2024-02-16 17:29:49 +01:00
DioEgizio
94b48e9702 fix: remove cmark_static 
cmark 0.31 removed CMARK_STATIC/CMARK_SHARED and replaced it with the native cmake BUILD_SHARED_LIBS

Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2024-02-16 17:06:28 +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
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