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

65 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
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
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
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
1e0cbf730c Correct copyright strings and credits 2024-05-07 00:55:40 -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
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
fn2006
c11f5e990e update copyright year 2023-02-05 22:21:41 +00:00
fn2006
ef713cf414 Merge branch 'develop' of upstream into develop 2022-11-13 23:28:58 +00:00
Sefa Eyeoglu
21a7af535c
Merge branch 'develop' into macos-drag-n-drop 2022-11-04 18:30:42 +01:00
Ryan Cao
4254c20eda
experimental: install mime info in CMake 
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
 2022-11-02 23:28:42 +08:00
fn2006
66a98380d0 i fucked up the cherrypick 2022-11-01 20:24:40 +00:00
Sefa Eyeoglu
466f9c3ec7 fix: fix logo name 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-11-01 20:08:46 +00:00
fn2006
37fc2d5d79 fix build 2022-11-01 18:50:45 +00:00
fn2006
44a5130926 Merge branch 'release-5.x' of https://github.com/PrismLauncher/PrismLauncher into prism 2022-11-01 18:48:31 +00:00
Sefa Eyeoglu
b142e2a7a7
fix: fix logo name 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-11-01 13:59:11 +01:00
txtsd
392bf7a97b
Merge pull request #342 from fn2006/prism-svg-fix 2022-10-29 23:11:37 +02:00
fn2006
98891a036d use existing variables 
Signed-off-by: fn2006 <usernamefn2006alreadyused@protonmail.com>
 2022-10-29 17:35:37 +01:00
fn2006
b142a6da5b fix hardcoded svg 
Signed-off-by: fn2006 <usernamefn2006alreadyused@protonmail.com>
 2022-10-29 16:42:37 +01:00
fn2006
0f581efda5 fix hardcoded svg path 2022-10-29 14:16:14 +01:00
Sefa Eyeoglu
549b5a6488
Merge pull request #231 from tobimori/patch-1 2022-10-28 21:34:59 +02:00
Sefa Eyeoglu
de3c336213
Merge pull request #184 from Chrono-byte/develop 2022-10-28 21:34:59 +02:00
tobimori
d9463620e6 move .app rename to packaging process, update mac copyright string 
Signed-off-by: tobimori <tobias@moeritz.cc>
 2022-10-25 09:34:07 +02:00
fn2006
ecade0f510 small fixes 2022-10-24 16:27:07 +01:00
fn2006
23e5773094 Merge branch 'release-5.x' of https://github.com/PrismLauncher/PrismLauncher into prism 2022-10-24 16:24:36 +01:00
Chrono-byte
ece206b81c
Remove erroneous space 
Signed-off-by: Chrono-byte <me@disilla.org>
 2022-10-20 15:22:04 -04:00
Chrono-byte
88341b923a
fix contributor notices in AboutDialog.cpp for license compliance 
Signed-off-by: Chrono-byte <me@disilla.org>
 2022-10-20 15:14:26 -04:00
Sefa Eyeoglu
22365205f9
fix: use display name for NSIS 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-10-19 12:17:06 +02:00
Nightly
3d89d126d0
PlaceholderMC => PrismLauncher 
Small Correction

Signed-off-by: Nightly <62222436+pog5@users.noreply.github.com>
 2022-10-18 15:52:32 +00:00
Sefa Eyeoglu
722194405a
refactor: initial rebrand 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-10-18 09:37:59 +02:00
Fintan Martin
03923c9e87 Rebrand to PollyMC 2022-08-19 13:56:46 +01:00
Sefa Eyeoglu
1175461030
refactor: switch to new versioning scheme 
The new versioning system is based on the versioning system used by the
GNOME Foundation for the GNOME desktop.

We are dropping the "major version" as defined by SemVer and move to a
version number with a most and least significant number.

The most significant number must be incremented, if there are new
features or significant changes since last major release.

Otherwise, the least significant number must be incremented, if there
are only minor changes since the last release. New features or
significant changes mustn't be introduced by a bump of the least
significant number.

If a minor change would introduce small user-facing changes (like a
message-box or slight UI changes), it could still be classified as a
minor change.
At the end of the day, a human shall decide, if a change is minor or
significant, as there is no clear line that would separate a "minor" and
a "significant" change in a GUI-application.

Definitions:

feature: New user-facing functionality
significant change: Something that changes user-facing behavior
minor change: Something that fixes unexpected behavior

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-08-12 14:22:24 +02:00
Tomasz Kramkowski
20666763f0 Rewrite polymc.6 in scdoc, build, and install it 
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
Signed-off-by: Tomasz Kramkowski <tomasz@kramkow.ski>
 2022-07-09 23:25:09 +01:00
Kenneth Chew
9f039cef72
Set correct installer properties and uninstall registry keys 2022-06-12 14:21:56 -04:00
Kenneth Chew
065e38c6aa
Move Windows installer configure to program_info 2022-05-30 12:56:29 -04:00
Kenneth Chew
8731c86d0d
Use CMake for Windows installer branding 
As a side effect, fixes an issue where the installer wrote the incorrect version to the registry.
 2022-05-29 19:50:44 -04:00