9bb62e1bba
Merge pull request #233 from jamierocks/atl-fix-aborting-installs
2022-10-22 12:19:58 -03:00
b2789fef0f
Use correct variable for Windows
...
Signed-off-by: AliceDTRH <57547425+AliceDTRH@users.noreply.github.com >
2022-10-22 17:19:34 +02:00
46fe7e77b3
DCO Remediation Commit for he3als <65787561+he3als@users.noreply.github.com>
...
I, he3als <65787561+he3als@users.noreply.github.com >, hereby add my Signed-off-by to this commit: d87f743a2bd2fac761b94de77ed7255d7a983f03
I, he3als <65787561+he3als@users.noreply.github.com >, hereby add my Signed-off-by to this commit: 92dfd659f1a3e11accdbf0ebbdc7cb91f74d9a21
I, he3als <65787561+he3als@users.noreply.github.com >, hereby add my Signed-off-by to this commit: a6e65dfc7a7e8080297b59ecf322b788d1c9bad2
I, he3als <65787561+he3als@users.noreply.github.com >, hereby add my Signed-off-by to this commit: 99e1c13e80d12764f57a993661656d9ed7de27bb
Signed-off-by: he3als <65787561+he3als@users.noreply.github.com >
2022-10-22 16:14:50 +01:00
99e1c13e80
fix: add flat_white to code
2022-10-22 15:50:06 +01:00
a6e65dfc7a
Add new flat white icons
2022-10-22 15:40:39 +01:00
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
89fd84d916
Merge branch 'PrismLauncher:develop' into develop
2022-10-22 15:30:40 +01:00
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
81f1305270
Merge pull request #215 from forkiesassds/develop
2022-10-22 10:48:00 -03:00
2ec4310104
Merge pull request #230 from Scrumplex/add-pr-template
2022-10-22 15:32:00 +02:00
24e4db676a
Merge pull request #224 from jamierocks/atl-abort-close-optional-mods-dialog
2022-10-22 15:31:53 +02:00
6e21a9829d
Merge pull request #225 from Scrumplex/fix-segfault-fileresolver
2022-10-22 15:31:46 +02:00
4e99e10cbd
Merge pull request #218 from getchoo/change-jars-path
2022-10-22 10:18:58 -03:00
500a7eceab
update macOS build process to work with new .app
...
Signed-off-by: Tobias Möritz <tobias@moeritz.cc >
2022-10-22 15:10:32 +02:00
1dad35ca76
update macos plist contents ( fixes #132 )
...
Signed-off-by: Tobias Möritz <tobias@moeritz.cc >
2022-10-22 15:00:52 +02:00
8b3093e758
chore: add PR template
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-10-22 14:59:57 +02:00
a406aeb3ea
feat: register as zip/mrpack handler on macOS
...
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com >
2022-10-22 20:51:46 +08:00
970e4b020e
fix: fix segfault when resolving Flame resources
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-10-22 14:11:51 +02:00
a4f4f2891c
DCO Remediation Commit for a6b13487
...
I, Jamie Mansfield <jmansfield@cadixdev.org >, hereby add my
Signed-off-by to this commit: a6b13487f0e27c8bea1917720a0c5c1eb1eb206c
Signed-off-by: Jamie Mansfield <jmansfield@cadixdev.org >
2022-10-22 12:58:56 +01:00
a6b13487f0
ATLauncher: Abort install if optional mods dialog is closed
...
This matches the behaviour of ATLauncher.
2022-10-22 12:35:34 +01:00
56ae4e5b6a
Change old style cast to C++ cast
...
Change old style cast to C++ cast
Signed-off-by: Bensuperpc <bensuperpc@gmail.com >
2022-10-22 13:04:48 +02:00
54c26b05fa
Merge pull request #185 from flowln/fix_blocked_mods_crash
2022-10-22 12:44:20 +02:00
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
2592c69021
semicolon fail
...
i was off by one key :(
Signed-off-by: seth <getchoo@tuta.io >
2022-10-21 21:40:21 -04:00
4a2b25e841
fix: use correct variable for jars path
...
Signed-off-by: seth <getchoo@tuta.io >
2022-10-21 21:40:21 -04:00
ba4af1a890
fix: make jars path specific to prism
...
Signed-off-by: seth <getchoo@tuta.io >
2022-10-21 21:40:20 -04:00
9b17cde019
CurseForge modpack page improvements
...
Signed-off-by: forkiesassds <icanttellyou@memeware.net >
2022-10-22 01:20:08 +03:00
7a8c963722
Merge pull request #147 from Minion3665/enhancement/update-nix-derivation
2022-10-21 19:04:35 -03:00
82d1dbf173
DCO Remediation Commit for Hibi <69405847+Hibiii@users.noreply.github.com>
...
I, Hibi <69405847+Hibiii@users.noreply.github.com >, hereby add my Signed-off-by to this commit: 1288b926153c86b7966727e60de4af8e7dcb4031
I, Hibi <69405847+Hibiii@users.noreply.github.com >, hereby add my Signed-off-by to this commit: 5b75869c0ba60e00147d723d5633c9f6a5d6304e
Signed-off-by: Hibi <69405847+Hibiii@users.noreply.github.com >
2022-10-21 17:59:35 -03:00
aefb8b353e
Merge pull request #187 from leo78913/menu-icons
2022-10-21 22:39:35 +02:00
5b75869c0b
Add --show to manual page
2022-10-21 16:10:03 -03:00
1288b92615
Add argument to show instance window
2022-10-21 15:40:28 -03:00
7eecf454e8
fix: remove max height logic for mod update changelogs
...
It's not worth it to keep this, it's just a heuristic that fails from
time to time.
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-10-21 14:07:43 -03:00
ccf7d1e0c4
material design icons
...
Signed-off-by: leo78913 <leo3758@riseup.net >
2022-10-21 14:04:04 -03:00
e4b5cd23e6
the trashcan icons dont look like trash now
...
Signed-off-by: leo78913 <leo3758@riseup.net >
2022-10-21 13:49:31 -03:00
819296cc9c
Merge pull request #198 from PrismLauncher/renovate/hendrikmuhs-ccache-action-1.x
2022-10-21 22:13:09 +05:30
67c7d80f41
Merge pull request #197 from PrismLauncher/renovate/actions-cache-3.x
2022-10-21 22:12:48 +05:30
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
cbaf71f581
Merge pull request #201 from Scrumplex/add-netlify-sponsor
2022-10-21 17:37:18 +02:00
f118c602e6
Merge pull request #202 from Heath123/patch-1
2022-10-21 17:37:09 +02:00
ff2f40f5e1
Fix typo
...
Signed-off-by: circuit10 <heath.mitchell27@gmail.com >
2022-10-21 16:28:04 +01:00
9758c9b2a2
chore: add Netlify as sponsor
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-10-21 17:04:21 +02:00
09e4e100a2
chore(deps): update hendrikmuhs/ccache-action action to v1.2.3
2022-10-21 14:55:49 +00:00
bdd5c180d3
chore(deps): update actions/cache action to v3.0.11
2022-10-21 14:55:42 +00:00
749b085063
Merge pull request #196 from PrismLauncher/renovate/configure
2022-10-21 16:55:17 +02:00
c5a796ad8e
chore(deps): add renovate.json
2022-10-21 14:43:02 +00:00
12d8409e65
Merge pull request #39 from Sebbl0508/mod_dialog_fontsize
2022-10-21 15:25:28 +02:00
8db89b4cfb
Merge branch 'PrismLauncher:develop' into menu-icons
2022-10-20 17:54:43 -03:00
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
01b90809e8
fix: memory leak when finishing blocked mods job
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-10-20 16:55:22 -03:00
