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

1860 Commits

Author SHA1 Message Date
TheKodeToad
1f3d18ec12 Replace with exact match and add TODO to improve 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-03-02 09:26:00 +00:00
TheKodeToad
a7b8092296 Add link 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-03-01 14:41:16 +00:00
TheKodeToad
1feb630520 Allow custom Modrinth API token 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-03-01 14:24:56 +00:00
Sefa Eyeoglu
0eae9355e6
Merge pull request #889 from flowln/fix_zip_extract 2023-03-01 09:51:08 +01:00
Sefa Eyeoglu
4878f1a438
Merge pull request #735 from Scrumplex/import-component 2023-03-01 09:49:47 +01:00
flow
d5c6704475
fix: prevent crash when aborting import task while extracting pack 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2023-02-24 20:34:43 -03:00
flow
fda9ca1e34
fix+refactor: fix fail to import modpacks and clean up a bit 
QDir::cleanPath called by FS::PathCombine removes the trailing '/'...

Signed-off-by: flow <flowlnlnln@gmail.com>
 2023-02-24 20:09:02 -03:00
Sefa Eyeoglu
1f0fc61b53
Merge pull request from GHSA-gq28-qx55-mh2r 
Don't extract files outside of target path
 2023-02-15 21:48:06 +01:00
Rachel Powers
80840f1fdb fix: add missing header to Application.cpp 
fails to compile on KISS Linux without

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-02-12 22:32:34 -07:00
Sefa Eyeoglu
e70a5a47ee
fix: ignore absolute paths when extracting 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-02-10 10:46:21 +01:00
Sefa Eyeoglu
6be7eed878
fix: don't extract files outside of target path 
This should fix a security issue regarding path traversal in zip files.

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-02-10 09:17:48 +01:00
PandaNinjas
d886d32bd8
Replace potentially ReDOSable regex 
Signed-off-by: PandaNinjas <admin@malwarefight.gq>
 2023-02-07 17:21:00 +00:00
DioEgizio
f36c3a3f6c
Merge pull request #819 from Scrumplex/fix-launch-script 2023-02-06 16:26:54 +01:00
Sefa Eyeoglu
e89a10945c
Merge pull request #823 from BalkanMadman/linux-java 
Fix https://github.com/PrismLauncher/PrismLauncher/issues/790
 2023-02-05 19:09:48 +01:00
Sefa Eyeoglu
8ddc89fa01
Merge pull request #825 from Ryex/cmd_env_native_sep 
fix https://github.com/PrismLauncher/PrismLauncher/issues/824
 2023-02-05 18:42:19 +01:00
Sefa Eyeoglu
a47bf72b07
Merge pull request #751 from Edgars-Cirulis/develop 2023-02-05 17:48:26 +01:00
Rachel Powers
34460dd77a ensure command env vars use native path seperators 
fix #824

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-02-04 12:28:52 -07:00
BalkanMadman
c125c96e88 Java installations detection fix for Linux 
Signed-off-by: BalkanMadman <zurabid2016@gmail.com>
 2023-02-04 16:48:06 +02:00
Sefa Eyeoglu
d2fd0fd8e8
Merge pull request #802 from KosmX/develop 2023-02-04 14:43:28 +01:00
Sefa Eyeoglu
edaa66f622
fix: use /usr/bin/env bash in launch script 
This should make it possible to run these scripts on any system, as
/bin/bash is not standard! Notably this fixes the script on NixOS.

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-02-04 01:06:16 +01:00
Sefa Eyeoglu
6ac073e779
fix: fix component uid regex 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-02-03 18:32:57 +01:00
flow
4166d9ab7b
fix: give error when components have bad uids 
This allows other code to reject proceeding when the UID is bad, which
is generally a good idea. :p

Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
Signed-off-by: flow <flowlnlnln@gmail.com>
 2023-02-02 17:11:24 -03:00
flow
435273e08a
fix(Inst.Import): don't allow bad file path in mrpack import 
This checks the URL of the path of the file to be downloaded,
ensuring that it always contains the root .minecraft target folder,
following the warning in the mrpack documentation.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2023-02-02 17:11:24 -03:00
KosmX
35a62d9787
commit requested change, make the lock static 
Signed-off-by: KosmX <kosmx.mc@gmail.com>
 2023-02-01 23:31:12 +01:00
KosmX
ec5bb944b2
thread-safe logger 
Signed-off-by: KosmX <kosmx.mc@gmail.com>
 2023-02-01 14:59:11 +01:00
leo78913
2b0252d4ae Fix: fix some regressions in the main window 
this removes the update action from the help button
and fixes the add to path action not showing on macos

Signed-off-by: leo78913 <leo3758@riseup.net>
 2023-01-28 15:09:26 -03:00
