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

7756 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
github-actions[bot]
d21597cf89 chore(nix): update lockfile 
Flake lock file updates:

• Updated input 'flake-parts':
    'github:hercules-ci/flake-parts/e5d10a24b66c3ea8f150e47dfdb0416ab7c3390e?narHash=sha256-yzcRNDoyVP7%2BSCNX0wmuDju1NUCt8Dz9%2BlyUXEI0dbI%3D' (2024-05-02)
  → 'github:hercules-ci/flake-parts/8dc45382d5206bd292f9c2768b8058a8fd8311d9?narHash=sha256-/GJvTdTpuDjNn84j82cU6bXztE0MSkdnTWClUCRub78%3D' (2024-05-16)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/e4e7a43a9db7e22613accfeb1005cca1b2b1ee0d?narHash=sha256-FCi3R1MeS5bVp0M0xTheveP6hhcCYfW/aghSTPebYL4%3D' (2024-05-11)
  → 'github:nixos/nixpkgs/02923630b89aa1ab36ef8e422501a6f4fd4b2016?narHash=sha256-OhysviwHQz4p2HZL4g7XGMLoUbWMjkMr/ogaR3VUYNA%3D' (2024-05-18)
• Updated input 'pre-commit-hooks':
    'github:cachix/pre-commit-hooks.nix/2849da033884f54822af194400f8dff435ada242?narHash=sha256-q//cgb52vv81uOuwz1LaXElp3XAe1TqrABXODAEF6Sk%3D' (2024-04-30)
  → 'github:cachix/pre-commit-hooks.nix/fa606cccd7b0ccebe2880051208e4a0f61bfc8c1?narHash=sha256-nacSOeXtUEM77Gn0G4bTdEOeFIrkCBXiyyFZtdGwuH0%3D' (2024-05-16)
• Removed input 'pre-commit-hooks/flake-utils'
• Removed input 'pre-commit-hooks/flake-utils/systems'
 2024-05-19 00:20:26 +00:00
Alexandru Ionut Tripon
5cf7466e4c
Merge pull request #2404 from PrismLauncher/renovate/cachix-install-nix-action-27.x 
Update cachix/install-nix-action action to v27
 2024-05-18 19:49:58 +03:00
Alexandru Ionut Tripon
74c2f2599f
Merge pull request #1365 from Trial97/netjob_retry 
Ask user to retry if netjob fails
 2024-05-18 17:54:12 +03:00
Alexandru Ionut Tripon
3887cfe5df
Merge pull request #1525 from Trial97/waitprofiler 
Add wait profiler
 2024-05-18 13:17:24 +03:00
Alexandru Ionut Tripon
7b39ec5048
Merge pull request #2377 from dqfan2012/AddSdkmanToMacOs 
Adding sdkman java location to MacOs
 2024-05-18 13:15:57 +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
Trial97
318819afc6
Made recommended button default 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-18 11:36:46 +03:00
Alexandru Ionut Tripon
eb0d0450e3
Merge pull request #2382 from Trial97/neoforge_technic 
Add neoforge support for technic packs and atlauncher packs
 2024-05-18 10:40:45 +03:00
Trial97
639c6e7f80
Add cancel to Add account dialog 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-17 00:49:00 +03:00
Trial97
78804b26ee
Maybe fix nix 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-17 00:34:39 +03:00
Trial97
75a457ebfa
Add custom page to land after microsoft login 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-17 00:31:04 +03:00
Trial97
ce09f06bda
Fix CI3 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-16 22:16:42 +03:00
Trial97
09c0c11033
Add back device code flow 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-16 21:58:25 +03:00
Trial97
2a58fb0ac5
Remove cobrandid 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-16 17:31:25 +03:00
Alexandru Ionut Tripon
898ee67a07
Update launcher/ui/dialogs/MSALoginDialog.cpp 
Co-authored-by: Tayou <git@tayou.org>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2024-05-16 00:41:07 +03:00
renovate[bot]
1d384544d3
chore(deps): update cachix/install-nix-action action to v27 2024-05-15 19:40:15 +00:00
Trial97
8b051b97fd
Fix CI2 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-15 17:54:35 +03:00
Trial97
abedc6a23c
Improve login UI 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-15 17:25:15 +03:00
Trial97
849c3faeb4
Fix CI 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-15 14:07:03 +03:00
Trial97
80d8e3ee06
Remove katabasis 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-15 12:53:06 +03:00
Trial97
c2ed50627d
Added back qt version check 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-14 00:36:35 +03:00
Trial97
e285a85fe8
Removed AccountTask 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-14 00:21:51 +03:00
Trial97
3336f8107c
Removed AuthRequest and NetAction 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-14 00:21:45 +03:00
Sefa Eyeoglu
93da066aa2
Merge pull request #2398 from PrismLauncher/update_flake_lock_action 
chore(nix): update lockfile
 2024-05-12 09:24:48 +02:00
github-actions[bot]
d74926e60d chore(nix): update lockfile 
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/5fd8536a9a5932d4ae8de52b7dc08d92041237fc' (2024-05-03)
  → 'github:nixos/nixpkgs/e4e7a43a9db7e22613accfeb1005cca1b2b1ee0d' (2024-05-11)
 2024-05-12 00:20:20 +00:00
Alexandru Ionut Tripon
f15981d786
Merge pull request #2358 from DioEgizio/nosystem-portablewithqt 
Remove prebuilt system tarballs on Linux, bundle Qt with Linux portable
 2024-05-09 08:22:43 +03:00
Alexandru Ionut Tripon
c703babda9
Merge pull request #2379 from kthchew/fix/blocked-desc 
Improve blocked mods dialog (permissions prompt, misc. fixes) on macOS
 2024-05-09 08:17:03 +03: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
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
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
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
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
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
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
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
Trial97
a5b059ebad
Fixed curseforge export 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-04-29 00:27:15 +03:00