Mirrors/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2025-06-13 05:37:42 +02:00
Code Issues Packages Projects Releases Wiki Activity
7,972 Commits 11 Branches 38 Tags
b872f88617fa282f0b1a23e0a134225d360a000c
Commit Graph

7972 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
LocalSpook
5be80df1ee Replace typedef with using 
Signed-off-by: LocalSpook <56512186+LocalSpook@users.noreply.github.com>
 2023-10-24 01:36:27 -07:00
Trial97
6a19f2dae8 fixed icon import 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-24 11:19:19 +03:00
Trial97
694840937b Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_zip 2023-10-24 10:32:09 +03:00
Trial97
87f2f88d4c fix: java memory not set on initial setup 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-23 23:38:03 +03:00
Trial97
f7c9972db0 separated dependecy check from mod update 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-23 19:46:30 +03:00
Sefa Eyeoglu
b376888f43 Merge pull request #1515 from TheKodeToad/sysprops 2023-10-22 21:57:11 +02:00
Tayou
0fe3241df6 remove now unneeded Q_ASSERTs 
Signed-off-by: Tayou <git@tayou.org>
 2023-10-22 21:25:06 +02:00
Tayou
7d5206818b fix switch/case fallthrough 
Signed-off-by: Tayou <git@tayou.org>
 2023-10-22 21:25:00 +02:00
Sefa Eyeoglu
db19362a97 feat: add launcher brand and version props 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-10-22 21:19:44 +02:00
Trial97
2aeb829176 removed the concurent task destructor behaivior 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-22 19:58:10 +03:00
Trial97
0ca3873f1c small fix 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-22 17:48:19 +03:00
Trial97
a748f49362 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into concurrent 2023-10-22 11:34:55 +03:00
Trial97
932cd9e262 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-22 11:32:05 +03:00
Sefa Eyeoglu
cefb96e812 Merge pull request #1743 from PrismLauncher/update_flake_lock_action 
chore(nix): update lockfile
 2023-10-22 09:40:49 +02:00
github-actions[bot]
e7e80e704f chore(nix): update lockfile 
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/01441e14af5e29c9d27ace398e6dd0b293e25a54' (2023-10-11)
  → 'github:nixos/nixpkgs/44881e03af1c730cbb1d72a4d41274a2c957813a' (2023-10-21)
• Updated input 'pre-commit-hooks':
    'github:cachix/pre-commit-hooks.nix/42e1b6095ef80a51f79595d9951eb38e91c4e6ca' (2023-10-09)
  → 'github:cachix/pre-commit-hooks.nix/8cc349bfd082da8782b989cad2158c9ad5bd70fd' (2023-10-19)
 2023-10-22 00:18:23 +00:00
Alexandru Ionut Tripon
2c4af7e793 Merge pull request #1290 from Trial97/refactor/NetActions 
Refactor ImgurUpload
 2023-10-21 12:32:16 +01:00
Alexandru Ionut Tripon
f0fd1bd5e5 Merge pull request #1737 from Trial97/fix_ftb_app_import_icon 
Fixed FTBApp import icon
 2023-10-21 07:48:21 +01:00
Trial97
5d926582c7 added Image column size hint 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-20 19:08:56 +03:00
Trial97
7b62d14683 fixed squished mod icons 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-20 17:15:12 +03:00
Trial97
a9d7af9096 removed some unused stuff 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-20 16:44:37 +03:00
Trial97
80723eeca1 Fixed FTBApp import icon 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-20 16:41:32 +03:00
TheKodeToad
e9fd02baca Fix code style 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-10-20 13:12:16 +01:00
TheKodeToad
db4a7ce239 Fix code style 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-10-20 13:11:17 +01:00
Trial97
35a8ab2393 Removed processEvents 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-20 10:32:45 +03:00
Alexandru Ionut Tripon
7ad48d8677 Merge pull request #1692 from Trial97/msa_account 
Fix wrong account selection
 2023-10-19 20:09:28 +01:00
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
9400879242 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_zip 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-16 23:32:24 +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
Trial97
869f654a10 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-16 22:46:11 +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