fede/prismlauncher-crack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,639 Commits 1 Branch 0 Tags
08f5148a9a4e574dd3ef4e7dc1e46a05ffd9dd5e
Commit Graph

4048 Commits

Author SHA1 Message Date
Sefa Eyeoglu 2081fcd3f5 Merge pull request #1722 from Scrumplex/fix/readonly-themes 2023-10-18 09:25:48 +02:00
Trial97 165d218300 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into contrib 2023-10-18 09:07:36 +03:00
Trial97 fea4c4eba8 Updated filters 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-18 09:00:45 +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
Trial97 b54376062e Added mcVersion column 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-17 19:25:01 +03:00
Trial97 9001d9eb75 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters 2023-10-17 18:32:18 +03: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 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
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
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 0ff98c5876 allways enable dependencies 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-15 21:22:59 +03:00
Trial97 fe14e48d72 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into disablemods 2023-10-15 21:06:40 +03: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 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
Trial97 749975e8ef made side and loaders visible to user 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-15 12:46:23 +03:00
Trial97 ab725eeb18 corected side and added loaders 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-15 11:52:28 +03: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
Trial97 5d56ac7cf2 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_zip 2023-10-10 21:15:31 +03:00
Trial97 5f7513d61c Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into disablemods 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-10 19:49:40 +03:00
Trial97 0b6373e4df Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-10 19:46:27 +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
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
Trial97 8dd640819d removed processEvents from ConcurrentTask 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-09 01:50:14 +03:00
Trial97 47dbb09115 Improvements to concurrent task 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-07 00:21:40 +03:00
Trial97 dc74ea7382 fixed wrong account selection 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-06 19:27:26 +03:00
Trial97 8d0a53273f Add no_color env variable 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-06 18:42:54 +03: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 82461b1113 rename for windows 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-06 08:51:45 +03:00
Trial97 4f1ee85424 check for minecraft java runtime 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-06 00:21:37 +03:00