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

9189 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Trial97
b679a57939 Fixed NetRequest not failing on sink init 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 48f3ca56ba)
 2024-05-09 05:16:32 +00:00
Alexandru Ionut Tripon
72e9d7b148
Merge pull request #2366 from Trial97/modrint_import2 
Fix download packs with invalid characters
 2024-05-09 08:16:16 +03:00
Alexandru Ionut Tripon
d3a16715b8 Update launcher/ui/widgets/VariableSizedImageObject.cpp 
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
(cherry picked from commit 3c9a207192)
 2024-05-09 05:15:48 +00:00
Trial97
28378c77aa Fix image width in project description 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit c902da4461)
 2024-05-09 05:15:48 +00:00
Alexandru Ionut Tripon
7bcb1777a1
Merge pull request #2341 from Trial97/image_size 
Fix image width in project description
 2024-05-09 08:15:35 +03:00
Alexandru Ionut Tripon
a4142573ac
Merge pull request #2311 from SolidStateDj/gen->ui 
Rename object name "userInterfaceTab" from "generalTab"
 2024-05-09 08:15:15 +03:00
Trial97
a95c1768a7
Add neoforge support for technic packs and atlauncher packs 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-08 14:16:12 +03:00
Evan Goode
920731eefd CI: rename PollyMC to Fjord Launcher 2024-05-08 01:00:39 -04:00
Kenneth Chew
e7c95c9ccb
Fix bug where watched directories are not clickable on macOS 
Signed-off-by: Kenneth Chew <79120643+kthchew@users.noreply.github.com>
 2024-05-07 18:57:04 -04:00
Kenneth Chew
4787141698
Improved blocked mods dialog permissions prompt 
Targeted to macOS (where `~/Downloads` is considered a sensitive location that the system protects behind a prompt even from non-sandboxed apps)

Signed-off-by: Kenneth Chew <79120643+kthchew@users.noreply.github.com>
 2024-05-07 18:30:06 -04:00
Evan Goode
1e0cbf730c Correct copyright strings and credits 2024-05-07 00:55:40 -04:00
Evan Goode
4173436ba8 Fjord Launcher icons 2024-05-07 00:55:12 -04:00
Evan Goode
f1feb2d24d Support migration from PollyMC, Prism Launcher 2024-05-07 00:22:54 -04:00
Samuel Stidham
adf0cfdebf Fixed the code. 
Signed-off-by: Samuel Stidham <dqfan2012@gmail.com>
 2024-05-05 20:01:29 -04:00
Samuel Stidham
8e0af16de9 Add extra java locations for MacOs. 
Signed-off-by: Samuel Stidham <dqfan2012@gmail.com>
 2024-05-05 19:53:18 -04:00
Sefa Eyeoglu
5ce8cd6b84
Merge pull request #2375 from PrismLauncher/update_flake_lock_action 
chore(nix): update lockfile
 2024-05-05 08:09:00 +02:00
github-actions[bot]
5d36ed9cf9 chore(nix): update lockfile 
Flake lock file updates:

• Updated input 'flake-parts':
    'github:hercules-ci/flake-parts/9126214d0a59633752a136528f5f3b9aa8565b7d' (2024-04-01)
  → 'github:hercules-ci/flake-parts/e5d10a24b66c3ea8f150e47dfdb0416ab7c3390e' (2024-05-02)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/d6f6eb2a984f2ba9a366c31e4d36d65465683450' (2024-04-27)
  → 'github:nixos/nixpkgs/5fd8536a9a5932d4ae8de52b7dc08d92041237fc' (2024-05-03)
• Updated input 'pre-commit-hooks':
    'github:cachix/pre-commit-hooks.nix/6fb82e44254d6a0ece014ec423cb62d92435336f' (2024-04-24)
  → 'github:cachix/pre-commit-hooks.nix/2849da033884f54822af194400f8dff435ada242' (2024-04-30)
 2024-05-05 00:19:38 +00:00
Evan Goode
084d462463 Add Fjord Launcher to COPYING.md 2024-05-04 00:14:08 -04:00
Evan Goode
cb2f9b4e14 Crude s/PollyMC/Fjord Launcher 2024-05-04 00:08:42 -04:00
Evan Goode
c8265567aa Merge tag '8.3' into develop 2024-05-03 19:21:17 -04:00
Evan Goode
3e7b747926 Merge branch 'unmojang/8.2' into develop 2024-05-03 19:10:19 -04:00
Evan Goode
8acd7168dd Actually fix offline accounts on 1.16.4, 1.16.5 2024-05-03 19:07:44 -04:00
Evan Goode
ddaf525cf7 Update flake.lock 2024-05-03 19:03:32 -04:00
Evan Goode
614615a5fd Merge branch 'unmojang/fix-1.20' into develop 2024-05-03 17:44:15 -04:00
Evan Goode
d0550e998d Merge branch 'unmojang/fix-1.16-offline' into develop 2024-05-03 17:31:39 -04:00
Evan Goode
c0dc59ecfb whitespace 2024-05-03 17:31:00 -04:00
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