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

210 Commits

Author SHA1 Message Date
Rachel Powers
3db83a189c
fix(updater): include updater in setup.exe 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-06-29 22:38:16 -07:00
Sefa Eyeoglu
ed4dce2fb6
fix: install logo to multimc theme in genicons.sh 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-06-26 08:59:48 +02:00
fn2006
cc85b44ff2 Merge branch 'release-7.x' of https://github.com/PrismLauncher/PrismLauncher into develop 2023-06-09 13:35:03 +01:00
Rachel Powers
6a4fb6a271 packaging: remove redundant "do you want to uninstall previous version" 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-06-01 12:40:08 -07:00
Rachel Powers
4593538fc8 fix: typo - space before comment 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-31 14:36:24 -07:00
Rachel Powers
03b66ba7a5 packaging: make windows nsis installer run the uninstaller for previous install before installing 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-31 13:25:14 -07:00
fn2006
a951bd1c3e Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop 2023-05-30 17:59:26 +01:00
flow
954d4d701a
Merge pull request #1034 from kerichdev/patch-1 2023-05-28 10:56:44 -03:00
Sefa Eyeoglu
90b330d4ba
chore: update social links 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-05-19 18:34:54 +02:00
Keri
2078133493
fix: remove unnecessary keywords from desktop file 
this messes with apps that use tag search like rofi

Signed-off-by: Keri <kerichuudev@gmail.com>
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-05-14 14:38:19 +02:00
Rachel Powers
82287e0407 Merge branch 'develop' into curseforge-url-handle 2023-05-12 01:00:26 -07:00
Rachel Powers
884ac73078 Merge remote-tracking branch 'upstream/develop' into better-tasks 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-07 13:21:21 -07:00
timoreo
54fb799d95 Fix command line args 
Signed-off-by: timoreo <contact@timoreo.fr>
 2023-05-05 15:05:17 -07:00
timoreo
63c21c53af Added url handler for curseforge 
Signed-off-by: timoreo <contact@timoreo.fr>
 2023-05-05 15:05:17 -07:00
Rachel Powers
96decbac27 feat: default qtlogging.ini file 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-01 10:48:00 -07:00
Rachel Powers
656bfd36f6 fix: ensure filelink.exe is included in setup.exe 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-03-20 14:56:32 -07:00
Rachel Powers
7d02e1f866 feat: make shell association an optional section 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-02-12 17:34:37 -07:00
Rachel Powers
d93cb751b0 fix: oversight caused prism to be .zip windows default 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-02-12 16:23:33 -07:00
fn2006
c11f5e990e update copyright year 2023-02-05 22:21:41 +00:00
fn2006
1821081521 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop 2023-02-05 22:11:58 +00:00
Adrien
463b4fbe0c Fix 
Me when me when me when

Signed-off-by: Adrien <66513643+AshtakaOOf@users.noreply.github.com>
 2022-12-26 20:09:47 +01:00
Adrien
9f1c79a5ec Update org.prismlauncher.PrismLauncher.metainfo.xml.in 
Add ModpackUpdate and change some lines

Signed-off-by: Adrien <66513643+AshtakaOOf@users.noreply.github.com>
 2022-12-26 19:59:46 +01:00
Adrien
70573b6f31 Update org.prismlauncher.PrismLauncher.metainfo.xml.in 
Should be the right properties (I hope)

Signed-off-by: Adrien <66513643+AshtakaOOf@users.noreply.github.com>
 2022-12-26 19:24:17 +01:00
