ONIMAI-SMP/ShatteredPrism
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity
9,284 Commits 4 Branches 5 Tags 40 MiB
ccc886b51f
Commit Graph

569 Commits

Author SHA1 Message Date
Trial97
6a99312df5
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters 2024-06-09 19:57:16 +03:00
Alexandru Ionut Tripon
0e996270b7
Merge pull request #2055 from Trial97/show_minecraft_version_modrinth 
Display minecraft version if not mentioned for modrinth/curse packs
 2024-06-09 15:59:24 +03:00
Trial97
975b0b5761 fix double borders 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit c9c39b8203)
 2024-06-07 06:37:36 +00:00
Trial97
446740ba4f Made Custom New Instance scrollable 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit f7120a4f6f)
 2024-06-07 06:37:36 +00:00
ZekeZ
39b8451130
Merge pull request #2383 from Trial97/scroll_new_instance 
Made Custom New Instance scrollable
 2024-06-07 16:37:21 +10:00
Trial97
45463dcd75
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_zip 2024-06-04 11:04:02 +03:00
SabrePenguin
6a49f513d8
Fixed more clang formatting 
Signed-off-by: SabrePenguin <lknofczynski@gmail.com>
 2024-06-02 18:59:44 +03:00
SabrePenguin
5d25e21719
Fixing CI format issues 
Signed-off-by: SabrePenguin <lknofczynski@gmail.com>
 2024-06-02 18:59:44 +03:00
SabrePenguin
da2a67227a
Added patch to all setHtml calls 
Signed-off-by: SabrePenguin <lknofczynski@gmail.com>
 2024-06-02 18:59:44 +03:00
TheKodeToad
a70aeeea2b
Merge branch 'develop' into list-image-append-fix 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-06-01 15:20:21 +01:00
Trial97
c9c39b8203
fix double borders 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-31 17:47:39 +03:00
Trial97
f7120a4f6f
Made Custom New Instance scrollable 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-31 16:46:46 +03:00
Trial97
2635d7c3be
replaced grid with vertical layout on all add modpack pages 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-31 09:07:51 +03:00
Trial97
8704cd8402
remove duplicate proggress bar 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-30 11:49:09 +03:00
Trial97
5e36def18b
remove search button 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-30 00:36:02 +03:00
Trial97
469f051e30
remove search button 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-30 00:14:37 +03:00
Tayou
b8fe93efa3 fix & clean ResourcePage.ui 
Qt is cursed.

Signed-off-by: Tayou <git@tayou.org>
 2024-05-29 20:00:36 +02:00
Trial97
660772d4d7
swap buttons 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-29 01:06:11 +03:00
Alexandru Ionut Tripon
f332503088
Apply suggestions from code review 
Co-authored-by: Tayou <git@tayou.org>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2024-05-29 00:32:17 +03:00
Trial97
5012178a98
trigger search on filter change 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-28 14:48:03 +03:00
Trial97
3f7847ad34
made ResourcePage elements resizable 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-28 14:47:44 +03:00
Trial97
694ea65457
disable retry dialog for logo fetching 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-26 11:13:01 +03:00
Evan Goode
4f9fdcc293 pre-commit run --all-files 2024-05-23 16:49:09 -04:00
Trial97
5bd28e2cc8
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters 2024-05-18 17:11:41 +03:00
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
Evan Goode
c8265567aa Merge tag '8.3' into develop 2024-05-03 19:21:17 -04: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
ColonelGerdauf
ea0c74b302 Change of parameters 
To help deal with adjustments

Signed-off-by: ColonelGerdauf <ColonelGerdauf@users.noreply.github.com>
(cherry picked from commit a877f9146d)
 2024-04-30 05:53:48 +00:00
ColonelGerdauf
c02257024e Renaming and removing redundancies 
old's do not make sense here

Signed-off-by: ColonelGerdauf <ColonelGerdauf@users.noreply.github.com>
(cherry picked from commit f91f97e56d)
 2024-04-30 05:53:48 +00: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
Trial97
1a44258c9d Fixed crash on invalid curseforge link on import 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 9cc58fe62c)
 2024-04-08 21:20:14 +00: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
Alexandru Ionut Tripon
99203cbd9b
Merge pull request #2253 from Trial97/manual_backport 
Manual backport to 8.x
 2024-03-28 14:47:45 +02:00
Trial97
d262a081c5
fixed const stuff 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-03-28 14:44:32 +02:00
Alexandru Ionut Tripon
f9df20aae3
Update launcher/ui/pages/modplatform/ImportPage.cpp 
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2024-03-28 14:44:26 +02:00
Trial97
fc4b5205dd
Added all supported files filter 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-03-28 14:44:20 +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
Evan Goode
96b4933326 Merge Prism Launcher 8.2 
Signed-off-by: Evan Goode <mail@evangoo.de>
 2024-03-21 10:59:32 -04: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
