flow
8b28ed67ae
Merge pull request #234 from AliceDTRH/fix/dedupejava
2022-10-22 13:14:26 -03:00
flow
9bb62e1bba
Merge pull request #233 from jamierocks/atl-fix-aborting-installs
2022-10-22 12:19:58 -03:00
AliceDTRH
b2789fef0f
Use correct variable for Windows
...
Signed-off-by: AliceDTRH <57547425+AliceDTRH@users.noreply.github.com>
2022-10-22 17:19:34 +02:00
AliceDTRH
1471eddc7e
Deduplicates java installs before passing it on
...
Signed-off-by: AliceDTRH <57547425+AliceDTRH@users.noreply.github.com>
2022-10-22 16:40:31 +02:00
Jamie Mansfield
0e17eee096
ATLauncher: Fix pack installation always aborting
...
I made a mistake during when cherry picking a previous commit, this
applies the change - and fixes installing ATLauncher packs.
2022-10-22 15:22:30 +01:00
flow
81f1305270
Merge pull request #215 from forkiesassds/develop
2022-10-22 10:48:00 -03:00
Sefa Eyeoglu
2ec4310104
Merge pull request #230 from Scrumplex/add-pr-template
2022-10-22 15:32:00 +02:00
Sefa Eyeoglu
24e4db676a
Merge pull request #224 from jamierocks/atl-abort-close-optional-mods-dialog
2022-10-22 15:31:53 +02:00
Sefa Eyeoglu
6e21a9829d
Merge pull request #225 from Scrumplex/fix-segfault-fileresolver
2022-10-22 15:31:46 +02:00
flow
4e99e10cbd
Merge pull request #218 from getchoo/change-jars-path
2022-10-22 10:18:58 -03:00
Sefa Eyeoglu
8b3093e758
chore: add PR template
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-10-22 14:59:57 +02:00
Sefa Eyeoglu
970e4b020e
fix: fix segfault when resolving Flame resources
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-10-22 14:11:51 +02:00
Jamie Mansfield
a4f4f2891c
DCO Remediation Commit for a6b13487
...
I, Jamie Mansfield <jmansfield@cadixdev.org>, hereby add my
Signed-off-by to this commit: a6b13487f0
2022-10-22 12:58:56 +01:00
Jamie Mansfield
a6b13487f0
ATLauncher: Abort install if optional mods dialog is closed
...
This matches the behaviour of ATLauncher.
2022-10-22 12:35:34 +01:00
Sefa Eyeoglu
54c26b05fa
Merge pull request #185 from flowln/fix_blocked_mods_crash
2022-10-22 12:44:20 +02:00
Sefa Eyeoglu
bd376d5217
Merge pull request #203 from Scrumplex/fix-dont-build-renove-branches
...
Don't build renovate branches
2022-10-22 10:59:49 +02:00
seth
2592c69021
semicolon fail
...
i was off by one key :(
Signed-off-by: seth <getchoo@tuta.io>
2022-10-21 21:40:21 -04:00
seth
4a2b25e841
fix: use correct variable for jars path
...
Signed-off-by: seth <getchoo@tuta.io>
2022-10-21 21:40:21 -04:00
seth
ba4af1a890
fix: make jars path specific to prism
...
Signed-off-by: seth <getchoo@tuta.io>
2022-10-21 21:40:20 -04:00
forkiesassds
9b17cde019
CurseForge modpack page improvements
...
Signed-off-by: forkiesassds <icanttellyou@memeware.net>
2022-10-22 01:20:08 +03:00
flow
7a8c963722
Merge pull request #147 from Minion3665/enhancement/update-nix-derivation
2022-10-21 19:04:35 -03:00
Sefa Eyeoglu
aefb8b353e
Merge pull request #187 from leo78913/menu-icons
2022-10-21 22:39:35 +02:00
leo78913
ccf7d1e0c4
material design icons
...
Signed-off-by: leo78913 <leo3758@riseup.net>
2022-10-21 14:04:04 -03:00
leo78913
e4b5cd23e6
the trashcan icons dont look like trash now
...
Signed-off-by: leo78913 <leo3758@riseup.net>
2022-10-21 13:49:31 -03:00
txtsd
819296cc9c
Merge pull request #198 from PrismLauncher/renovate/hendrikmuhs-ccache-action-1.x
2022-10-21 22:13:09 +05:30
txtsd
67c7d80f41
Merge pull request #197 from PrismLauncher/renovate/actions-cache-3.x
2022-10-21 22:12:48 +05:30
Sefa Eyeoglu
919f8c54d7
fix: don't build renovate branches
...
They will be built using the pull_requests event anyway.
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-10-21 17:42:39 +02:00
Sefa Eyeoglu
cbaf71f581
Merge pull request #201 from Scrumplex/add-netlify-sponsor
2022-10-21 17:37:18 +02:00
Sefa Eyeoglu
f118c602e6
Merge pull request #202 from Heath123/patch-1
2022-10-21 17:37:09 +02:00
circuit10
ff2f40f5e1
Fix typo
...
Signed-off-by: circuit10 <heath.mitchell27@gmail.com>
2022-10-21 16:28:04 +01:00
Sefa Eyeoglu
9758c9b2a2
chore: add Netlify as sponsor
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-10-21 17:04:21 +02:00
renovate[bot]
09e4e100a2
chore(deps): update hendrikmuhs/ccache-action action to v1.2.3
2022-10-21 14:55:49 +00:00
renovate[bot]
bdd5c180d3
chore(deps): update actions/cache action to v3.0.11
2022-10-21 14:55:42 +00:00
DioEgizio
749b085063
Merge pull request #196 from PrismLauncher/renovate/configure
2022-10-21 16:55:17 +02:00
renovate[bot]
c5a796ad8e
chore(deps): add renovate.json
2022-10-21 14:43:02 +00:00
Sefa Eyeoglu
12d8409e65
Merge pull request #39 from Sebbl0508/mod_dialog_fontsize
2022-10-21 15:25:28 +02:00
leo78913
8db89b4cfb
Merge branch 'PrismLauncher:develop' into menu-icons
2022-10-20 17:54:43 -03:00
leo78913
31dc92dafe
add icons to the instance menu and 4 new icons:
...
delete
rename
tag
export
Signed-off-by: leo78913 <leo3758@riseup.net>
2022-10-20 17:48:57 -03:00
flow
01b90809e8
fix: memory leak when finishing blocked mods job
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-10-20 16:55:22 -03:00
flow
0a7383a4e1
fix: hide ProgressDialog when failing/succeeding tasks
...
WHY IS QT LIKE THAT AAAAAAAA
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-10-20 16:54:39 -03:00
Sefa Eyeoglu
5e86a34925
Merge pull request #184 from Chrono-byte/develop
2022-10-20 21:52:24 +02:00
Chrono-byte
ece206b81c
Remove erroneous space
...
Signed-off-by: Chrono-byte <me@disilla.org>
2022-10-20 15:22:04 -04:00
Chrono-byte
88341b923a
fix contributor notices in AboutDialog.cpp for license compliance
...
Signed-off-by: Chrono-byte <me@disilla.org>
2022-10-20 15:14:26 -04:00
flow
5d27633821
fix: show a single line in ProjectItem's desc. when there's no more space
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-10-20 15:03:46 -03:00
DioEgizio
a9d4370ad4
Merge pull request #47 from TheOPtimal/develop
2022-10-20 10:01:46 +02:00
Sefa Eyeoglu
8a0318c779
Merge pull request #119 from Scrumplex/update-readme-sponsors
2022-10-20 09:59:00 +02:00
Sefa Eyeoglu
8e754d9a56
fix: update README
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-10-20 09:54:23 +02:00
Sefa Eyeoglu
0e209dcb02
Merge pull request #148 from ZombieNub/prismlauncher-rename
2022-10-20 09:44:25 +02:00
Zeke
6f2d6425a2
update meta to not break flatpak
...
Signed-off-by: Zeke <ezekielsmith@protonmail.com>
2022-10-20 16:54:57 +10:00
Sebastian Rueth
b46c4a81e0
check space requirements of project description
...
if there isn't enough space for 2 lines of project description, only
draw one
Signed-off-by: Sebastian Rueth <sebastian.rueth@protonmail.com>
2022-10-20 08:02:05 +02:00
