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
8,443 Commits 11 Branches 38 Tags
f1ef243617d227b39e1e709d7aaa65cdedeb18f6
Commit Graph

896 Commits

Author SHA1 Message Date
Trial97
9aac8e389f made release type visible 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-21 18:48:55 +03:00
Alexandru Ionut Tripon
2c4af7e793 Merge pull request #1290 from Trial97/refactor/NetActions 
Refactor ImgurUpload
 2023-10-21 12:32:16 +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
TheKodeToad
e9fd02baca Fix code style 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-10-20 13:12:16 +01: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
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
Trial97
fea4c4eba8 Updated filters 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-18 09:00:45 +03: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
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
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
ca9b593483 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into refactor/NetActions 2023-10-15 20:44:45 +03: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
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
4eb8db16f1 Merge pull request #1543 from Trial97/packwiz 
refactor packwiz file write
 2023-10-10 16:16:57 +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
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
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
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
bfa9613373 Merge pull request #1657 from Trial97/shader_txt 2023-10-02 11:56:50 +02:00
cullvox
87f34f07d7 Merge branch 'develop' into components-resource-pack-fix 
Signed-off-by: cullvox <68567525+cadenmiller@users.noreply.github.com>
 2023-10-01 11:58:44 -04: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
Alexandru Ionut Tripon
317c7b5544 Update launcher/minecraft/auth/AccountList.cpp 
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2023-10-01 00:32:17 +03:00
Trial97
2e4fcd6aa3 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-09-28 23:26:15 +03:00
Trial97
4802f6950e Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feat/acknowledge_release_type 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-09-28 23:06:18 +03:00
Sefa Eyeoglu
531b58093e Merge pull request #1263 from Trial97/develop 2023-09-28 22:03:14 +02:00
Sefa Eyeoglu
2ff9ef0620 Merge pull request #1363 from Trial97/download_threads 2023-09-28 22:02:57 +02:00
Trial97
9acbf98f94 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feat/acknowledge_release_type 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-09-28 22:50:12 +03:00
seth
f370f0d749 chore: cleanup a few more mentions of mojang accounts 
Signed-off-by: seth <getchoo@tuta.io>
 2023-09-27 05:34:48 -04:00
Trial97
4ee6a6711d Added version check for neoforge filter 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-09-25 23:04:21 +03:00
Trial97
86b47b3421 Do not display invalid shaders 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-09-25 22:33:36 +03:00
Trial97
7c636d4608 Removed mojang 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-09-25 17:44:04 +03:00
alexia
1684cff7ac Update links to Minecraft Wiki 
Minecraft Wiki has officially moved from Fandom to their own wiki.
I updated some links I found in comments.

Signed-off-by: alexia <me@alexia.lol>
 2023-09-25 15:49:12 +02:00
Alexandru Ionut Tripon
81a3ba18bc Update launcher/minecraft/mod/tasks/GetModDependenciesTask.cpp 
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2023-09-20 18:45:23 +03:00
Trial97
0e41ceffc4 removed missed header 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-09-16 19:18:58 +03:00
Trial97
01e98a6ce8 simplify the raw json parsing 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>

Fixed Tests

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-09-16 19:12:09 +03:00
cullvox
e96d0b6caf DCO Remediation Commit for cullvox <cullvox@outlook.com> 
I, cullvox <cullvox@outlook.com>, hereby add my Signed-off-by to this commit: ee7016fa54

Signed-off-by: cullvox <cullvox@outlook.com>
 2023-09-13 14:31:04 -04:00
cullvox
e1dda6c005 DCO Remediation Commit for cullvox <cullvox@outlook.com> 
I, cullvox <cullvox@outlook.com>, hereby add my Signed-off-by to this commit: ddf0c28b1b

Signed-off-by: cullvox <cullvox@outlook.com>
 2023-09-12 21:50:33 -04:00
cullvox
ddf0c28b1b clang-format fixes 2023-09-12 21:45:29 -04:00
cullvox
a4e6530513 added tests, fixed issues with overriding/format 
In the documentation it states that child values can override the parent
values. Originally this code did not support that but now it does. Also
added in testing inspired by the previous tests.

Signed-off-by: cullvox <cullvox@outlook.com>
 2023-09-12 21:34:42 -04:00
cullvox
df88ccd419 clean up and add review suggestions, links open 
Signed-off-by: cullvox <cullvox@outlook.com>
 2023-09-11 15:49:01 -04:00
cullvox
b16085f66c attempt to fix clang-format and ubuntu build. 
Signed-off-by: cullvox <cullvox@outlook.com>
 2023-09-11 02:05:05 -04:00