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

9213 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Evan Goode
e0796e5260 Merge remote-tracking branch 'furokku/develop' into develop 2024-05-03 17:28:03 -04:00
Evan Goode
ee040668f0 Merge remote-tracking branch 'BatteredBunny/auth_server_name' into develop 2024-05-03 17:25:58 -04:00
Evan Goode
eba77dc8a3 Trim whitespace surrounding authlib-injector URL 
For https://github.com/fn2006/PollyMC/issues/134
 2024-05-03 17:25:01 -04:00
SabrePenguin
0c76e7ab20 Made Regex static and const, removed dist 
Signed-off-by: SabrePenguin <lknofczynski@gmail.com>
 2024-05-01 13:00:55 -04:00
SabrePenguin
ce873e4a0d
Regex correction 
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: SabrePenguin <147069705+SabrePenguin@users.noreply.github.com>
 2024-05-01 12:49:34 -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
SabrePenguin
e3d64608b9 Switched </ul> to a Regex expression 
Signed-off-by: SabrePenguin <lknofczynski@gmail.com>
 2024-04-30 23:28:50 -04:00
SabrePenguin
cec27fd014 Moved html patch to StringUtils 
Signed-off-by: SabrePenguin <lknofczynski@gmail.com>
 2024-04-30 23:14:26 -04:00
Trial97
30ce8ecb5f
Fixed imports 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-04-30 23:20:24 +03:00
Trial97
5400c24c73
Ensure valid file names for resource names 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-04-30 23:04:50 +03:00
Trial97
e068120375
Fix invalid characters filename download on windows 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-04-30 22:56:40 +03:00
Trial97
48f3ca56ba
Fixed NetRequest not failing on sink init 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-04-30 22:38:01 +03:00
Alexandru Ionut Tripon
cf87aed7ff
Merge pull request #2360 from PrismLauncher/backport-2348-to-release-8.x 
[Backport release-8.x] Use proxy style to force ActivateItemOnSingleClick off
 2024-04-30 10:24:52 +03:00
Alexandru Ionut Tripon
d43653605f
Merge pull request #2359 from PrismLauncher/backport-2292-to-release-8.x 
[Backport release-8.x] Remove old version variants in instance creation
 2024-04-30 10:24:22 +03:00
TheKodeToad
257297d966 Use proxy style to force ActivateItemOnSingleClick off 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit e3f55f6865)
 2024-04-30 05:56:01 +00:00
Sefa Eyeoglu
bfac12604e
Merge pull request #2348 from TheKodeToad/single-click-hint 2024-04-30 07:55:48 +02:00
Sefa Eyeoglu
4dddf62e5e
Merge pull request #2345 from Jan200101/PR/ssdfixmegamescope 2024-04-30 07:54:17 +02: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
TheKodeToad
d2568333ed
Merge pull request #2048 from erikLundstedt/develop 
fix a minor spelling error in Mod.cpp
 2024-04-29 18:22:22 +01:00
Alexandru Ionut Tripon
098f1f1281
Merge pull request #2357 from PrismLauncher/backport-2353-to-release-8.x 
[Backport release-8.x] Fix CurseForge export caused by utf8 enabled
 2024-04-29 19:30:37 +03:00
Trial97
119ee7a5b4 Fixed curseforge export 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit a5b059ebad)
 2024-04-29 16:30:17 +00:00
Alexandru Ionut Tripon
9b70606d7e
Merge pull request #2353 from Trial97/fix_curseforge4 
Fix CurseForge export caused by utf8 enabled
 2024-04-29 19:30:01 +03:00
