0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,503 Commits 1 Branch 0 Tags 29 MiB
97a74d5c1f
Commit Graph

4503 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
txtsd
8cea57ff0f
chore(markdown): MD022 Headings should be surrounded by blank lines 
Signed-off-by: txtsd <thexerothermicsclerodermoid@gmail.com>
 2022-08-06 12:53:50 +05:30
flow
d835e1d14e
refactor: simplify smart pointers more 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-08-05 11:38:46 -03:00
flow
75f92de8f8
Merge pull request #1017 from flowln/kill_orphan_metadata 
Remove orphaned metadata to avoid problems with auto-updating instances
 2022-08-04 12:57:20 -07:00
flow
293c1deee5
Merge pull request #1014 from DioEgizio/downgrade-qt-macos 
chore: downgrade to Qt 6.3.0 on macos
 2022-08-04 12:56:55 -07:00
flow
4dee05a967
Merge pull request #1006 from DioEgizio/appimage-ubuntu-moment 
fix: work around ubuntu 22.04 openssl appimage issues by copying openssl libs
 2022-08-04 12:56:38 -07:00
Sefa Eyeoglu
8d6414d74a
Merge pull request #1019 from Scrumplex/fix-openbsd-root 
Add root path detection on OpenBSD
 2022-08-04 21:47:35 +02:00
flow
362ecdb583
refactor+fix: use QSharedPointer for shared_qobject_ptr 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-08-04 15:33:51 -03:00
LennyMcLennington
058b9f9272
Merge pull request #994 from Scrumplex/fix-winget-releaser 
Fix WinGet releaser
 2022-08-04 16:20:23 +01:00
Sefa Eyeoglu
355762aa30
fix: emit abort in LaunchController 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-08-04 10:07:36 +02:00
Sefa Eyeoglu
be4fb65470
fix: Add root path detection on OpenBSD 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-08-03 21:14:32 +02:00
Sefa Eyeoglu
4ed296bad4
fix: allow user to interrupt launch after 3 tries 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-08-03 20:38:40 +02:00
Gingeh
a8aa862919 Move large condition into a new lambda 
Signed-off-by: Gingeh <39150378+Gingeh@users.noreply.github.com>
 2022-08-03 16:39:30 +10:00
flow
31ba1de53b
fix: remove orphaned metadata to avoid problems with auto-updating insts 
Just as my master has taught me. 🔫

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-08-02 16:15:39 -03:00
DioEgizio
bca1fef2b2 chore: downgrade to Qt 6.3.0 on macos 
seems to fix some emoji-related issues

Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2022-08-02 10:59:54 +02:00
Gingeh
f33b31e048 Check for running instance when re-opening the mod folder page and when selecting mods 
Signed-off-by: Gingeh <39150378+Gingeh@users.noreply.github.com>
 2022-08-02 14:14:45 +10:00
Gingeh
0d10ebb7ca Update launcher/ui/pages/instance/ModFolderPage.h 
Co-authored-by: flow <flowlnlnln@gmail.com>
Signed-off-by: Gingeh <39150378+Gingeh@users.noreply.github.com>
 2022-08-02 12:50:25 +10:00
Sefa Eyeoglu
6fd3672618
Merge pull request #1012 from DioEgizio/patch-10 
fix: remove iconfix from libraries/README.MD
 2022-08-01 20:31:11 +02:00
DioEgizio
abd090bd48
fix: remove iconfix from libraries/README.MD 
someone forgor (💀) to remove it

Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2022-08-01 20:21:19 +02:00
Sefa Eyeoglu
bd9140f1f3
Merge pull request #1008 from DioEgizio/qt-version-issue-template 
chore: update issue template to ask about Qt version
 2022-08-01 18:40:11 +02:00
DioEgizio
9d78b2d259 Update .github/ISSUE_TEMPLATE/bug_report.yml 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
Co-authored-by: flow <flowlnlnln@gmail.com>
 2022-08-01 14:51:19 +02:00
DioEgizio
9c9528838a chore: update issue template to ask about Qt version 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2022-08-01 14:40:55 +02:00
Gingeh
77b640b76b Disable "Check for Updates" and "Download Mods" while the game is running 
Signed-off-by: Gingeh <39150378+Gingeh@users.noreply.github.com>
 2022-08-01 20:56:05 +10:00
Gingeh
a8dfe98b1a Disable "Check for Updates" if all mods are removed 
Signed-off-by: Gingeh <39150378+Gingeh@users.noreply.github.com>
 2022-08-01 20:56:05 +10:00