flow
ee3e65d759
feat(docs): add note about logging env variables in man page 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-22 19:18:16 -03:00
fn2006
64b7562919 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop 2022-12-20 20:23:42 +00:00
Sefa Eyeoglu
52d06ed814
chore: move instance_icons.svg 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-11-29 20:07:00 +01:00
fn2006
ef713cf414 Merge branch 'develop' of upstream into develop 2022-11-13 23:28:58 +00:00
Rachel Powers
bb8ac9b99a changed name of file type association 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-11-11 05:46:41 -07:00
Rachel Powers
96008d3bb2 add -I import flag & don't clobber .zip assoc 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-11-05 08:07:58 -07:00
Rachel Powers
c05f744ec2 windows file association is *hard* 
new macros!

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-11-05 08:07:58 -07: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
Ryan Bjb
413dd73a73
Possible fix to windows builds (#36) 
Error logs show:
ERROR: Line 3: The value of attribute version in element assemblyIdentity is invalid.
this should fix it, as i copied the value from prismlauncher.
 2022-11-02 15:12:50 +00:00
fn2006
53e1f96bea
attempt to fix windows builds 2022-11-02 10:23:33 +00: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
9337ec6706
Merge pull request #173 from Scrumplex/fix-icons 2022-10-29 00:36:15 +02:00
Sefa Eyeoglu
177f17450a
Merge pull request #173 from Scrumplex/fix-icons 2022-10-29 00:35:48 +02:00
Sefa Eyeoglu
9ec7837275
Merge pull request #318 from TheLastRar/manifest-platform 
Fix: Don't specify x86 in manifest
 2022-10-28 21:34:59 +02:00
Sefa Eyeoglu
549b5a6488
Merge pull request #231 from tobimori/patch-1 2022-10-28 21:34:59 +02:00
flow
2f5393b9d0
Merge pull request #281 from Scrumplex/fix-nsis-displayname 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
Sefa Eyeoglu
6e94e9bff1
Merge pull request #148 from ZombieNub/prismlauncher-rename 2022-10-28 21:34:59 +02:00
flow
6d46081864
Merge pull request #100 from TheEvilSkeleton/improve-approachability 2022-10-28 21:34:59 +02:00
TheLastRar
b18466da84 Fix: Don't specify x86 in manifest 
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
 2022-10-27 18:37:08 +01:00
Sefa Eyeoglu
318f657c31
Merge pull request #231 from tobimori/patch-1 2022-10-25 20:15:31 +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
Sefa Eyeoglu
d0e668e1d8
Merge pull request #211 from Hibiii/show-instace-arg 2022-10-24 22:51:30 +02:00
Ryan Cao
eeb95f89e1
add .mrpack mime type 
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
 2022-10-25 00:12:27 +08: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
Sefa Eyeoglu
74b98af8e5
fix: use display name in NSIS 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-10-24 12:43:13 +02:00
Sefa Eyeoglu
6a474a0125
fix: update icon generate script 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-10-24 11:18:53 +02:00
Ryan Cao
1a8de111a3
add linux support 
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
 2022-10-22 23:46:53 +08:00
Hibi
5b75869c0b
Add --show to manual page 2022-10-21 16:10:03 -03: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
0e209dcb02
Merge pull request #148 from ZombieNub/prismlauncher-rename 2022-10-20 09:44:25 +02:00
Zeke
6f2d6425a2
update meta to not break flatpak 
Signed-off-by: Zeke <ezekielsmith@protonmail.com>
 2022-10-20 16:54:57 +10:00
IroncladLandship
c29e7477f0
Merge branch 'develop' into prismlauncher-rename 
Signed-off-by: IroncladLandship <jack.huffstutler@gmail.com>
 2022-10-19 19:21:08 -05:00
flow
86bbc7939c
Merge pull request #100 from TheEvilSkeleton/improve-approachability 2022-10-19 21:15:37 -03:00
Jackson Huffstutler
d7478c14fd Renamed inappropriate instances of "PrismLauncher" to "Prism Launcher" 
Signed-off-by: IroncladLandship <jack.huffstutler@gmail.com>
 2022-10-19 16:03:18 -05:00
TheEvilSkeleton
297c593edd
Improve approachability 
Signed-off-by: TheEvilSkeleton <theevilskeleton@riseup.net>
 2022-10-19 15:10:35 -04:00
Sefa Eyeoglu
41032aaac2
Merge pull request #110 from Scrumplex/fix-nsis-shortcut 2022-10-19 14:28:36 +02:00
Sefa Eyeoglu
61fbc5a791
refactor: replace with new logo 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-10-19 13:08:23 +02: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
Samisafool
8201d1df02
Rename 
Signed-off-by: Samisafool <thenerdiestguy@gmail.com>
 2022-10-19 15:02:43 +05:30
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
fn2006
761f20a3e2 Rebase changes into latest PolyMC 2022-09-15 11:51:36 +01:00
dada513
4261dcff39
fix meta 
Signed-off-by: dada513 <dada513@protonmail.com>
 2022-09-11 10:45:42 +02:00
Fintan Martin
763627ee65 Merge branch 'develop' of https://github.com/PolyMC/PolyMC into rebase 2022-08-22 11:58:41 +01:00
Sefa Eyeoglu
6e086eb808
Merge pull request #992 from Scrumplex/refactor-version 2022-08-20 12:50:25 +02:00
Fintan Martin
03923c9e87 Rebrand to PollyMC 2022-08-19 13:56:46 +01:00
DioEgizio
51c664a678
fix: update org.polymc.PolyMC.metainfo.xml.in to not make flatpak break next release 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2022-08-15 20:34:56 +02: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
txtsd
8085b2728d
chore(markdown): MD032 Lists should be surrounded by blank lines 
Signed-off-by: txtsd <thexerothermicsclerodermoid@gmail.com>
 2022-08-06 13:00:56 +05:30
Sefa Eyeoglu
c5625d8d32
Merge pull request #847 from EliteTK/switch-to-scdoc 2022-07-11 14:47:44 +02:00
Sefa Eyeoglu
3e4d1c04de
fix: include TLS plugins in bundle 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-10 12:19:15 +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
Sefa Eyeoglu
efb1f4abf2
Merge pull request #797 from kthchew/fix/update-shortcut 2022-06-21 11:29:15 +02:00
Sefa Eyeoglu
036a826b3a
Merge pull request #788 from kthchew/fix/win-install-version 2022-06-21 11:29:06 +02:00
Kenneth Chew
251942323e
Deselect desktop shortcut by default 
Follows the guidelines at https://docs.microsoft.com/en-us/windows/win32/uxguide/winenv-desktop
 2022-06-15 00:46:34 -04:00
Kenneth Chew
8e3efec40f
Unselect shortcut installation by default if PolyMC is already installed 
This is the same behavior as the `/NoShortcuts` switch.
 2022-06-15 00:41:52 -04:00
Kenneth Chew
9f039cef72
Set correct installer properties and uninstall registry keys 2022-06-12 14:21:56 -04:00
Sefa Eyeoglu
2212a6e40f
Merge pull request #679 from kthchew/fix/win-install-version 2022-06-12 18:12:42 +02:00
Sefa Eyeoglu
278219b1d8
fix(installer): use Windows version number format 2022-06-12 16:24:05 +02:00
Sefa Eyeoglu
2ce4ce9064
fix(installer): add version info to installer 2022-06-12 14:52:54 +02:00
jn64
ca21b31696
Add "mc" keyword to desktop file 
Certain launchers (e.g. GNOME) only search from word boundaries, so typing "mc" doesn't currently match to "PolyMC".
 2022-06-03 09:58:57 +08: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
Sefa Eyeoglu
b07c5982e1
fix: set version for Windows binaries 2022-05-29 13:09:13 +02:00
DioEgizio
577f17c916
remove vista support from the manifest 
we don't support qt <5.12 anymore anyways
 2022-05-29 09:45:20 +02:00