7756 Commits

Author SHA1 Message Date
Sefa Eyeoglu
23a38b19f2
Merge pull request #2351 from PrismLauncher/update_flake_lock_action
chore(nix): update lockfile
2024-04-28 10:42:34 +02:00
github-actions[bot]
890fd0b09c chore(nix): update lockfile
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/fd16bb6d3bcca96039b11aa52038fafeb6e4f4be' (2024-04-20)
  → 'github:nixos/nixpkgs/d6f6eb2a984f2ba9a366c31e4d36d65465683450' (2024-04-27)
• Updated input 'pre-commit-hooks':
    'github:cachix/pre-commit-hooks.nix/40e6053ecb65fcbf12863338a6dcefb3f55f1bf8' (2024-04-12)
  → 'github:cachix/pre-commit-hooks.nix/6fb82e44254d6a0ece014ec423cb62d92435336f' (2024-04-24)
2024-04-28 00:20:12 +00:00
Alexandru Ionut Tripon
c14e6a67a8
Merge pull request #2349 from PrismLauncher/renovate/hendrikmuhs-ccache-action-1.x
chore(deps): update hendrikmuhs/ccache-action action to v1.2.13
2024-04-27 13:11:07 +03:00
DioEgizio
ccf0b01de7 chore!: make install_bundle work on linux, removed prebuilt tarballs
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
2024-04-27 11:06:08 +02:00
renovate[bot]
46b291d02e
chore(deps): update hendrikmuhs/ccache-action action to v1.2.13 2024-04-27 07:16:54 +00:00
TheKodeToad
e3f55f6865
Use proxy style to force ActivateItemOnSingleClick off
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-04-26 22:08:45 +01:00
Alexandru Ionut Tripon
3c9a207192
Update launcher/ui/widgets/VariableSizedImageObject.cpp
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
2024-04-26 22:04:50 +03:00
Jan200101
a30c7193a2
remove server side decorations FIXME and document why its needed
Signed-off-by: Jan200101 <sentrycraft123@gmail.com>
2024-04-25 17:00:03 +02:00
Trial97
c902da4461
Fix image width in project description
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-04-24 22:02:55 +03:00
Sefa Eyeoglu
e777201187
Merge pull request #2337 from Trial97/java_path 2024-04-24 17:46:08 +02:00
Trial97
5ae98f4f90
Fixed windows bundled java path
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-04-24 15:49:05 +03:00
TheKodeToad
f6f0f3b08d
Merge pull request #2333 from Trial97/fix_bundled_java_mac
Fix Minecraft Launcher runtime detection on Windows and macOS
2024-04-23 17:19:37 +01:00
Trial97
10d1720da5
Removed duplicate local
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-04-23 19:08:14 +03:00
Trial97
73c3794c1b
Changed env variable
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-04-23 19:03:19 +03:00
Trial97
dac7027846
Fixed windows appdata path
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-04-23 18:59:31 +03:00
Trial97
dbfd535b38
Fix bundled java detection on mac
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-04-23 08:52:17 +03:00
Tayou
5eeb3b7768
Merge pull request #2328 from Trial97/appimage
Removed java from appimage
2024-04-22 22:51:57 +02:00
Tayou
8e8877cf8c
Merge pull request #2327 from wagyourtail/patch-1
Add Gradle Toolchains to java scan list
2024-04-21 19:45:02 +02:00
Trial97
1c8d333bfd
Fixed build
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-04-21 15:07:10 +03:00
Trial97
a96f957b02
Removed java from appimage
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-04-21 14:48:27 +03:00
William Gray
9f4654ede9
Update JavaUtils.cpp
Signed-off-by: William Gray <ruwagray@gmail.com>
2024-04-21 03:35:27 -05:00
Sefa Eyeoglu
de5de6f88f
Merge pull request #2325 from PrismLauncher/update_flake_lock_action
chore(nix): update lockfile
2024-04-21 09:49:14 +02:00
github-actions[bot]
210841606c chore(nix): update lockfile
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/a0c9e3aee1000ac2bfb0e5b98c94c946a5d180a9' (2024-04-12)
  → 'github:nixos/nixpkgs/fd16bb6d3bcca96039b11aa52038fafeb6e4f4be' (2024-04-20)
2024-04-21 00:19:37 +00:00
Sefa Eyeoglu
d185f6b856
Merge pull request #2319 from TheKodeToad/neoforge-mods-toml
Support mod info for NeoForge 20.5
2024-04-20 09:49:47 +02:00
TheKodeToad
252406ba3e
Support neoforge.mods.toml
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-04-19 21:19:36 +01:00
Alexandru Ionut Tripon
a8a234b666
Merge pull request #2294 from Trial97/import_crash
Fixed application close on open file dialog
2024-04-19 00:12:47 +03:00
Alexandru Ionut Tripon
0cae155380
Merge pull request #2304 from Trial97/modrint_import
Fixed modrinth pack update
2024-04-18 23:42:07 +03:00
DylanJOrr
77aead6470 Rename object name "userInterfaceTab" from "generalTab"
The "User Interface" tab was innacurately named "General" which I just
went in and fixed.

