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

5581 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
seth
f5955a4738
feat: add bday teawie 
Signed-off-by: seth <getchoo@tuta.io>
 2023-01-07 04:47:53 -05:00
seth
e018b30875
fix: make spooky teawie load 
gimp fail

Signed-off-by: seth <getchoo@tuta.io>
 2023-01-07 04:38:26 -05:00
seth
2dbd775cf3
feat: add xmas teawie 
Signed-off-by: seth <getchoo@tuta.io>
 2023-01-07 04:37:41 -05:00
seth
a5051327db
feat: add spooky teawie 
Signed-off-by: seth <getchoo@tuta.io>
 2023-01-07 03:42:53 -05:00
seth
8140f5136d
feat: add teawie 
drawn by sympathytea (https://github.com/SympathyTea)

Signed-off-by: seth <getchoo@tuta.io>
 2023-01-06 22:28:15 -05:00
Joshua Goins
f04703f09b Strip certain HTML tags when rendering mod pages 
Some mod pages use certain tags for centering purposes, but trips up
hoedown.

Signed-off-by: Joshua Goins <josh@redstrate.com>
 2023-01-06 15:05:19 -05:00
byquanton
2faf8332ee
fix: Add 1.16+ Forge library prefix in TechnicPackProcessor.cpp 
Signed-off-by: byquanton <32410361+byquanton@users.noreply.github.com>
 2023-01-06 02:44:10 +01:00
Aaron Sonin
e0e3d4d8fe
Merge branch 'PrismLauncher:develop' into instance-accounts 2023-01-02 11:59:29 -07:00
Aaron
ba81ad1ac3 Reword instance-specific account settings, apply clang-format 
Signed-off-by: Aaron <10217842+byteduck@users.noreply.github.com>
 2023-01-02 11:17:19 -07:00
Aaron Sonin
eefb259ddf Remove unecessary delete in InstanceSettingsPage destructor 
Co-authored-by: flow <flowlnlnln@gmail.com>
Signed-off-by: Aaron Sonin <10217842+byteduck@users.noreply.github.com>
Signed-off-by: Aaron <10217842+byteduck@users.noreply.github.com>
 2023-01-02 11:17:19 -07:00
Aaron Sonin
9b8add1961 Properly connect signal in instance settings for account selector 
Co-authored-by: flow <flowlnlnln@gmail.com>
Signed-off-by: Aaron Sonin <10217842+byteduck@users.noreply.github.com>
Signed-off-by: Aaron <10217842+byteduck@users.noreply.github.com>
 2023-01-02 11:17:19 -07:00
Aaron Sonin
e186523878 Add null check for face in instance account settings selector 
Co-authored-by: flow <flowlnlnln@gmail.com>
Signed-off-by: Aaron Sonin <10217842+byteduck@users.noreply.github.com>
Signed-off-by: Aaron <10217842+byteduck@users.noreply.github.com>
 2023-01-02 11:17:19 -07:00
Aaron Sonin
021e6c02d7 Replace unecessary type check with assertion in InstanceSettingsPage 
Co-authored-by: flow <flowlnlnln@gmail.com>
Signed-off-by: Aaron Sonin <10217842+byteduck@users.noreply.github.com>
Signed-off-by: Aaron <10217842+byteduck@users.noreply.github.com>
 2023-01-02 11:17:19 -07:00
Aaron
cba3d68063 Fix conflicting layout name in InstanceSettingsPage 
Signed-off-by: Aaron <10217842+byteduck@users.noreply.github.com>
 2023-01-02 11:17:19 -07:00
Aaron
7e2d78bab5 Allow selecting a default account to use with an instance 
Signed-off-by: Aaron <10217842+byteduck@users.noreply.github.com>
 2023-01-02 11:17:19 -07:00
DioEgizio
4b12c85d91
Merge pull request #673 from PrismLauncher/renovate/flatpak-flatpak-github-actions-5.x 
chore(deps): update flatpak/flatpak-github-actions action to v5
 2022-12-30 19:23:10 +01:00
Rachel Powers
0ebf04a021
fix newlines 
Co-authored-by: flow <flowlnlnln@gmail.com>
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-12-30 10:21:49 -07:00
flow
d55f47077a
Merge pull request #626 from leo78913/mods-provider-column 
closes https://github.com/PrismLauncher/PrismLauncher/issues/402
 2022-12-30 11:39:03 -03:00
Sefa Eyeoglu
11df4845b7
fix: remove Flatpak cache key workaround 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-12-30 15:36:35 +01:00
Rachel Powers
7f438425aa refactor: add an identify function to make easy to reuse 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-12-29 19:47:19 -07:00
Rachel Powers
c470f05abf refactor: use std::filesystem::rename insted of copy and then moving. 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-12-29 17:21:54 -07:00
flow
141e94369e
feat(Mods): hide 'Provider' column when no mods have providers 
This makes the mod list look a bit less polluted in the common case of
mods having no provider whatsoever.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-29 13:21:49 -03:00
flow
257970c27d
refactor(Mods): make provider() return a std::optional 
This makes it easier to check if a mod has a provider or not, without
having to do a string comparison.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-29 13:21:49 -03:00
flow
67ac3da8a0
Merge pull request #684 from Scrumplex/logging-categories 
Prevents private credentials from leaking in the logs of general users
 2022-12-28 09:54:23 -08:00
Sefa Eyeoglu
c1e5179b5f
Merge pull request #680 from AshtakaOOf/flathub-screenshots 2022-12-28 13:48:39 +01:00
Sefa Eyeoglu
7a651bdc53
feat: install launcher logging categories 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-12-27 18:10:01 +01:00
Sefa Eyeoglu
f33f596584
refactor: use ECM logging categories instead 
Co-authored-by: flow <flowlnlnln@gmail.com>
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-12-27 17:34:21 +01:00
Sefa Eyeoglu
c8d8046412
refactor: add logging category for credentials 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-12-27 17:04:42 +01:00
Sefa Eyeoglu
4d334b645d
Merge pull request #681 from PrismLauncher/renovate/actions-cache-3.x 2022-12-27 13:54:00 +01:00
renovate[bot]
58d3779efb
chore(deps): update actions/cache action to v3.2.2 2022-12-27 12:20:21 +00:00
Rachel Powers
3691f3a296 fix: cleanup and suggested changes 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-12-26 14:50:15 -07: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
Sefa Eyeoglu
6ea1234a3b
Merge pull request #618 from TheKodeToad/safer-destructive-actions 
Fixes https://github.com/PolyMC/PolyMC/issues/948
 2022-12-26 17:48:43 +01:00
TheKodeToad
434f639b0c Use optional instead of hardcoded cancelled string 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-12-26 14:58:37 +00:00
TheKodeToad
bf04becc9e About to -> you are about to 
You're is used in some other places but im lazy

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-12-26 14:45:04 +00:00
Rachel Powers
b2082bfde7 fix: explicit QFileInfo converison for qt6 
fix: validatePath in validateZIPResouces

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-12-25 17:16:26 -07:00
Rachel Powers
78984eea3a feat: support installing worlds during flame pack import. 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-12-25 16:49:56 -07:00
Rachel Powers
8422e3ac01 feat: zip resource validation check for flame 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-12-24 20:43:17 -07:00
Rachel Powers
cfce54fe46 fix: update parse tests 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-12-24 20:43:17 -07:00