DioEgizio
cb9a83320c chore: make Qt 5 Linux use official Qt builds 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2024-04-29 15:51:31 +02:00
DioEgizio
be8ac0b5bb fix: make portable builds bundle Qt 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2024-04-29 15:08:10 +02:00
Sefa Eyeoglu
87354d9a7d
Merge pull request #2354 from Trial97/bump8.4 2024-04-29 13:14:07 +02:00
Trial97
46a9880e2e
chore: bump to 8.4 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-04-29 13:48:56 +03:00
Trial97
a5b059ebad
Fixed curseforge export 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-04-29 00:27:15 +03:00
Sefa Eyeoglu
23a38b19f2
Merge pull request #2351 from PrismLauncher/update_flake_lock_action 
chore(nix): update lockfile
 2024-04-28 10:42:34 +02:00
github-actions[bot]
890fd0b09c chore(nix): update lockfile 
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/fd16bb6d3bcca96039b11aa52038fafeb6e4f4be' (2024-04-20)
  → 'github:nixos/nixpkgs/d6f6eb2a984f2ba9a366c31e4d36d65465683450' (2024-04-27)
• Updated input 'pre-commit-hooks':
    'github:cachix/pre-commit-hooks.nix/40e6053ecb65fcbf12863338a6dcefb3f55f1bf8' (2024-04-12)
  → 'github:cachix/pre-commit-hooks.nix/6fb82e44254d6a0ece014ec423cb62d92435336f' (2024-04-24)
 2024-04-28 00:20:12 +00:00
Alexandru Ionut Tripon
c14e6a67a8
Merge pull request #2349 from PrismLauncher/renovate/hendrikmuhs-ccache-action-1.x 
chore(deps): update hendrikmuhs/ccache-action action to v1.2.13
 2024-04-27 13:11:07 +03:00
DioEgizio
ccf0b01de7 chore!: make install_bundle work on linux, removed prebuilt tarballs 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2024-04-27 11:06:08 +02:00
renovate[bot]
46b291d02e
chore(deps): update hendrikmuhs/ccache-action action to v1.2.13 2024-04-27 07:16:54 +00:00
SabrePenguin
5348a90a15
Fix img tag allowing img.... 
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: SabrePenguin <147069705+SabrePenguin@users.noreply.github.com>
 2024-04-26 18:21:17 -04:00
TheKodeToad
e3f55f6865
Use proxy style to force ActivateItemOnSingleClick off 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-04-26 22:08:45 +01:00
SabrePenguin
a988415028
Pleasing the format check 
Co-authored-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
Signed-off-by: SabrePenguin <147069705+SabrePenguin@users.noreply.github.com>
 2024-04-26 16:59:51 -04:00
SabrePenguin
6ecd2c7f31
Update launcher/Markdown.cpp 
Co-authored-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
Signed-off-by: SabrePenguin <147069705+SabrePenguin@users.noreply.github.com>
 2024-04-26 16:51:23 -04:00
Alexandru Ionut Tripon
3c9a207192
Update launcher/ui/widgets/VariableSizedImageObject.cpp 
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2024-04-26 22:04:50 +03:00
Trial97
e1ed317c13
Updated CheckComboBox to look more like QComboBox 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-04-26 00:16:48 +03:00
SabrePenguin
2cfe482298 Formatting and fixed img_pos allowed as negative 
Signed-off-by: SabrePenguin <lknofczynski@gmail.com>
 2024-04-25 16:38:14 -04:00
SabrePenguin
dedea2c05d Added a naive implementation of a <br> inserter 
Signed-off-by: SabrePenguin <lknofczynski@gmail.com>
 2024-04-25 16:38:14 -04:00
Jan200101
a30c7193a2
remove server side decorations FIXME and document why its needed 
Signed-off-by: Jan200101 <sentrycraft123@gmail.com>
 2024-04-25 17:00:03 +02:00
BatteredBunny
1d2590b024 Clean up 
Signed-off-by: BatteredBunny <ayes2022@protonmail.com>
 2024-04-25 11:40:01 +03:00
Trial97
1961e2081f
Removed scroll from version checkbox 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-04-25 00:48:40 +03: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
Alexandru Ionut Tripon
be15abda90
Merge pull request #2 from TheKodeToad/better-filters 
Rework filter widget
 2024-04-24 23:52:08 +03:00