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

7774 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sefa Eyeoglu
256ed2a038
Merge pull request #2121 from PrismLauncher/backport-2116-to-release-8.x 2024-02-13 09:15:05 +01: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
ad9dbb4a68 Fix immediate free in Exception.h 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit 7f4c74ffbe)
 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
6badd694c5 Fix NetJob use-after-free 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit ded77e6183)
 2024-02-13 08:14:52 +00:00
TheKodeToad
6f5cddeec8
Merge pull request #2091 from PrismLauncher/revert-2084-backport-2050-to-release-8.x 
Revert "[Backport release-8.x] Use `minecraft` instead of `.minecraft` for better accessibility"
 2024-02-04 16:09:36 +00:00
TheKodeToad
25ba275230
Revert "[Backport release-8.x] Use minecraft instead of .minecraft for better accessibility" 2024-02-04 16:08:16 +00:00
furokku
2d2b082539 fixes #63 2024-02-03 23:42:19 +02:00
Tayou
cf6ffc3954
Merge pull request #2084 from PrismLauncher/backport-2050-to-release-8.x 
[Backport release-8.x] Use `minecraft` instead of `.minecraft` for better accessibility
 2024-02-01 18:29:46 +01:00
TheKodeToad
5e3b7d88ec Use minecraft instead of .minecraft for better accessibility 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit f54ac25614)
 2024-02-01 17:16:29 +00:00
Alexandru Ionut Tripon
1f5552dd81
Merge pull request #2064 from PrismLauncher/backport-2063-to-release-8.x 
[Backport release-8.x] fix: remove alpha notice on modrinth packs
 2024-01-24 18:13:58 +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
BatteredBunny
187475e35f Adjusted AuthServerColumn to return authlibInjectorUrl instead of authServerUrl, make the column auto-resize 
Signed-off-by: BatteredBunny <ayes2022@protonmail.com>
 2024-01-23 22:38:41 +02:00
Sefa Eyeoglu
2fd5635b2d
Merge pull request #2057 from PrismLauncher/backport-2053-to-release-8.x 2024-01-23 09:30:59 +01:00
Trial97
bc63e1906f Fixed open path a second time 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 12bf913764)
 2024-01-23 08:30:16 +00:00
BatteredBunny
5c95f10f64 Add auth server column to account list 
Signed-off-by: BatteredBunny <ayes2022@protonmail.com>
 2024-01-19 00:40:35 +02:00
Alexandru Ionut Tripon
a8b168dc1f
Merge pull request #2043 from PrismLauncher/backport-1913-to-release-8.x 
[Backport release-8.x] Fixed askIfShouldUpdate dialog on mac
 2024-01-18 22:06:12 +02:00
Trial97
fce2163350 Fixed askIfShouldUpdate dialog on mac 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 577c737d68)
 2024-01-18 20:05:30 +00:00
Sefa Eyeoglu
5d0c83dec2
Merge pull request #1768 from Trial97/toggle_deps2 2024-01-18 18:19:17 +01:00
Sefa Eyeoglu
557fce577a
Merge pull request #1825 from Trial97/ftb_import 2024-01-18 18:19:17 +01:00
Sefa Eyeoglu
bcb5b9c9c2
Merge pull request #2034 from Scrumplex/feat/macos-signing 2024-01-18 17:00:00 +01:00
Sefa Eyeoglu
428260b91f
Merge pull request #2035 from PrismLauncher/backport-1954-to-release-8.x 2024-01-17 15:19:48 +01:00
Sefa Eyeoglu
fec1a00dc8 fix: simplify openPath calls 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
(cherry picked from commit 67d088dc53)
 2024-01-17 14:19:03 +00:00
Sefa Eyeoglu
8dd898f895 chore: improve param name 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
(cherry picked from commit e5b608447a)
 2024-01-17 14:19:03 +00:00
Sefa Eyeoglu
f8585602d9 chore: remove unused methods 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
(cherry picked from commit a8220cd296)
 2024-01-17 14:19:03 +00:00
