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

5800 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TheKodeToad
ec8cb056bf QRegExp -> QRegularExpression :P 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-03-19 11:49:24 +00:00
TheKodeToad
1893871a99
Merge branch 'PrismLauncher:develop' into mrpack-export 2023-03-18 14:02:05 +00:00
TheKodeToad
8837f06e4e Only add summary if not empty 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-03-18 14:01:41 +00:00
TheKodeToad
5346dfc782 Use first line of notes for summary 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-03-18 12:57:44 +00:00
TheKodeToad
ddca838e46 Info and error dialogs 
TODO: is there a better approach?

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-03-18 12:24:18 +00:00
Sefa Eyeoglu
45b0367d14
Merge pull request #931 from Janrupf/feature/custom-downloads-dir 2023-03-14 13:53:51 +01:00
Sefa Eyeoglu
dce86edff0
Merge pull request #934 from heftymouse/develop 2023-03-14 13:52:44 +01:00
Sefa Eyeoglu
84e91ec3b5
Merge pull request #888 from Scrumplex/nix-stuff 2023-03-14 13:52:31 +01:00
Sefa Eyeoglu
05b6969ee5
fix: add mnemonic to downloads directory setting 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-03-14 13:35:16 +01:00
Nikhil B
af949f5cdd Add visual studio files to gitignore 
Signed-off-by: Nikhil B <59918974+heftymouse@users.noreply.github.com>
 2023-03-14 16:52:06 +05:30
Sefa Eyeoglu
7707af08e3
chore(nix): update sources 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-03-14 11:19:23 +01:00
Sefa Eyeoglu
5db4fabcad
chore(nix): add deadnix 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-03-14 10:59:43 +01:00
Sefa Eyeoglu
cfca82ceb3
chore(nix)!: use overlays.default 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-03-14 10:58:41 +01:00
Sefa Eyeoglu
a1130dace0
chore: format markdown files 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-03-14 10:54:50 +01:00
Sefa Eyeoglu
95a0bd61a9
feat(nix): add pre-commit-hooks.nix 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-03-14 10:53:51 +01:00
Sefa Eyeoglu
b324778be7
feat(nix): add devShell 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-03-14 10:51:47 +01:00
Sefa Eyeoglu
950f921c09
refactor(nix): use flake-utils 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-03-14 10:50:07 +01:00
Sefa Eyeoglu
9dff1bac83
chore(nix): format code using alejandra 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-03-14 10:48:19 +01:00
Janrupf
c17f6e37e5 feat: Add setting for downloads directory 
Closes #641

Signed-off-by: Janrupf <business.janrupf@gmail.com>
 2023-03-13 21:58:22 +01:00
Sefa Eyeoglu
e0e26a37b5
Merge pull request #927 from kthchew/fix/mingw-build 2023-03-13 21:24:48 +01:00
Sefa Eyeoglu
15a0c03664
Merge pull request #928 from PrismLauncher/renovate/actions-cache-3.x 
chore(deps): update actions/cache action to v3.3.1
 2023-03-13 18:14:35 +01:00
txtsd
7642e75b28
Merge pull request #929 from Scrumplex/drop-snap 2023-03-13 22:37:16 +05:30
Sefa Eyeoglu
4b36d1e3ea
chore: drop Snap packaging 
We do not have a lot of expertise dealing with Snap and as it is
currently breaking our CI, it might be good to drop support for it.

This does not mean that it won't come back in the future, but as it
stands, it was effectively unmaintained and was only used for nightly
builds anyway.

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-03-13 15:33:23 +01:00
renovate[bot]
20525bec29
chore(deps): update actions/cache action to v3.3.1 2023-03-13 10:50:27 +00:00
Kenneth Chew
430369feb8
fix: explicit conversion to C string to fix MinGW g++ 10 build 
Signed-off-by: Kenneth Chew <kenneth.c0@protonmail.com>
 2023-03-12 18:33:48 -04:00
Kenneth Chew
5ac3e5c958
Update tomlplusplus library 
Fix build on MinGW g++ 10

Signed-off-by: Kenneth Chew <kenneth.c0@protonmail.com>
 2023-03-12 18:33:48 -04:00
txtsd
abc2a529fb
Merge pull request #919 from PrismLauncher/renovate/actions-cache-3.x 2023-03-09 20:54:31 +05:30
renovate[bot]
c638fd9056
chore(deps): update actions/cache action to v3.3.0 2023-03-09 14:41:24 +00:00
Sefa Eyeoglu
1dd96898e1
Merge pull request #896 from TheKodeToad/modrinth-token 2023-03-09 15:10:40 +01:00
TheKodeToad
2cc9b0df06 Only select some paths by default - again! 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-03-08 18:10:52 +00:00
txtsd
3bd4ad7c93
Merge pull request #918 from Scrumplex/qt6-default 2023-03-08 21:18:53 +05:30
Sefa Eyeoglu
a8ffdeca2b
chore!: switch to Qt 6 by default 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-03-08 11:22:30 +01:00
TheKodeToad
59b15c5f08
Fix another duplicate name 🤦 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-03-07 21:03:09 +00:00
TheKodeToad
59cf8f678f
(hopefully) Fix duplicates names 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-03-07 20:50:19 +00:00
TheKodeToad
088be050b2
Apply flowln's suggestion :) 
Co-authored-by: flow <flowlnlnln@gmail.com>
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-03-07 20:46:27 +00:00
TheKodeToad
5d5fcae501 Further reduce buggy behaviour 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-03-06 17:24:04 +00:00
TheKodeToad
970ec8187c More refactoring 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-03-05 18:25:57 +00:00
TheKodeToad
76f66148db Apply flowln's suggestion 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-03-05 18:21:24 +00:00
Sefa Eyeoglu
6bdd6ce571
Merge pull request #912 from Scrumplex/bump-ghc-filesystem 
Bump ghc-filesystem
 2023-03-05 17:25:38 +01:00
Sefa Eyeoglu
dd96e1819d
fix: remove unneeded alias for ghc_filesystem 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-03-05 14:24:40 +01:00
Sefa Eyeoglu
07702d3be7
fix: drop unneeded GHC_FILESYSTEM_WITH_INSTALL 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-03-05 14:23:40 +01:00
Sefa Eyeoglu
b9dfcf6d2f
chore: bump ghc-filesystem 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-03-05 14:21:07 +01:00
Sefa Eyeoglu
f3f0652d2b
Merge pull request #853 from kumquat-ir/nil 
NilLoader mod metadata support
 2023-03-05 13:39:00 +01:00
Sefa Eyeoglu
aae60334d1
Merge pull request #911 from flowln/fix_zip_extract_windows 2023-03-05 13:09:25 +01:00
Sefa Eyeoglu
b38af948b9
Merge pull request #857 from Ryex/fix_windows_default_apps 2023-03-05 13:09:11 +01:00
flow
06de728aa7 fix: use toLocalFile() instead of path() 
QUrl::path() adds a '/' at the beginning of the path on Windows, causing
the world to explode every once in a while.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2023-03-05 08:24:56 -03:00
TheKodeToad
87384182a1 Fix abort? 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-03-04 11:07:07 +00:00
TheKodeToad
f583e617ec Implement abort (possible broken?) and therefore make it work without crashing! 
The shared pointer was going out of scope 🤦.

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-03-04 10:37:56 +00:00
TheKodeToad
a2716f5cf6 Improve code 
Even more broken now (it is stuck loading forever)!

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-03-04 10:24:25 +00:00
TheKodeToad
55f928f845 More consistent naming 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-03-03 15:06:29 +00:00