Commit Graph

5699 Commits

Author SHA1 Message Date
kumquat-ir
7973b01e81 fix metadata for mods with .nilmod extension
Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com>
2023-02-19 17:21:53 -05:00
kumquat-ir
256fc322a8 minor cleanup
Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com>
2023-02-16 12:57:35 -05:00
kumquat-ir
9c2a3231c5 do not create nilmods folder
"it cant be that easy" - me, clueless

Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com>
2023-02-13 01:45:23 -05:00
kumquat-ir
c07fff7503 switch to qdcss for parsing
make it not horrible to look at

Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com>
2023-02-12 17:23:15 -05:00
kumquat-ir
7896dd19c1 nilmods instance page
mostly copied from the coremod page impl

Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com>
2023-02-11 17:46:17 -05:00
kumquat-ir
f5f2d33f93 parse nil metadata
Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com>
2023-02-11 17:46:17 -05:00
DioEgizio
d5d4f87236
Merge pull request #831 from PrismLauncher/renovate/cachix-install-nix-action-19.x 2023-02-11 16:47:30 +01:00
DioEgizio
5d49433326
Merge pull request #841 from RaptaG/patch-1 2023-02-11 08:45:42 +01:00
RaptaG
381d7413c8
Link license in the shield badge
So that no trash URL shows when hovering!

Signed-off-by: RaptaG <77157639+RaptaG@users.noreply.github.com>
2023-02-10 19:47:08 +02:00
Sefa Eyeoglu
a6ac832f8f
Merge pull request #839 from PrismLauncher/renovate/actions-cache-3.x
chore(deps): update actions/cache action to v3.2.5
2023-02-10 08:27:00 +01:00
renovate[bot]
104863846b
chore(deps): update actions/cache action to v3.2.5 2023-02-10 06:24:45 +00:00
Sefa Eyeoglu
5883c30b84
Merge pull request #834 from pandaninjas/patch-2 2023-02-09 09:29:13 +01:00
flow
cebaae76b4
Merge pull request #832 from ktheticdev/develop
Fix README COPR typo
2023-02-08 14:32:16 -08:00
PandaNinjas
d886d32bd8
Replace potentially ReDOSable regex
Signed-off-by: PandaNinjas <admin@malwarefight.gq>
2023-02-07 17:21:00 +00:00
ktheticdev
8440c2819b
Fix README.md typo
Signed-off-by: ktheticdev <64607352+ktheticdev@users.noreply.github.com>
2023-02-07 11:10:43 +04:00
renovate[bot]
8114d8778f
chore(deps): update cachix/install-nix-action action to v19 2023-02-06 15:31:42 +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
flow
74a875bdce
Merge pull request #803 from TheLastRar/msys2-ccache 2023-02-04 05:37:23 -08: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
c392db7e0d
Merge pull request #815 from Scrumplex/fix-funny 2023-02-03 18:44:07 +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
58d9ceda4b
Merge pull request #804 from flowln/improve_big_concurrent_task_test 2023-02-02 13:47:51 -08:00
flow
3781c64d41
Merge pull request #810 from flowln/error_on_bad_file_paths_as_we_should_catquake 2023-02-02 13:47:36 -08: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
TheLastRar
75683039c5 CI: Always update windows ccache
Also change name to avoid pulling the stale cache

Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
2023-02-01 20:13:26 +00:00
TheLastRar
1a609612f2 CI: Move mingw restore cache before setup ccache
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
2023-02-01 20:13:26 +00:00
TheLastRar
121a7a9e23 CI: Log ccache stats for msys2
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
2023-02-01 20:13:26 +00:00
flow
e593faf245
fix(tests): improve the reliability of the Task's stack test
This actually takes into account the amount of stuff put into the stack
in each iteration, and thus avoids having to change the stack size of
the thread, and using ad-hoc values for the other stuff. It also reduces
the time the test takes to run.

Signed-off-by: flow <flowlnlnln@gmail.com>
2023-02-01 16:58:33 -03:00
KosmX
ec5bb944b2
thread-safe logger
Signed-off-by: KosmX <kosmx.mc@gmail.com>
2023-02-01 14:59:11 +01:00
flow
deed49574a
Merge pull request #798 from PrismLauncher/renovate/actions-cache-3.x 2023-01-30 07:02:51 -08:00
renovate[bot]
7cc39cd357
chore(deps): update actions/cache action to v3.2.4 2023-01-30 13:29:47 +00:00
flow
a714d5966e
Merge pull request #795 from leo78913/mainwindow-fixes
closes https://github.com/PrismLauncher/PrismLauncher/issues/792
2023-01-29 10:35:26 -08: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
f705cf09bc
Merge pull request #787 from flowln/make_shared_ptrs_explicit 2023-01-26 10:15:28 -08: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
flow
9b7c8ea22d
Merge pull request #779 from TheLastRar/zlib-undo-rename 2023-01-25 11:53:51 -08:00