flow
c78db5459e
Merge pull request #724 from leo78913/dot-ui-mainwindow 
Closes https://github.com/PrismLauncher/PrismLauncher/issues/594
Closes https://github.com/PrismLauncher/PrismLauncher/issues/69
Closes https://github.com/PrismLauncher/PrismLauncher/issues/473
 2023-01-27 10:55:49 -08:00
leo78913
a27564ed70 better fix for WideBar::insertSeparator 
Signed-off-by: leo78913 <leo3758@riseup.net>
 2023-01-27 13:48:12 -03:00
leo78913
df8df41621 Remove unused BarEntry variable 
Signed-off-by: leo78913 <leo3758@riseup.net>
 2023-01-27 12:40:27 -03:00
leo78913
d5a0d4b452
Update launcher/ui/MainWindow.ui 
Co-authored-by: flow <flowlnlnln@gmail.com>
Signed-off-by: leo78913 <leo3758@riseup.net>
 2023-01-27 12:35:53 -03:00
leo78913
357b6ee991
Update launcher/ui/MainWindow.ui 
Co-authored-by: flow <flowlnlnln@gmail.com>
Signed-off-by: leo78913 <leo3758@riseup.net>
 2023-01-27 12:35:41 -03:00
leo78913
4d2b5c2f42 refactor: clean up some MainWindow stuff 
this makes the accounts button and menubar item share the same QMenu
and also refactors some code

Signed-off-by: leo78913 <leo3758@riseup.net>
 2023-01-26 19:48:21 -03:00
flow
29f7ea752f
refactor: make shared_qobject_ptr ctor explicit 
This turns issues like creating two shared ptrs from a single raw ptr
from popping up at runtime, instead making them a compile error.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2023-01-25 16:57:51 -03:00
Sefa Eyeoglu
199a7df807
refactor: add error handling to component import 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-01-25 10:43:23 +01:00
Sefa Eyeoglu
5186ad95d3
Merge pull request #784 from flowln/fix_resource_folder_double_smart_ptrs 2023-01-25 10:33:01 +01:00
Sefa Eyeoglu
0546345182
Merge pull request #458 from Scrumplex/remove-updater 2023-01-25 10:32:49 +01:00
flow
90feaaf2df
fix(Tasks): don't try to start more tasks than necessary 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2023-01-24 17:04:05 -03:00
flow
6d27ef5eea
fix(ResourceFolder): don't create two smart ptrs for the same raw ptr 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2023-01-24 17:04:01 -03:00
Rachel Powers
3ddf413332
Update launcher/Application.cpp 
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-01-24 09:24:12 -07:00
Sefa Eyeoglu
6e841a3b7e
Merge branch 'develop' into remove-updater 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-01-24 14:40:17 +01:00
Rachel Powers
085e067fc1
remove NDEBUG check per Scrumplex's orders 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-01-24 02:26:21 -07:00
Rachel Powers
c45fa016c0
fix: let jars be found from inside build dir for debug builds 
debug bug builds run form inside the build dir before they are bundled can't find the jars

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-01-23 18:36:58 -07:00
Sefa Eyeoglu
16477a8f6c
Merge pull request #675 from flowln/generalize_mod_model 2023-01-23 23:58:52 +01:00
Sefa Eyeoglu
04e4900415
Merge pull request #758 from flowln/fix_process_events_backstab 2023-01-23 23:58:41 +01:00
flow
ea5020e188
fix(license): add/fix my copyright/license headers 
*sobbing in messy legal stuff i know nothing about*

Signed-off-by: flow <flowlnlnln@gmail.com>
 2023-01-23 11:12:43 -03:00
flow
445f9e5f71
feat+fix(Version): make comparsion FlexVer-compatible 
... and fixes a minor issue in the parsing.

This changes the expected behavior of Versions in one significant way:
Now, Versions like 1.2 or 1.5 evaluate to LESS THAN 1.2.0 and 1.5.0
respectively. This makes sense for sorting versions, since one expects
the versions without patch release to 'contain' the ones with, so the
ones without should be evaluated uniformily with the ones with the
patch.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2023-01-21 18:47:47 -03:00
leo78913
5a25ce8c1b Fix main window icon and stuff 
i forgor 💀

Signed-off-by: leo78913 <leo3758@riseup.net>
 2023-01-20 19:45:43 -03:00
leo78913
670cf8ee07 Fix: make the newsLabel toolbutton fullwidth again 
this reverts it to how it was before the MainWindow .ui port

Signed-off-by: leo78913 <leo3758@riseup.net>
 2023-01-20 19:45:43 -03:00
leo78913
6c5f6e8900 Fix status bar name 
Signed-off-by: leo78913 <leo3758@riseup.net>
 2023-01-20 19:45:43 -03:00
leo78913
4ed4fb2314 remove useless setEnabled calls 
Signed-off-by: leo78913 <leo3758@riseup.net>
 2023-01-20 19:45:43 -03:00