3f30e4c691 Fix formatting issues 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit 8cf2a04f31)
 2024-02-13 08:14:52 +00:00
TheKodeToad
fb04b6fa85 Fix ResourceModel error display 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit ff989b4305)
 2024-02-13 08:14:52 +00: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
a2aede0d94 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>
(cherry picked from commit 8de1060bfb)
 2024-01-24 16:13:32 +00: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
557fce577a
Merge pull request #1825 from Trial97/ftb_import 2024-01-18 18:19:17 +01:00
Sefa Eyeoglu
a62eaba702
Merge pull request #1825 from Trial97/ftb_import 2024-01-18 18:18:17 +01:00
lumiscosity
f4617d7c90 fix styling 
Signed-off-by: lumiscosity <averyrudelphe@gmail.com>
(cherry picked from commit c29af83dc3)
 2024-01-03 20:46:44 +00:00
lumiscosity
a00966986c move simplify call to drawing 
Signed-off-by: lumiscosity <averyrudelphe@gmail.com>
(cherry picked from commit 1e48bf838d)
 2024-01-03 20:46:44 +00:00
lumiscosity
42ea2ecbc8 Strip newlines in mod descriptions 
Mirrors Modrinth page behaviour.

Signed-off-by: lumiscosity <averyrudelphe@gmail.com>
(cherry picked from commit 1bf386603d)
 2024-01-03 20:46:44 +00:00
lumiscosity
568734eb8a add archived project warning 
Signed-off-by: lumiscosity <averyrudelphe@gmail.com>
(cherry picked from commit 358cf5b348)
 2024-01-03 20:46:44 +00:00
Trial97
bb843b86ab Fixed openURL cast for resource 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 9a33bdcf50)
 2024-01-03 20:44:44 +00: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
199312dd5a one more 
Signed-off-by: lumiscosity <averyrudelphe@gmail.com>
(cherry picked from commit eb8e150fa8)
 2023-12-16 16:25:35 +00: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
Sefa Eyeoglu
426deb4454
Merge pull request #1694 from Trial97/concurrent 2023-12-11 11:20:17 +01: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
Alexandru Ionut Tripon
76216335b1
Update launcher/ui/pages/modplatform/ImportPage.cpp 
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2023-11-19 15:26:47 +02:00
Trial97
f7e478c755
Added all supported files filter 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-19 02:02:02 +02:00
Trial97
2bfb5fc138
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-17 22:26:17 +02:00
Evan Goode
9430026192 Merge tag '8.0' into unmojang-8.0 
Upstream changelog: https://github.com/PrismLauncher/PrismLauncher/releases/tag/8.0

(Imcomplete) list of changes in 8.0 relevant to PollyMC:
- Prism has dropped support for Mojang accounts
  - https://github.com/PrismLauncher/PrismLauncher/pull/1656
  - Added it back to PollyMC primarily since the Mojang authentication
    code is also used for authlib-injector accounts. Some users may also
    still want to be able to log in to Mojang accounts for some reason:
    https://github.com/fn2006/PollyMC/issues/115#issuecomment-1805384658,
    even if they do not provide authentication to multiplayer servers.
  - To my surprise, I could still log in to a Mojang account, get its
    skin, and launch the game. Authentication to servers, of course, did
    not work.
  - Tested: logging into authlib-injector, Mojang, and MSA accounts and
    launching the game.
- Prism has added a built-in updater for Windows and Linux that I assume
  provides similar functionality to Sparkle on macOS:
  https://github.com/PrismLauncher/PrismLauncher/pull/1268. There is a
  Launcher_UPDATER_GITHUB_REPO variable in CMakeLists.txt that specifies
  the repo checked by the updater. I have changed this to the PollyMC
  repository, and since PollyMC follows almost the same CI/release
  patterns as Prism Launcher, it might work with PollyMC, too, but I
  have not tested it yet.
- Add macOS support to Nix
  - https://github.com/PrismLauncher/PrismLauncher/pull/1485
  - Untested
- The "PollyMC-Linux-8.0.tar.gz" and similar build artifacts were
  renamed to "PollyMC-Linux-8.0-Qt5.tar.gz" to match their
  "PollyMC-Linux-8.0-Qt6.tar.gz" counterparts.
- Removed Windows MSVC Legacy builds
- Removed Quilt Beacon toggle, the beacon is now always disabled:
  https://github.com/PrismLauncher/PrismLauncher/pull/1547,
  https://github.com/PrismLauncher/meta/pull/23
- Prism removed FTB support in 7.0, but I tested creating an FTB
  instance to make sure it still works in 8.0

Signed-off-by: Evan Goode <mail@evangoo.de>
 2023-11-15 14:37:14 -05:00
Trial97
17916dbd24
Fixed inconsistent Ok in instance import 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-12 20:27:55 +02:00
Trial97
5e2eb7bbbb
Added button to select the FTBApp instances directory 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-09 23:30:30 +02:00