Sefa Eyeoglu
0ec3b9ce0e chore: remove maybe_unused 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
(cherry picked from commit 213963257c)
 2024-01-17 14:19:03 +00:00
Sefa Eyeoglu
6f5d074b4b fix: open paths directly 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
(cherry picked from commit 0ccdcd23e3)
 2024-01-17 14:19:03 +00:00
seth
7d9b95b4ce
nix: add garnix cache to nixConfig 
Signed-off-by: seth <getchoo@tuta.io>
(cherry picked from commit 839adfc90b)
 2024-01-11 09:51:53 +01:00
seth
c08890391c
nix: deduplicate nixpkgs input 
Signed-off-by: seth <getchoo@tuta.io>
(cherry picked from commit 26474d1374)
 2024-01-11 09:51:51 +01:00
Alexandru Ionut Tripon
422135b2ab
Merge pull request #1771 from Trial97/account 
Try refreshing account on launch if needed
 2024-01-10 16:24:34 +02:00
Tayou
b83b25cbe3
Merge pull request #2015 from PrismLauncher/backport-2012-to-release-8.x 
[Backport release-8.x] Fixed openAL placeholder
 2024-01-07 00:32:17 +01:00
Trial97
4a17799449 Fixed openAL placeholder 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 219e2862f9)
 2024-01-06 23:23:49 +00:00
Alexandru Ionut Tripon
3fe18e0810
Merge pull request #2008 from PrismLauncher/backport-1983-to-release-8.x 
[Backport release-8.x] remove legacy processArguments code
 2024-01-05 15:24:54 +02:00
tildejustin
5f4e0dfc14 remove legacy processArguments code 
Signed-off-by: tildejustin <spacepepper3.14@gmail.com>
(cherry picked from commit eca5d88576)
 2024-01-05 12:27:13 +00:00
Alexandru Ionut Tripon
afc73ffa16
Merge pull request #2007 from PrismLauncher/backport-2005-to-release-8.x 
[Backport release-8.x] Format java code
 2024-01-04 22:29:21 +02:00
Trial97
7ae3c05f1d Format java code 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 786e03571b)
 2024-01-04 20:18:56 +00:00
Alexandru Ionut Tripon
744b81fc30
Merge pull request #2004 from PrismLauncher/backport-1979-to-release-8.x 
[Backport release-8.x] Mod downloader page improvements
 2024-01-03 22:47:27 +02: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
Alexandru Ionut Tripon
3b578ecfe0
Merge pull request #2003 from PrismLauncher/backport-1978-to-release-8.x 
[Backport release-8.x] Fixed openURL cast for resource
 2024-01-03 22:44:59 +02: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
Sefa Eyeoglu
b12dffe420
Merge pull request #2001 from PrismLauncher/backport-1999-to-release-8.x 2024-01-03 18:26:32 +01:00
TheKodeToad
36d8ffd3c1 Pass proxy 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit 345cdf5c9d)
 2024-01-03 17:25:14 +00:00
TheKodeToad
f31bf5a1f1 Add online mode fix for legacy versions; minor refactors in legacy 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit 05e4533096)
 2024-01-03 17:25:14 +00:00
Sefa Eyeoglu
270accf6d7
Merge pull request #2000 from PrismLauncher/backport-1998-to-release-8.x 2024-01-03 18:15:52 +01:00
TheKodeToad
6816364354 Happy new year :D 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit 1130fe8510)
 2024-01-03 17:13:30 +00:00
TheKodeToad
2f3715beed
Merge pull request #1968 from PrismLauncher/backport-1964-to-release-8.x 
[Backport release-8.x] Don't log Microsoft refresh tokens
 2023-12-19 11:30:19 +00:00
Sefa Eyeoglu
6912782f4b fix: don't log katabasis by default 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
(cherry picked from commit a1e3901b3f)
 2023-12-19 11:25:00 +00:00