0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,304 Commits 1 Branch 0 Tags
42b9b3d72a07089459283bcaaef1a070491c486f
Commit Graph

4304 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
txtsd
42b9b3d72a Merge pull request #905 from DioEgizio/fix-copying 2022-07-12 19:19:09 +05:30
DioEgizio
e280f9fe3e chore(COPYING): update COPYING.MD a bit 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2022-07-12 15:20:26 +02:00
flow
89493a2f1d Merge pull request #904 from virchau13/add-stdenv-lib 
fix(nix): add stdenv.cc.cc.lib to GAME_LIBRARY_PATH
 2022-07-12 07:47:06 -03:00
flow
e259bffca6 Merge pull request #810 from Scrumplex/refactor-launcher-version 
Hide channel from version for tagged commits
 2022-07-12 07:46:46 -03:00
Vir Chaudhury
ba9164022d fix(nix): add stdenv.cc.cc.lib to GAME_LIBRARY_PATH 
Some mods (like DiscordRichPresence) require libstdc++.
This commit adds stdenv.cc.cc.lib to $GAME_LIBRARY_PATH so that these
mods function correctly.

Signed-off-by: Vir Chaudhury <virchau13@hexular.net>
 2022-07-12 05:16:32 +08:00
timoreo
1a26a53659 Merge pull request #901 from txtsd/scdoc 2022-07-11 14:56:19 +02:00
Sefa Eyeoglu
8f4d7ac655 Merge pull request #678 from Scrumplex/improvements-around-proprietary-services 2022-07-11 14:56:09 +02:00
Sefa Eyeoglu
c5625d8d32 Merge pull request #847 from EliteTK/switch-to-scdoc 2022-07-11 14:47:44 +02:00
flow
548a2a1d64 Merge pull request #900 from DioEgizio/CI/fix 
fix(actions): fix ccache on windows
 2022-07-11 08:02:27 -03:00
txtsd
df01a58099 feat(ci): Install scdoc to build manpage 
Signed-off-by: txtsd <thexerothermicsclerodermoid@gmail.com>
 2022-07-11 14:30:46 +05:30
Sefa Eyeoglu
ac8ee9f981 Merge pull request #479 from kthchew/feature/sparkle-mac 2022-07-11 09:02:41 +02:00
DioEgizio
b1805b70ea fix(actions): fix ccache on windows 
Also removes some unnecessary dependencies for the generic Linux package

Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2022-07-11 08:13:02 +02:00
Kenneth Chew
eae8a2914e Remove use of obsolete method 
Fixes Qt 6 build

Signed-off-by: Kenneth Chew <kenneth.c0@protonmail.com>
 2022-07-10 19:09:58 -04:00
Kenneth Chew
03429db528 Switch to production Sparkle appcast 
DCO Remediation Commit for Kenneth Chew <kenneth.c0@protonmail.com>

I, Kenneth Chew <kenneth.c0@protonmail.com>, hereby add my Signed-off-by to this commit: 92b913ca37
I, Kenneth Chew <kenneth.c0@protonmail.com>, hereby add my Signed-off-by to this commit: 7eb61a28be
I, Kenneth Chew <kenneth.c0@protonmail.com>, hereby add my Signed-off-by to this commit: ea4ef1655b
I, Kenneth Chew <kenneth.c0@protonmail.com>, hereby add my Signed-off-by to this commit: b5bdfa6c2e
I, Kenneth Chew <kenneth.c0@protonmail.com>, hereby add my Signed-off-by to this commit: f9f46609ee
I, Kenneth Chew <kenneth.c0@protonmail.com>, hereby add my Signed-off-by to this commit: 34adcec616
I, Kenneth Chew <kenneth.c0@protonmail.com>, hereby add my Signed-off-by to this commit: 05cd30ac06
I, Kenneth Chew <kenneth.c0@protonmail.com>, hereby add my Signed-off-by to this commit: f3c72f4f08
I, Kenneth Chew <kenneth.c0@protonmail.com>, hereby add my Signed-off-by to this commit: b1f486518e
I, Kenneth Chew <kenneth.c0@protonmail.com>, hereby add my Signed-off-by to this commit: 3bc02b9662

Signed-off-by: Kenneth Chew <kenneth.c0@protonmail.com>
 2022-07-10 18:51:52 -04:00
Sefa Eyeoglu
b3b76d5d56 Merge branch 'develop' into feature/sparkle-mac 
# Conflicts:
#	.github/workflows/build.yml
 2022-07-10 19:38:30 +02:00
