Mirrors/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2025-04-30 14:44:31 +02:00
Code Issues Packages Projects Releases Wiki Activity
8,568 Commits 10 Branches 38 Tags
Commit Graph

512 Commits

Author SHA1 Message Date
Trial97
c9c67ef79e
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into change_version 2024-05-18 15:27:02 +03:00
Trial97
ba947993c2
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_zip 2024-05-18 12:47:01 +03:00
Trial97
3336f8107c
Removed AuthRequest and NetAction 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-14 00:21:45 +03:00
SabrePenguin
814f84efab Fixed more clang formatting 
Signed-off-by: SabrePenguin <lknofczynski@gmail.com>
 2024-05-01 00:21:32 -04:00
SabrePenguin
51f4ede797 Fixing CI format issues 
Signed-off-by: SabrePenguin <lknofczynski@gmail.com>
 2024-05-01 00:11:53 -04:00
SabrePenguin
b9c010ffb2 Added patch to all setHtml calls 
Signed-off-by: SabrePenguin <lknofczynski@gmail.com>
 2024-04-30 23:43:36 -04:00
Sefa Eyeoglu
603d196dac
Merge pull request #2292 from ColonelGerdauf/develop 2024-04-30 07:53:32 +02:00
Trial97
e07e182e95
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters 2024-04-24 23:51:43 +03:00
Trial97
e33ddbadd2
Merge branch 'filters' of github.com:Trial97/PrismLauncher into filters 2024-04-24 23:51:33 +03:00
Trial97
3a4f82ffd1
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_zip 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-04-24 00:21:39 +03:00
ColonelGerdauf
a877f9146d
Change of parameters 
To help deal with adjustments

Signed-off-by: ColonelGerdauf <ColonelGerdauf@users.noreply.github.com>
 2024-04-07 16:53:53 -04:00
ColonelGerdauf
f91f97e56d
Renaming and removing redundancies 
old's do not make sense here

Signed-off-by: ColonelGerdauf <ColonelGerdauf@users.noreply.github.com>
 2024-04-07 16:49:39 -04:00
Trial97
9cc58fe62c
Fixed crash on invalid curseforge link on import 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-04-07 21:25:08 +03:00
Trial97
1c3c9d2457
Added the new ftb settings path 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-04-07 13:48:34 +03:00
TheKodeToad
186a6d0c52
Make filters vertical 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-04-01 17:00:10 +01:00
Trial97
a0eba1ace6
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters 2024-03-31 21:15:49 +03:00
Alexandru Ionut Tripon
2012b2c243
Merge pull request #1977 from Trial97/resource_clear 
Force clear the resource selection
 2024-03-28 14:49:03 +02:00
Sefa Eyeoglu
5d72ee1c4f
Merge pull request #1837 from Trial97/import_ok 2024-03-27 10:50:58 +01:00
Trial97
3c12e27226
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters 2024-03-23 23:53:25 +02:00
Alexandru Ionut Tripon
a0311780c1
Merge pull request #1866 from Trial97/supported_files 
Added all supported files filter
 2024-03-06 17:21:56 +02:00
Trial97
27e76d0dcb
Removed static path 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-02-27 17:11:19 +02:00
Trial97
344398f238
Updated ftb app import instance detection 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-02-26 21:20:14 +02:00
TheKodeToad
8cf2a04f31
Fix formatting issues 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-02-12 15:24:56 +00:00
TheKodeToad
ff989b4305
Fix ResourceModel error display 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-02-11 15:43:36 +00:00
Trial97
5099061a5c
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_zip 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-02-10 11:02:29 +02:00
Trial97
b54410b48c
Added gameVersion for curseforge mod packs 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-01-26 19:10:39 +02:00
DioEgizio
8de1060bfb fix: remove alpha notice on modrinth packs 
with the modrinth app being released for quite a while now it's weird to still have this (tbh they've never been truly alpha)

Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2024-01-24 16:43:38 +01:00
Trial97
6b637a8797
Display minecraft version if not mentioned for modrinth packs 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-01-22 22:32:42 +02:00
Sefa Eyeoglu
a62eaba702
Merge pull request #1825 from Trial97/ftb_import 2024-01-18 18:18:17 +01:00
Alexandru Ionut Tripon
57a589367f
Merge pull request #1979 from lumiscosity/feature/mod_page_improvements 
Mod downloader page improvements
 2024-01-03 22:43:18 +02:00
timoreo
0ce0769842
Merge pull request #1978 from Trial97/double_links 2023-12-28 19:48:34 +01:00
lumiscosity
c29af83dc3 fix styling 
Signed-off-by: lumiscosity <averyrudelphe@gmail.com>
 2023-12-23 14:16:29 +01:00
lumiscosity
1e48bf838d move simplify call to drawing 
Signed-off-by: lumiscosity <averyrudelphe@gmail.com>
 2023-12-23 12:05:07 +01:00
lumiscosity
1bf386603d Strip newlines in mod descriptions 
Mirrors Modrinth page behaviour.

Signed-off-by: lumiscosity <averyrudelphe@gmail.com>
 2023-12-23 11:27:19 +01:00
Trial97
9a33bdcf50
Fixed openURL cast for resource 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-12-23 01:02:04 +02:00
Trial97
526e580fbb
Force clear the resource selection 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-12-23 00:33:38 +02:00
lumiscosity
358cf5b348 add archived project warning 
Signed-off-by: lumiscosity <averyrudelphe@gmail.com>
 2023-12-22 22:04:33 +01:00
lumiscosity
eb8e150fa8
one more 
Signed-off-by: lumiscosity <averyrudelphe@gmail.com>
 2023-12-16 13:00:22 +01:00
Trial97
763eab6b96
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters 2023-12-13 14:48:31 +02:00
Trial97
6f6b6312a5
Moved the button up 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-27 09:39:31 +02:00
Trial97
2d91bd09d4
Fixed crash on abort function not initialized 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-26 23:49:56 +02:00
Trial97
f4e098f7f5
Formated file 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-25 09:36:55 +02:00
Trial97
1a0fd5f993
Added mod reinstall dialog 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-25 00:18:10 +02:00
Trial97
20e0cb43b9
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into concurrent 2023-11-23 23:58:47 +02:00
Trial97
2db5677281
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters 2023-11-23 23:57:44 +02:00
Trial97
c5cdebb42f
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into ftb_import 2023-11-23 16:43:33 +02:00
Trial97
9c13504b06
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_ok 2023-11-23 16:13:09 +02:00
Trial97
4f49a56e4d
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into supported_files 2023-11-23 15:40:31 +02:00
Trial97
c2fc2d330b
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_zip 2023-11-23 12:57:31 +02:00
Trial97
80c85aef99
fixed const stuff 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-19 15:37:18 +02:00