This also renamed the object for respective vertical spacers.

Signed-off-by: SolidStateDj <solidstatedj@proton.me>
2024-04-16 16:01:34 -04:00
seth
ef230b7ae4
Merge pull request #2305 from PrismLauncher/update_flake_lock_action
chore(nix): update lockfile
2024-04-15 18:24:42 +00:00
github-actions[bot]
cb8936ed68 chore(nix): update lockfile
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/9e7f26f82acb057498335362905fde6fea4ca50a' (2024-04-06)
  → 'github:nixos/nixpkgs/a0c9e3aee1000ac2bfb0e5b98c94c946a5d180a9' (2024-04-12)
• Updated input 'pre-commit-hooks':
    'github:cachix/pre-commit-hooks.nix/e35aed5fda3cc79f88ed7f1795021e559582093a' (2024-04-02)
  → 'github:cachix/pre-commit-hooks.nix/40e6053ecb65fcbf12863338a6dcefb3f55f1bf8' (2024-04-12)
2024-04-14 00:21:24 +00:00
Trial97
8121a6536b
Fixed pack update
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-04-12 23:45:31 +03:00
Trial97
9f48694eb2
Fixed application close on open file dialog
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-04-09 08:28:09 +03:00
Alexandru Ionut Tripon
1a994e8aed
Merge pull request #2291 from Trial97/import_crash
Fixed crash on invalid curseforge link on import
2024-04-09 00:19:55 +03:00
ColonelGerdauf
a877f9146d
Change of parameters
To help deal with adjustments

Signed-off-by: ColonelGerdauf <ColonelGerdauf@users.noreply.github.com>
2024-04-07 16:53:53 -04:00
ColonelGerdauf
f91f97e56d
Renaming and removing redundancies
old's do not make sense here

Signed-off-by: ColonelGerdauf <ColonelGerdauf@users.noreply.github.com>
2024-04-07 16:49:39 -04:00
Trial97
9cc58fe62c
Fixed crash on invalid curseforge link on import
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-04-07 21:25:08 +03:00
Sefa Eyeoglu
70f7e0878e
Merge pull request #2287 from PrismLauncher/update_flake_lock_action
chore(nix): update lockfile
2024-04-07 10:49:43 +02:00
github-actions[bot]
74fcfbae32 chore(nix): update lockfile
Flake lock file updates:

• Updated input 'flake-parts':
    'github:hercules-ci/flake-parts/f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2' (2024-03-01)
  → 'github:hercules-ci/flake-parts/9126214d0a59633752a136528f5f3b9aa8565b7d' (2024-04-01)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/807c549feabce7eddbf259dbdcec9e0600a0660d' (2024-03-29)
  → 'github:nixos/nixpkgs/9e7f26f82acb057498335362905fde6fea4ca50a' (2024-04-06)
• Updated input 'pre-commit-hooks':
    'github:cachix/pre-commit-hooks.nix/c11e43aed6f17336c25cd120eac886b96c455731' (2024-03-30)
  → 'github:cachix/pre-commit-hooks.nix/e35aed5fda3cc79f88ed7f1795021e559582093a' (2024-04-02)
2024-04-07 00:20:19 +00:00
timoreo
5bc415d512
Merge pull request #2225 from TheKodeToad/zip-utf8 2024-04-06 14:43:35 +02:00
Alexandru Ionut Tripon
a88cc2133c
Merge pull request #2277 from TheKodeToad/invalid-zip-files
Fix unicode characters being invalid in filenames
2024-04-06 15:41:51 +03:00
timoreo
9323dcb9dc
Merge pull request #2247 from Trial97/names 2024-04-06 14:35:06 +02:00
TheKodeToad
9986fe4c45
Fix unicode characters being invalid in filenames
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-04-06 13:33:13 +01:00
timoreo
363273a17b
Merge pull request #2275 from TheKodeToad/invalid-zip-files 2024-04-06 14:18:13 +02:00
TheKodeToad
8056a2fa46
Replace invalid characters when extracting ZIP
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-04-05 23:31:18 +01:00
Alexandru Ionut Tripon
44ea8cd885
Merge pull request #2268 from Scrumplex/fix/nix/jdk21
[Linux] Add jdk21 to Nix packages
2024-04-04 20:38:35 +03:00
TheKodeToad
df209c7b44
Merge pull request #2272 from DioEgizio/flatpakupdate
fix: update flatpak manifest for java 21
2024-04-04 17:38:07 +01:00
DioEgizio
e704fbbcec fix: update flatpak manifest for java 21
backport of https://github.com/flathub/org.prismlauncher.PrismLauncher/pull/54 for our CI builds

Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
2024-04-04 17:53:30 +02:00
Trial97
3ddcadcdd1
Moved getPathNameInLocal8bit inside FileSystem namespace
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-04-04 18:01:24 +03:00
Trial97
8ecab305ac
Moved the creation of natives folder in ExtractNatives task
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-04-04 13:49:27 +03:00
Sefa Eyeoglu
0d372d2fbf
fix(nix): add jdk21
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2024-04-03 21:04:26 +02:00