Sefa Eyeoglu
cd948dceae Merge pull request #575 from Scrumplex/qt6 2022-07-10 19:21:01 +02:00
Sefa Eyeoglu
eb33a87ff5 fix: remove TODOs 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-10 18:11:13 +02:00
Sefa Eyeoglu
d77237ca5d refactor(actions): rename Windows builds 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-10 12:19:15 +02:00
Sefa Eyeoglu
211d596fdd refactor(actions): switch to system QuaZip on Windows 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-10 12:19:15 +02:00
Sefa Eyeoglu
f464b347b2 fix: install TLS plugins for release builds 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-10 12:19:15 +02:00
Sefa Eyeoglu
203c3ec233 refactor(actions): speed up package installations for Windows 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-10 12:19:15 +02:00
Sefa Eyeoglu
e2a74dfc30 feat(actions): enable Windows-i686 Qt 6 builds 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-10 12:19:15 +02:00
Sefa Eyeoglu
4e99da7b62 refactor: query Qt variables using ECM 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-10 12:19:15 +02:00
Sefa Eyeoglu
eb5ed50824 fix: set UNICODE and _UNICODE for Qt 5 builds 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-10 12:19:15 +02:00
Sefa Eyeoglu
3b4539de79 chore: update license headers 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-10 12:19:15 +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
Sefa Eyeoglu
fdf5748029 feat(actions): use Qt 6 on macOS and AppImage 
Co-authored-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-10 12:19:15 +02:00
Sefa Eyeoglu
3562e94650 Revert "fix: ignore deprecation again" 
We want to see deprecation warnings now

This reverts commit 47d0da2d96bc375410f5d494ac9371d47adf33d5.

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-10 12:19:15 +02:00
Sefa Eyeoglu
15c5bbcf22 fix: fix slots for Qt 6 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-10 12:19:15 +02:00
Sefa Eyeoglu
c363423718 refactor: fix deprecation up to Qt 6 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-10 12:19:15 +02:00
Sefa Eyeoglu
e58158c3cd feat: add Qt 6 support to CMake 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-10 12:19:14 +02:00
Sefa Eyeoglu
ff2cd50bfa refactor: replace QRegExp with QRegularExpression 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-10 12:17:52 +02:00
Sefa Eyeoglu
984692dc62 refactor: fix deprecation up to Qt 5.15 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-10 12:17:52 +02:00
txtsd
c1bcbf8c63 Merge pull request #880 from Scrumplex/fix-loader-importance 
Make loader components not important
 2022-07-10 15:44:17 +05:30
dada513
3b187b5246 Merge pull request #876 from Scrumplex/revert-updater-stuff 
Revert "fix: remove updater if it is not used"
 2022-07-10 10:50:03 +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
f591c87665 Merge pull request #851 from russellbanks/patch-1 2022-07-09 01:16:07 +02:00
Sefa Eyeoglu
e6fe701727 Merge pull request #808 from Scrumplex/fix-lgtm-warnings 2022-07-09 01:10:59 +02:00
flow
35a698ef72 Merge pull request #884 from jopejoe1/ftbuifixed 
Updated FTB Classic layout
 2022-07-08 16:19:14 -03:00
flow
998271414e Merge pull request #890 from Scrumplex/fix-technic-forge 
Fix Technic instances using Forge
 2022-07-08 16:18:59 -03:00
Sefa Eyeoglu
1749f25420 Merge pull request #881 from gytis-ivaskevicius/develop 2022-07-08 17:29:12 +02:00
Sefa Eyeoglu
4ab0e70a9a fix(technic): map loader libraries to components properly 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-08 17:28:06 +02:00
Sefa Eyeoglu
08989bde5e Merge pull request #839 from flowln/modrinth_packs_bug_hunt 2022-07-08 16:25:35 +02:00
Sefa Eyeoglu
87cbff391c fix: disable MSA login if it is NOT supported 
Co-authored-by: flow <flowlnlnln@gmail.com>
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-08 16:25:03 +02:00
Sefa Eyeoglu
962923bbce chore: add missing license headers 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-08 16:25:03 +02:00
Sefa Eyeoglu
311b081e60 feat: add validation for Flame key and MSA client ID 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-08 16:25:03 +02:00
Sefa Eyeoglu
4103948132 feat: track capabilities of application 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-08 16:25:03 +02:00
Sefa Eyeoglu
906f26698b fix: spelling of CF 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-08 16:25:03 +02:00
Sefa Eyeoglu
8a1a583afe refactor: rename references to CurseForge to Flame 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-08 16:25:03 +02:00
jopejoe1
9e19b73ce6 Updated FTB Classic layout 
Signed-off-by: jopejoe1 <johannes@joens.email>
 2022-07-07 23:18:13 +02:00