DioEgizio
5f1efbeb67 fix: work around ubuntu 22.04 openssl appimage issues by copying openssl libs 
terrible hack but it works™️

Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2022-08-01 09:57:14 +02:00
kumquat-ir
9c105914f0 use BlockedModsDialog for ftb packs as well 
Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com>
 2022-07-31 15:05:47 -04:00
kumquat-ir
579582740e Merge remote-tracking branch 'origin/develop' into download-all-blocked 
Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com>
 2022-07-31 14:54:50 -04:00
Ryan Cao
b15544c163
Trash instances instead of deleting (when possible) (#549) 
Squashed because of :pofat: commit history
 2022-07-30 14:42:33 -03:00
LennyMcLennington
94a63e3859
Merge pull request #941 from Scrumplex/bump-cxx-standard 
Bump to C++17
 2022-07-30 17:10:59 +01:00
LennyMcLennington
842b7e6c39
use c11 instead 
c17 dont work properly with lgtm's build system and c11 is already almost identical to c17 at least in gcc
 2022-07-30 15:35:48 +01:00
Sefa Eyeoglu
22f5011451
fix(winget): strictly match non-Legacy setup 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-29 16:25:12 +02:00
timoreo
74120fe1f3
Merge pull request #699 from Scrumplex/resolve-ftb-mods-cf 2022-07-28 09:43:39 +02:00
flow
336f1f4f50
Merge pull request #974 from flowln/accounts_qt6 
Fix adding multiple accounts in Qt6
 2022-07-26 16:08:05 -03:00
txtsd
1c256d8876
Merge pull request #958 from jopejoe1/readme 2022-07-27 00:16:35 +05:30
flow
1ce0f0e7a5
fix: progress dialog going away even if the task was not aborted 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-07-26 20:33:33 +02:00
flow
fbf1901d86
refactor: shuffle some things around to improve readability 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-07-26 20:33:33 +02:00
flow
0382f33c46
fix(ui): pump events to show "Copying modpack files..." text 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-07-26 20:33:33 +02:00
flow
13372f3f99
chore: clean up FTBPackInstallTask a bit and connect missing signals 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-07-26 20:33:33 +02:00
flow
e741cb7f0a
fix: add abort handlign in Flame's FileResolvingTask 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-07-26 20:33:33 +02:00
Sefa Eyeoglu
fb289c6b17
chore: add license headers 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-26 20:33:29 +02:00
Sefa Eyeoglu
75a7ea55d4
feat: implement mod resolving for FTB 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-26 20:33:10 +02:00
Sefa Eyeoglu
86573a5ccd
Merge pull request #961 from flowln/fix_resource_filter 2022-07-26 20:14:18 +02:00
flow
6fe55a79f1
fix: use const qualifier for operator==() and allow other comparisons 
This fixes an implicit behavior changed by C++17.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-07-26 15:11:56 -03:00
flow
1a6cb9ee99
chore: add some debugging prints in AccountList 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-07-26 15:11:56 -03:00
txtsd
a495d9eca5
chore: Normalize sentence in readme 
Signed-off-by: txtsd <thexerothermicsclerodermoid@gmail.com>
 2022-07-26 22:00:40 +05:30
LennyMcLennington
65a945f968
Merge pull request #956 from flowln/jar_mods_aa 
Fix segmentation fault when using jar mods
 2022-07-25 06:57:40 +01:00
flow
3aa2003951
fix: filter in external resource pages not working 
For some reason, using setFilterFixedString() doesn't seem to update the
QRegularExpression object with a new value, instead leaving it empty. It
updates QRegExp just fine, so maybe that's an Qt bug? o.O

Anyway, using regex in the filter is kinda cool actually :D

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-07-23 23:50:56 -03:00
flow
0e473f4570
Merge pull request #951 from flowln/performace_tab_fix 
Hide the entire performance tab on the instance settings in non-Linux OSes
 2022-07-23 18:31:04 -03:00
jopejoe1
bfa824ee71 Fix broken url in readme 
Signed-off-by: jopejoe1 <johannes@joens.email>
 2022-07-23 23:22:39 +02:00
flow
1157436a24
fix: sigsegv when trying to use jar mods 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-07-23 14:24:24 -03:00
LennyMcLennington
4596e78df0
Merge pull request #952 from Scrumplex/fix-pre-post-launch 
Fix variable substitution in pre launch/post exit hooks
 2022-07-23 18:06:12 +01:00