0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,572 Commits 1 Branch 0 Tags 29 MiB
198139feb4
Commit Graph

5572 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Edgars Cīrulis
198139feb4
Version.cpp: Simplify Version::parse by using const auto& current_char 
Signed-off-by: Edgars Cīrulis <edgarsscirulis@gmail.com>
 2023-01-17 07:14:37 +02:00
Edgars Cīrulis
de11017552
Version.cpp: Use anonymous function to eliminate code duplication 
Signed-off-by: Edgars Cīrulis <edgarsscirulis@gmail.com>
 2023-01-17 07:14:29 +02:00
Edgars Cīrulis
6fb837c529
Version.cpp: Add version string parser to split on '.' character 
Signed-off-by: Edgars Cīrulis <edgarsscirulis@gmail.com>
 2023-01-17 07:14:05 +02:00
Edgars Cīrulis
c0c3892064
Version.cpp: Improve version parsing to handle mixed numeric and alphabetic characters 
Signed-off-by: Edgars Cīrulis <edgarsscirulis@gmail.com>
 2023-01-17 07:13:24 +02:00
RaptaG
72a9b98ef0
We're in 2023 :) 
Signed-off-by: RaptaG <77157639+RaptaG@users.noreply.github.com>
 2023-01-14 17:55:56 +02:00
flow
cf022524d1
Merge pull request #743 from flowln/fix_mods_with_wrong_modListVersion 2023-01-14 12:19:12 -03:00
flow
ebb0596c1a
fix: don't fail mod parsing when encountering invalid modListVersion 
The spec (admitely a very old one) states that this entry should always
have the value "2". However, some mods do not follow this convention,
causing issues.

One notable example is the 1.6 version of Aether II for 1.7.10, that has
this value set at "5" for whatever reason.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2023-01-13 21:15:10 -03:00
flow
3de681d2d6
Merge pull request #685 from byteduck/instance-accounts 2023-01-13 17:21:12 -03:00
flow
b937d33436
Merge pull request #714 from redstrate/cmark 2023-01-13 16:16:00 -03:00
Sefa Eyeoglu
f7244fbf68
Merge pull request #737 from PrismLauncher/renovate/hendrikmuhs-ccache-action-1.x 
chore(deps): update hendrikmuhs/ccache-action action to v1.2.7
 2023-01-13 08:17:59 +01:00
Aaron
4e80d1fc79
DCO Remediation Commit for Aaron <10217842+byteduck@users.noreply.github.com> 
I, Aaron <10217842+byteduck@users.noreply.github.com>, hereby add my Signed-off-by to this commit: 160dd09fc2

Signed-off-by: Aaron <10217842+byteduck@users.noreply.github.com>
 2023-01-12 20:16:48 -08:00
Aaron Sonin
b2f48eaeb8
Merge branch 'PrismLauncher:develop' into instance-accounts 2023-01-12 20:11:46 -08:00
Aaron
160dd09fc2
Fix instance account selector face for offline accounts 2023-01-12 20:03:31 -08:00
renovate[bot]
80eea05deb
chore(deps): update hendrikmuhs/ccache-action action to v1.2.7 2023-01-12 22:06:50 +00:00
Sefa Eyeoglu
5e89ba7079
Merge pull request #732 from DioEgizio/actually-fix-openssl3-mac-failures 2023-01-12 16:31:03 +01:00
DioEgizio
ff7878217d fix: add cmark:p to mingw build 
this way we can just dynamically link it on that build instead of building it ourselves and statically linking it

Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2023-01-12 10:08:52 -05:00
Joshua Goins
807da6a035 fix: Remove extra line breaks for modrinth descriptions 
Signed-off-by: Joshua Goins <josh@redstrate.com>
 2023-01-12 10:08:52 -05:00
Joshua Goins
4e2a958896 fix(flatpak): enable builddir 
Signed-off-by: Joshua Goins <josh@redstrate.com>
 2023-01-12 10:08:52 -05:00
Sefa Eyeoglu
3ee0ec7cd0 fix(nix): add cmark dependency 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-01-12 10:08:52 -05:00
Sefa Eyeoglu
22a2b7ac46 refactor: support system and bundled cmark 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-01-12 10:08:52 -05:00
Joshua Goins
aa7c910e26 build: remove hoedown vendored source 
Signed-off-by: Joshua Goins <josh@redstrate.com>
 2023-01-12 10:08:52 -05:00
Joshua Goins
24a4bd3a1c refactor: replace hoedown markdown parser with cmark 
Signed-off-by: Joshua Goins <josh@redstrate.com>
 2023-01-12 10:08:52 -05:00
Sefa Eyeoglu
219c5b323d
Merge pull request #731 from flowln/windows_server_trash 2023-01-11 09:49:20 +01:00
DioEgizio
14278a9e35 fix: set HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK to 1 
should fix some random failures

Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2023-01-10 20:02:20 +01:00
Sefa Eyeoglu
dd013209e8
Merge pull request #730 from DioEgizio/aaaaaaaa-revert 
Revert "Merge pull request #729 from DioEgizio/fix-mac-openssl3-failing"
 2023-01-10 17:44:23 +01:00
