Commit Graph

7410 Commits

Author SHA1 Message Date
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
Sefa Eyeoglu
d8809197f8
Merge pull request #1962 from PrismLauncher/backport-1960-to-release-8.x
[Backport release-8.x] Minor spelling fixes
2023-12-16 17:28:07 +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
a108a01be7 Update ModFolderPage.cpp
Signed-off-by: lumiscosity <averyrudelphe@gmail.com>
(cherry picked from commit 56397446db)
2023-12-16 16:25:35 +00:00
lumiscosity
7568e90655 Update GetModDependenciesTask.cpp
Signed-off-by: lumiscosity <averyrudelphe@gmail.com>
(cherry picked from commit 8cbdecc454)
2023-12-16 16:25:35 +00:00
Alexandru Ionut Tripon
c216713844
Merge pull request #1952 from PrismLauncher/backport-1947-to-release-8.x
[Backport release-8.x] fix: Minimized windows dont get shown
2023-12-13 20:31:31 +02:00
TheKodeToad
4dfe925cf9 Revert change to .gitignore
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit 2391ad200f)
2023-12-13 18:24:40 +00:00
theMackabu
534b4e4aa3 remove: maidfile.toml (local build tool)
Signed-off-by: theMackabu <theMackabu@gmail.com>
(cherry picked from commit 7c33a8e448)
2023-12-13 18:24:40 +00:00
theMackabu
9aa8e1d7ad clang-format: fix formatting
Signed-off-by: theMackabu <theMackabu@gmail.com>
(cherry picked from commit 201c9783d5)
2023-12-13 18:24:40 +00:00
theMackabu
ff146d5855 #1945 resolve issue on windows
Signed-off-by: theMackabu <theMackabu@gmail.com>
(cherry picked from commit 836f74cd46)
2023-12-13 18:24:40 +00:00
theMackabu
d0cb62cb62 #1945 resolve minimized windows pull from dock
Signed-off-by: theMackabu <theMackabu@gmail.com>
(cherry picked from commit 3567369d44)
2023-12-13 18:24:40 +00:00
timoreo
743d48744a
Merge pull request #1712 from Trial97/current_time 2023-12-11 16:14:52 +01:00
Sefa Eyeoglu
2837ae8bff
Merge pull request #1738 from Trial97/some_removals 2023-12-11 11:31:55 +01:00
Sefa Eyeoglu
3e54d4ddbb
Merge pull request #1732 from Trial97/update_file2 2023-12-11 11:25:10 +01:00
Sefa Eyeoglu
426deb4454
Merge pull request #1694 from Trial97/concurrent 2023-12-11 11:20:17 +01:00
Sefa Eyeoglu
52ccf3d93b
Merge pull request #1857 from Trial97/copy_time 2023-12-11 11:02:12 +01:00
Sefa Eyeoglu
b6a366ed97
Merge pull request #1944 from PrismLauncher/backport-1908-to-release-8.x 2023-12-11 11:00:57 +01:00
DioEgizio
1ba6ed9fe9 chore: update qt to qt 6.6.1
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
(cherry picked from commit eb011e6729)
2023-12-11 10:00:43 +00:00
Sefa Eyeoglu
4c59a1ba1b
Merge pull request #1882 from bit69tream/notify-user-if-tmp-is-noexec 2023-11-28 21:57:23 +01:00
Sefa Eyeoglu
5291268565
Merge pull request #1900 from PrismLauncher/renovate/cachix-install-nix-action-24.x 2023-11-28 21:53:57 +01:00
renovate[bot]
a74c3d57b4
chore(deps): update cachix/install-nix-action action to v24 2023-11-28 20:27:48 +00:00