0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,105 Commits 1 Branch 0 Tags 29 MiB
ebbfaf8713
Commit Graph

155 Commits

Author SHA1 Message Date
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
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
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