flow
96d5438633
Merge pull request #249 from TayouVR/theme-selector-first-time-wizard 2023-01-10 13:28:57 -03:00
flow
391ef64c22
fix(FileSystem): don't attempt to trash items on Windows Server 
For some reason this makes some of our CI test runs super slow, and
sometimes fail miserably.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2023-01-10 12:50:56 -03:00
DioEgizio
d45a62b3a6 Revert "Merge pull request #729 from DioEgizio/fix-mac-openssl3-failing" 
it was necessary :/

This reverts commit 976e550aa7, reversing
changes made to 61144f7a21.

Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2023-01-10 16:47:28 +01:00
Sefa Eyeoglu
976e550aa7
Merge pull request #729 from DioEgizio/fix-mac-openssl3-failing 
fix: just use github runner's openssl 1.1 instead of installing 3 on …
 2023-01-10 16:28:02 +01:00
Tayou
668b19d119
Add hint about Cat 
Signed-off-by: Tayou <tayou@gmx.net>
 2023-01-10 16:09:57 +01:00
Sefa Eyeoglu
5c48f0b458
fix: set minimum size for setup wizard 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-01-10 16:06:50 +01:00
Tayou
689fe1e2c7
CRLF -> LF 
damn you visual studio for creating CRLF files everywhere...
Signed-off-by: Tayou <tayou@gmx.net>
 2023-01-10 16:06:50 +01:00
Tayou
7d440402ad
Update launcher/Application.cpp with suggestion from scrumplex 
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
Signed-off-by: Tayou <tayou@gmx.net>
 2023-01-10 16:06:42 +01:00
Tayou
6daa457838
Implement Suggestions from flow & Scrumplex 
Signed-off-by: Tayou <tayou@gmx.net>
 2023-01-10 16:06:42 +01:00
Tayou
49d317b19a
UX tweak + formatting + added cat to wizard 
Signed-off-by: Tayou <tayou@gmx.net>
 2023-01-10 16:06:24 +01:00
Tayou
1b80ae0fca
add theme setup wizard 
Signed-off-by: Tayou <tayou@gmx.net>
 2023-01-10 16:06:01 +01:00
DioEgizio
a113ecca8b fix: just use github runner's openssl 1.1 instead of installing 3 on macos signing 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2023-01-10 15:03:28 +01:00
Sefa Eyeoglu
61144f7a21
Merge pull request #726 from TheLastRar/qt6-win-darkmode 
Closes https://github.com/PrismLauncher/PrismLauncher/issues/158
 2023-01-10 08:48:17 +01:00
TheLastRar
78bbcac0ea ui: Let Qt 6.4.2 handle dark mode titlebar 
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
 2023-01-09 19:44:11 +00:00
Sefa Eyeoglu
ca9b2525c8
Merge pull request #715 from getchoo/add-teawie 2023-01-09 09:46:31 +01:00
Sefa Eyeoglu
bb1c387a98
Merge pull request #722 from PrismLauncher/renovate/actions-cache-3.x 2023-01-09 09:41:32 +01:00
Sefa Eyeoglu
38ce37b6fd
Merge pull request #720 from PrismLauncher/renovate/hendrikmuhs-ccache-action-1.x 2023-01-09 09:41:03 +01:00
renovate[bot]
7fdc81236e
chore(deps): update actions/cache action to v3.2.3 2023-01-09 07:54:22 +00:00
renovate[bot]
fca40c1c6b
chore(deps): update hendrikmuhs/ccache-action action to v1.2.6 2023-01-08 22:40:41 +00:00
flow
d5d5d66e03
Merge pull request #716 from DioEgizio/qt6.4.2-winmsvc 
closes https://github.com/PrismLauncher/PrismLauncher/issues/288
 2023-01-08 11:33:13 -03:00
DioEgizio
0481ae187a chore: update windows msvc to qt 6.4.2 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2023-01-08 10:34:45 +01:00
seth
9de6927c3f
feat: add CC BY-SA 4.0 info for teawie images 
Signed-off-by: seth <getchoo@tuta.io>
 2023-01-07 19:18:22 -05:00
Sefa Eyeoglu
f3f628410d
Merge pull request #576 from Ryex/identify-zip-packs 
fix https://github.com/PrismLauncher/PrismLauncher/issues/349
 2023-01-07 17:33:34 +01:00
Sefa Eyeoglu
9901ecda49
Merge pull request #710 from byquanton/develop 
Fixes https://github.com/PrismLauncher/PrismLauncher/issues/708
 2023-01-07 17:18:10 +01:00
flow
39becf607e
Merge pull request #713 from redstrate/fix-html-rendering 2023-01-07 12:57:35 -03:00