Mirrors/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2025-06-11 12:47:47 +02:00
Code Issues Packages Projects Releases Wiki Activity
9,509 Commits 9 Branches 38 Tags
a6c93d66d407ea3cc595ba01d1b67e42b9f754d7
Commit Graph

1029 Commits

Author SHA1 Message Date
Trial97
f1d1c9e22c forget sort keys 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-15 11:06:20 +03:00
Trial97
a121bfbb15 add size back to texture view 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-15 10:43:21 +03:00
Trial97
98f8bc526d Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters 2024-06-15 10:21:53 +03:00
Trial97
8cdaf5d05f fix tests 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-14 23:27:27 +03:00
Trial97
cfdf4a9e1f Merge branch 'develop' of github.com:Trial97/PrismLauncher into feature/java-downloader 2024-06-14 22:50:20 +03:00
Trial97
1a84dc9bca no need for extra exist check 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-14 22:47:42 +03:00
Trial97
b872f88617 do not double rename 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-14 22:46:39 +03:00
Trial97
d2510b851b mark files as duplicate 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-14 22:45:15 +03:00
Trial97
2d51008304 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_duplicate_mod 2024-06-14 21:05:11 +03:00
Alexandru Ionut Tripon
3c4eed13a3 Merge pull request #1829 from Trial97/demo 
Fixed demo mode
 2024-06-14 18:41:02 +03:00
Trial97
9d16557328 simplify constructor 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-14 16:40:27 +03:00
Trial97
863ebe421c randomize server port 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-14 16:38:41 +03:00
Trial97
52490743b4 revert desktop file creation 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-14 14:16:23 +03:00
Trial97
164d31dcb1 fix win build take#2 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-14 13:09:22 +03:00
Trial97
3db4f4dc2b fix build 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-14 13:00:59 +03:00
Trial97
8db0b5f421 Register mime-type on the fly 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-14 12:48:37 +03:00
Trial97
712fbc3a4b reverse login layout 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-14 11:15:40 +03:00
Trial97
7fdc65eda8 add tooltip to url button 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-13 08:51:11 +03:00
Trial97
5f5296ef5e update ui once again 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-12 19:34:19 +03:00
Trial97
bbbe7c879e update callback 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-12 12:35:02 +03:00
Trial97
c4a65dd861 update login flow 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-12 00:34:39 +03:00
Alexandru Ionut Tripon
7d418a32e7 Merge pull request #2425 from Trial97/win_char 
improve invalid path name
 2024-06-10 12:11:21 +03:00
Trial97
2ffabbdc6d Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-10 10:00:52 +03:00
Trial97
11ae169087 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-10 09:34:48 +03:00
Trial97
6607c3bfa4 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into disablemods 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-10 09:04:09 +03:00
Trial97
3f0fa54fe8 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into retry_auth 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-10 09:03:04 +03:00
Alexandru Ionut Tripon
dc39698c48 Merge pull request #1609 from Trial97/skin_selector 
Skin management
 2024-06-10 08:43:37 +03:00
Trial97
29d32f0d9a Update size order for folders 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-10 00:18:21 +03:00
Trial97
242ddbb7e1 fix size column sorting 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-09 23:53:40 +03:00
Trial97
34e1a5e660 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into resource_size 2024-06-09 22:18:40 +03:00
Trial97
689b76885c Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector 2024-06-09 20:13:09 +03:00
Trial97
6a99312df5 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters 2024-06-09 19:57:16 +03:00
Trial97
ca369ac2b0 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-09 19:52:37 +03:00
Alexandru Ionut Tripon
55b6490530 Merge pull request #1617 from cullvox/components-resource-pack-fix 
added functionality for components in resource pack descriptions.
 2024-06-09 16:03:19 +03:00
Trial97
45463dcd75 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_zip 2024-06-04 11:04:02 +03:00
Trial97
a7a1b28765 improve invalid path name 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-30 13:49:23 +03:00
Trial97
2b949a8059 improve login account checking 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-22 10:53:24 +03:00
Trial97
abb628edb3 remove OverrideJava 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-20 18:23:43 +03:00
Trial97
1b0e8260ac fix zero launch time 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-19 15:36:39 +03:00
Trial97
76a656a017 retry auth step on fail 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-18 22:44:17 +03:00
Trial97
5a598db608 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into disablemods 2024-05-18 17:40:54 +03:00
Trial97
5bd28e2cc8 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters 2024-05-18 17:11:41 +03:00
Trial97
e42dfbc391 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_duplicate_mod 2024-05-18 17:02:10 +03:00
Trial97
477d1408ad Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into resource_size 2024-05-18 16:53:14 +03:00
Trial97
31d0cad377 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into demo 2024-05-18 16:24:22 +03:00
Trial97
7a5348a179 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 2024-05-18 14:14:31 +03:00
Trial97
633489884d Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-18 13:27:31 +03:00
Trial97
ba947993c2 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_zip 2024-05-18 12:47:01 +03:00
Tayou
acd23ff163 Merge pull request #2402 from Trial97/refactor_auth 
Improve Microsoft login
 2024-05-18 11:07:16 +02:00
Alexandru Ionut Tripon
c8ff768d64 Merge pull request #1827 from Trial97/shader 
fixed shader packs detection
 2024-05-18 12:02:13 +03:00