Tayou
|
9a0cfbc648
|
Merge pull request #1733 from Dnyanu76/patch-1
Remove typo
|
2023-10-19 21:07:51 +02:00 |
|
Indrale Dnyaneshwar
|
1f2483c39e
|
Remove typo
Signed-off-by: Indrale Dnyaneshwar <118615488+Dnyanu76@users.noreply.github.com>
|
2023-10-20 00:31:47 +05:30 |
|
Trial97
|
1ac9757a86
|
Added back the processEvents
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-10-19 21:51:51 +03:00 |
|
Tayou
|
b9c1dc7325
|
Merge pull request #1374 from Trial97/welcome_background
Added welcome screen
|
2023-10-19 20:42:47 +02:00 |
|
Trial97
|
03a27d5b5a
|
Updated Managed Packs
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-10-19 19:47:48 +03:00 |
|
TheKodeToad
|
cf33927f21
|
Merge remote-tracking branch 'upstream/develop' into sysprops
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-10-19 11:28:07 +01:00 |
|
Trial97
|
8d4f508cc6
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into concurrent
|
2023-10-18 18:08:48 +03:00 |
|
Trial97
|
30f73a0696
|
Merge branch 'fail_concurrent_task' of github.com:Trial97/PrismLauncher into concurrent
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-10-18 18:08:31 +03:00 |
|
TheKodeToad
|
c638a63a03
|
Merge pull request #1726 from Trial97/contrib
Added Trial97 as maintainer in about dialog
|
2023-10-18 09:34:12 +01:00 |
|
Sefa Eyeoglu
|
2081fcd3f5
|
Merge pull request #1722 from Scrumplex/fix/readonly-themes
|
2023-10-18 09:25:48 +02:00 |
|
Sefa Eyeoglu
|
90ebbd8e91
|
Merge pull request #1724 from getchoo/no-default-updater
|
2023-10-18 09:17:58 +02:00 |
|
Trial97
|
165d218300
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into contrib
|
2023-10-18 09:07:36 +03:00 |
|
seth
|
069bc887f1
|
fix: don't always build updater on platforms besides mac
Signed-off-by: seth <getchoo@tuta.io>
|
2023-10-17 19:12:00 -04:00 |
|
Alexandru Ionut Tripon
|
5aa2b88861
|
Merge pull request #1721 from Trial97/develop
fixed code signing for appImage
|
2023-10-17 10:20:44 +01:00 |
|
Sefa Eyeoglu
|
d348f20dd9
|
fix: allow loading themes with missing resources folder
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-10-17 10:00:17 +02:00 |
|
Trial97
|
b1bd0ceade
|
fixed code signing for appImage
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-10-17 09:29:47 +03:00 |
|
Trial97
|
cc66350286
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into concurrent
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-10-16 23:42:19 +03:00 |
|
Trial97
|
b6f48f6fe0
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into netjob_retry
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-10-16 23:13:53 +03:00 |
|
Alexandru Ionut Tripon
|
8f2f99801e
|
Merge pull request #1717 from DioEgizio/update-qt660
chore: bump Qt to Qt 6.6.0
|
2023-10-16 18:59:29 +01:00 |
|
Tayou
|
aae65e3e4e
|
Merge branch 'develop' into update-qt660
Signed-off-by: Tayou <git@tayou.org>
|
2023-10-16 19:57:05 +02:00 |
|
Tayou
|
436db23ffc
|
Merge pull request #1268 from Ryex/feat/launcher-updater
Feat: Windows (And portable linux / appimage) Auto Updater
|
2023-10-16 19:53:50 +02:00 |
|
DioEgizio
|
6c9856b9dc
|
chore: bump Qt to Qt 6.6.0
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
|
2023-10-16 15:42:16 +02: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
|
cc990c4f94
|
Merge branch 'develop' into env-vars
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-10-15 21:57:20 +01: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 |
|
Trial97
|
ca9b593483
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into refactor/NetActions
|
2023-10-15 20:44:45 +03:00 |
|
Trial97
|
ef0813754b
|
added explicit qt version for linux portable
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-10-15 20:23:46 +03:00 |
|
Trial97
|
6bbff310bc
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feat/launcher-updater
|
2023-10-15 17:42:39 +03:00 |
|
Trial97
|
52c94eb568
|
reset the setting if is under 0
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-10-15 16:47:23 +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 |
|
Trial97
|
b075711be0
|
ensured totalTimePlayed is allways greater than 0
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-10-15 16:03:14 +03: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 |
|
Hazel
|
e66c3b9419
|
Add game category to generated Linux shortcuts
Signed-off-by: Hazel <hazel@theopensource.company>
|
2023-10-11 23:19:14 +02: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 |
|
Trial97
|
5cb6d93136
|
fixed updater build
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-10-09 22:25:45 +03:00 |
|
Trial97
|
7e6a08548d
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feat/launcher-updater
|
2023-10-09 19:58:43 +03:00 |
|