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
Luna
67bca78946 Delete publish.yml 2025-04-06 18:32:27 -05:00
Luna
2706ec5db6 chore: correct issues left by merge 2025-04-06 18:28:26 -05:00
Evan Goode
48689d1b79 Merge remote-tracking branch 'upstream/release-9.x' into develop 2025-04-06 18:16:05 -05:00
Alexandru Ionut Tripon
631d465583 Update .github/workflows/build.yml 
Co-authored-by: Seth Flynn <getchoo@tuta.io>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
(cherry picked from commit db766574a42a4b7db6b320b6d469b233ce5f3100)
Signed-off-by: Seth Flynn <getchoo@tuta.io>
 2025-02-25 22:25:18 -06:00
Alexandru Ionut Tripon
b65d0d1fe6 Update .github/workflows/build.yml 
Co-authored-by: seth <getchoo@tuta.io>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
(cherry picked from commit 1b5d3c2bf903bbcade7b38c22c0b103a0c6999f8)
Signed-off-by: Seth Flynn <getchoo@tuta.io>
 2025-02-25 22:25:17 -06:00
Trial97
f56dfbafb2 remove specific step for qt6 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit be3eca8c97fdbb8daede84cab20fbd7695334242)
Signed-off-by: Seth Flynn <getchoo@tuta.io>
 2025-02-25 22:25:17 -06:00
Trial97
de438aea84 fix appimage 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit bca517b8d3cd685540beebf69fbc1f80fe0a6ce4)
Signed-off-by: Seth Flynn <getchoo@tuta.io>
 2025-02-25 22:25:17 -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
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
ea7d9c0a8d fix typo preventing linux builds 2024-10-29 03:30:29 -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
da9c085a06 Clean up some lingering differences from upstream 2024-10-26 17:52:25 -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
Trial97
9a810dfa6e fix sparkle signature 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 0586d38e03)
 2024-10-20 21:07:55 +00:00
renovate[bot]
093313e591
chore(deps): update actions/cache action to v4.1.1 2024-10-09 07:14:47 +00:00
seth
e2b346fc53
Merge pull request #2888 from PrismLauncher/renovate/actions-cache-4.x 
chore(deps): update actions/cache action to v4.1.0
 2024-10-08 13:15:05 -04:00
seth
7c45f88769
Merge pull request #2883 from PrismLauncher/renovate/cachix-install-nix-action-30.x 
chore(deps): update cachix/install-nix-action action to v30
 2024-10-08 13:14:47 -04:00
TheKodeToad
a200fca45c
Merge pull request #2869 from Edgars-Cirulis/patch-1 
chore: update Qt to 6.7.3
 2024-10-08 12:36:11 +01:00
Alexandru Ionut Tripon
dc1f56e108
Merge pull request #2865 from Ryex/nsis_vc_redist 
add vc_redist as a NSIS install section
 2024-10-08 14:09:22 +03:00
renovate[bot]
cc0c9d208d
chore(deps): update actions/cache action to v4.1.0 2024-10-04 22:22:10 +00:00
Rachel Powers
a61c93bede
Update .github/workflows/build.yml 
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2024-10-04 07:06:19 -07:00
Rachel Powers
023aa18e85
ci: NSCurl only needed on MSVC 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2024-10-03 23:14:29 -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
renovate[bot]
010678da53
chore(deps): update cachix/install-nix-action action to v30 2024-10-03 13:46:28 +00:00
renovate[bot]
79be2fc062
chore(deps): update cachix/install-nix-action action to v29 2024-10-01 00:32:42 +00:00
seth
5adca58337
ci: add nix job 
Signed-off-by: seth <getchoo@tuta.io>
 2024-09-30 16:25:56 -04: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
Edgars Cīrulis
a897b012d9
chore: update Qt to 6.7.3 
Only bug fixes no new / breaking changes 

Signed-off-by: Edgars Cīrulis <edgarsciruliss@gmail.com>
 2024-09-28 12:11:25 +03:00
Alexandru Ionut Tripon
914ae6ead6
Use macOS 14 in CI (#2826) 
* chore: fix mac CI build

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>

* try what the error says

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>

* set -DCMAKE_OSX_ARCHITECTURES=x86_64

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>

---------

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-09-16 13:00:38 -04: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
renovate[bot]
7e49fa0426
chore(deps): update determinatesystems/update-flake-lock action to v24 2024-09-09 19:05:56 +00:00
Trial97
92495494ca
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-08-23 08:16:59 +03:00
renovate[bot]
7472233033
chore(deps): update korthout/backport-action action to v3.1.0 2024-08-21 17:22:09 +00:00
Trial97
b5bbe93775 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-08-17 00:20:40 +03:00
Sefa Eyeoglu
d6a825dd47
Merge pull request #2707 from PrismLauncher/renovate/hendrikmuhs-ccache-action-1.x 2024-08-12 10:40:26 +02:00
Sefa Eyeoglu
af83fc84a7
Merge pull request #2585 from PrismLauncher/renovate/determinatesystems-update-flake-lock-23.x 2024-08-12 10:39:19 +02:00
renovate[bot]
128827cef5
chore(deps): update hendrikmuhs/ccache-action action to v1.2.14 2024-08-05 20:02:40 +00:00
Edgars Cirulis
d3ca8864c2
chore: update Qt to 6.7.2 
Signed-off-by: Edgars Cirulis <edgarsciruliss@gmail.com>
 2024-07-12 23:54:22 +03:00
renovate[bot]
63a458ca0c
Update DeterminateSystems/update-flake-lock action to v23 2024-06-28 21:48:40 +00:00
Trial97
0b79abcdcd
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-28 20:45:30 +03:00
Evan Goode
1b98be00f6 Disable updater, users should use package managers 2024-06-23 23:51:46 -04:00
Alexandru Ionut Tripon
98d68bafeb
Merge pull request #2481 from DioEgizio/qt671 
chore: update Qt to 6.7.1
 2024-06-23 08:41:02 +03:00
Trial97
ca369ac2b0
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-09 19:52:37 +03:00
DioEgizio
052ee0d71c chore: update Qt to 6.7.1 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2024-06-07 15:48:19 +02:00
Trial97
8ff53e47e8
Merge branch 'develop' of github.com:Trial97/PrismLauncher into feature/java-downloader 2024-06-07 00:22:54 +03:00