初夏同学
|
b3a09fca1e
|
fix the failure in test by using LAUNCHER_TEST
Signed-off-by: wohaopa <2411829240@qq.com>
|
2023-10-17 19:28:45 +08:00 |
|
初夏同学
|
90599e8f73
|
add overwrite of some mojang urls
Signed-off-by: wohaopa <2411829240@qq.com>
|
2023-10-16 23:49:02 +08:00 |
|
初夏同学
|
e6cc3f1af1
|
move fmllib and i18n into CmakeLists.txt
Signed-off-by: wohaopa <2411829240@qq.com>
|
2023-10-16 22:13:50 +08:00 |
|
Alexandru Ionut Tripon
|
0927035a26
|
Merge pull request #1549 from Trial97/atlauncher_browser
added suport for atlauncher browser download
|
2023-10-16 06:39:12 +01:00 |
|
Tayou
|
5985d8b118
|
Merge pull request #1383 from TheKodeToad/rename-groups
Rename groups
|
2023-10-15 23:38:27 +02:00 |
|
TheKodeToad
|
c4882e7162
|
Merge pull request #443 from TheKodeToad/skinfix
Add legacy skin fix
|
2023-10-15 21:46:29 +01:00 |
|
Trial97
|
9d15255e0a
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into atlauncher_browser
|
2023-10-15 20:52:38 +03:00 |
|
TheKodeToad
|
6fb7a98901
|
Fix small mistake 😭
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-10-15 14:45:05 +01:00 |
|
Tayou
|
9705e6325a
|
Merge pull request #1673 from Trial97/win_attr
fix folder attributes on windows copy
|
2023-10-15 15:15:36 +02:00 |
|
TheKodeToad
|
7112d04df5
|
Mark setting as optional
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-10-15 14:11:08 +01:00 |
|
Alexandru Ionut Tripon
|
2ab48a43dd
|
Merge pull request #1706 from Trial97/develop
removed the better release for modrinth modpacks
|
2023-10-15 12:24:20 +01:00 |
|
Alexandru Ionut Tripon
|
682134435d
|
Merge pull request #1684 from Trial97/remove_legacy
removed windows legacy builds
|
2023-10-15 12:22:35 +01:00 |
|
Alexandru Ionut Tripon
|
05d7cc31bf
|
Merge pull request #1709 from Trial97/arch_build
Fix compatibility with Qt 6.6
|
2023-10-15 12:19:47 +01:00 |
|
Sefa Eyeoglu
|
c498ad1787
|
Merge pull request #1711 from PrismLauncher/update_flake_lock_action
chore(nix): update lockfile
|
2023-10-15 08:55:36 +02:00 |
|
github-actions[bot]
|
4939a33456
|
chore(nix): update lockfile
Flake lock file updates:
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/2de1be5b51c3d6fa833f1c1f222dc867dd054b31' (2023-10-07)
→ 'github:nixos/nixpkgs/01441e14af5e29c9d27ace398e6dd0b293e25a54' (2023-10-11)
• Updated input 'pre-commit-hooks':
'github:cachix/pre-commit-hooks.nix/66c352d33e0907239e4a69416334f64af2c685cc' (2023-10-05)
→ 'github:cachix/pre-commit-hooks.nix/42e1b6095ef80a51f79595d9951eb38e91c4e6ca' (2023-10-09)
|
2023-10-15 00:18:39 +00:00 |
|
Trial97
|
023b3e3c39
|
Fixed arch build
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-10-14 09:41:04 +03:00 |
|
Tayou
|
7015b8f7b2
|
Merge pull request #1563 from Trial97/modrinth_pack
Pack import fixes and improvements
|
2023-10-13 16:38:37 +02:00 |
|
Trial97
|
32eaaa25d9
|
removed the better release for modrinth modpacks
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-10-13 00:04:36 +03:00 |
|
Alexandru Ionut Tripon
|
ca4b58d5d7
|
Merge pull request #1405 from Trial97/update_file
Allow updating managed packs from local file
|
2023-10-10 16:17:08 +01:00 |
|
Alexandru Ionut Tripon
|
4eb8db16f1
|
Merge pull request #1543 from Trial97/packwiz
refactor packwiz file write
|
2023-10-10 16:16:57 +01:00 |
|
Alexandru Ionut Tripon
|
a7842ecc33
|
Merge pull request #1591 from Trial97/ftb_import_fix
fix: make cached instead of file for ftb pack import
|
2023-10-10 16:16:40 +01:00 |
|
Alexandru Ionut Tripon
|
6150908025
|
Merge pull request #1658 from Trial97/neoforge_version
Added version check for neoforge filter
|
2023-10-10 16:16:21 +01:00 |
|
Sefa Eyeoglu
|
11a0241b5c
|
Merge pull request #1699 from GitMuslim/develop
|
2023-10-09 17:25:11 +02:00 |
|
Muslim
|
8eb8f167ab
|
oops
Signed-off-by: Muslim <42213155+GitMuslim@users.noreply.github.com>
|
2023-10-09 18:02:56 +03:00 |
|
Muslim
|
5f5214e5dd
|
add fullstop
Signed-off-by: Muslim <42213155+GitMuslim@users.noreply.github.com>
|
2023-10-09 17:00:57 +03:00 |
|
Sefa Eyeoglu
|
04a7275280
|
Merge pull request #1695 from PrismLauncher/update_flake_lock_action
chore(nix): update lockfile
|
2023-10-08 09:31:17 +02:00 |
|
github-actions[bot]
|
05caa874bc
|
chore(nix): update lockfile
Flake lock file updates:
• Updated input 'flake-compat':
'github:edolstra/flake-compat/35bb57c0c8d8b62bbfd284272c928ceb64ddbde9' (2023-01-17)
→ 'github:edolstra/flake-compat/0f9255e01c2351cc7d116c072cb317785dd33b33' (2023-10-04)
• Updated input 'flake-parts':
'github:hercules-ci/flake-parts/7f53fdb7bdc5bb237da7fefef12d099e4fd611ca' (2023-09-01)
→ 'github:hercules-ci/flake-parts/c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4' (2023-10-03)
• Updated input 'flake-parts/nixpkgs-lib':
'github:NixOS/nixpkgs/3e52e76b70d5508f3cec70b882a29199f4d1ee85?dir=lib' (2023-08-31)
→ 'github:NixOS/nixpkgs/f5892ddac112a1e9b3612c39af1b72987ee5783a?dir=lib' (2023-09-29)
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/bd9b686c0168041aea600222be0805a0de6e6ab8' (2023-09-29)
→ 'github:nixos/nixpkgs/2de1be5b51c3d6fa833f1c1f222dc867dd054b31' (2023-10-07)
• Updated input 'pre-commit-hooks':
'github:cachix/pre-commit-hooks.nix/cb770e93516a1609652fa8e945a0f310e98f10c0' (2023-09-24)
→ 'github:cachix/pre-commit-hooks.nix/66c352d33e0907239e4a69416334f64af2c685cc' (2023-10-05)
|
2023-10-08 00:18:30 +00:00 |
|
Alexandru Ionut Tripon
|
bca5e8f395
|
Update launcher/minecraft/PackProfile.cpp
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
|
2023-10-06 16:16:03 +03:00 |
|
TheKodeToad
|
d49f81d132
|
Drop leftover mod loader settings
I messed up the merge.
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-10-06 11:27:04 +01:00 |
|
Trial97
|
b67c2c71d1
|
removed windows legacy builds
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-10-05 22:44:49 +03:00 |
|
Sefa Eyeoglu
|
a7bdfb5f6b
|
Merge pull request #1682 from romangraef/addmorejavas
Add more Java installation dirs
|
2023-10-05 00:44:16 +02:00 |
|
nea
|
c6c17036e3
|
Add more Java installation dirs
Signed-off-by: nea <nea@nea.moe>
|
2023-10-04 21:20:59 +02:00 |
|
Trial97
|
e913f61305
|
added a more strict condition for neoforge forge support
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-10-04 19:29:37 +03:00 |
|
Trial97
|
c78d4e7bb6
|
added version test for snapshot
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-10-04 19:16:21 +03:00 |
|
Tayou
|
024c474658
|
Merge pull request #1678 from Trial97/release_order
fixed quilt dependencies
|
2023-10-04 10:28:45 +02:00 |
|
Sefa Eyeoglu
|
03ad430699
|
Merge pull request #1537 from Trial97/warnings
|
2023-10-04 09:40:38 +02:00 |
|
Trial97
|
ac38585a2a
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into release_order
|
2023-10-04 09:41:49 +03:00 |
|
Trial97
|
3cba5adb5a
|
updated dependency cycle
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-10-04 09:41:40 +03:00 |
|
Sefa Eyeoglu
|
d186c34385
|
Merge pull request #1676 from Trial97/release_order
revert back the release order
|
2023-10-04 07:43:21 +02:00 |
|
Trial97
|
77979b4c95
|
revert back the release order
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-10-03 17:23:26 +03:00 |
|
Trial97
|
8069de29b2
|
fix folder attributes on windows copy
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-10-02 21:53:08 +03:00 |
|
Tayou
|
540fc7d2a8
|
Merge pull request #1670 from Trial97/seg_fault
Don't update mods if no mod loader is installed
|
2023-10-02 17:05:07 +02:00 |
|
Sefa Eyeoglu
|
d612ab94a7
|
Merge pull request #1672 from Trial97/skin_refresh
refresh default account when list changes
|
2023-10-02 16:06:12 +02:00 |
|
Sefa Eyeoglu
|
bfa9613373
|
Merge pull request #1657 from Trial97/shader_txt
|
2023-10-02 11:56:50 +02:00 |
|
Trial97
|
93be8b0735
|
refresh default account when list changes
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-10-02 09:13:02 +03:00 |
|
Trial97
|
2cea7454ef
|
fix: do not update mods if no mod loader is selected
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-10-01 23:04:19 +03:00 |
|
Sefa Eyeoglu
|
eab1180f68
|
Merge pull request #1090 from Ryex/feat/acknowledge_release_type
|
2023-10-01 14:32:58 +02:00 |
|
Sefa Eyeoglu
|
e3a147f56d
|
Merge pull request #1656 from Trial97/remove_mojang2
|
2023-10-01 14:32:42 +02:00 |
|
Sefa Eyeoglu
|
898a719d3e
|
Merge pull request #1668 from PrismLauncher/update_flake_lock_action
chore(nix): update lockfile
|
2023-10-01 09:28:57 +02:00 |
|
github-actions[bot]
|
be8a9f6541
|
chore(nix): update lockfile
Flake lock file updates:
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/e12483116b3b51a185a33a272bf351e357ba9a99' (2023-09-21)
→ 'github:nixos/nixpkgs/bd9b686c0168041aea600222be0805a0de6e6ab8' (2023-09-29)
• Updated input 'pre-commit-hooks':
'github:cachix/pre-commit-hooks.nix/4f883a76282bc28eb952570afc3d8a1bf6f481d7' (2023-09-10)
→ 'github:cachix/pre-commit-hooks.nix/cb770e93516a1609652fa8e945a0f310e98f10c0' (2023-09-24)
|
2023-10-01 00:19:50 +00:00 |
|