CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,435 Commits 10 Branches 30 Tags
4539d58d7d81879678cf959fa46302acaa9a686e
Commit Graph

5435 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sefa Eyeoglu
4539d58d7d Merge pull request #731 from flowln/windows_server_trash 2023-02-02 15:17:15 +01:00
Sefa Eyeoglu
a8611a56fc Merge pull request #726 from TheLastRar/qt6-win-darkmode 
Closes https://github.com/PrismLauncher/PrismLauncher/issues/158
 2023-02-02 15:17:15 +01:00
flow
c3d64aa984 Merge pull request #716 from DioEgizio/qt6.4.2-winmsvc 
closes https://github.com/PrismLauncher/PrismLauncher/issues/288
 2023-02-02 15:17:15 +01:00
Sefa Eyeoglu
3fc63fa196 Merge pull request #710 from byquanton/develop 
Fixes https://github.com/PrismLauncher/PrismLauncher/issues/708
 2023-02-02 15:17:15 +01:00
flow
4438684ce6 Merge pull request #713 from redstrate/fix-html-rendering 2023-02-02 15:17:14 +01:00
flow
699fce4482 Merge pull request #684 from Scrumplex/logging-categories 
Prevents private credentials from leaking in the logs of general users
 2023-02-02 15:17:14 +01:00
Sefa Eyeoglu
49060beae7 Merge pull request #680 from AshtakaOOf/flathub-screenshots 2023-02-02 15:17:14 +01:00
flow
de561e4fd3 Merge pull request #666 from getchoo/pls-scrump 
scrump heard your pleads, rejoice!
 2023-02-02 15:17:14 +01:00
flow
1de301752f Merge pull request #665 from flowln/logging_categories 2023-02-02 15:17:10 +01:00
Sefa Eyeoglu
cb8c389303 Merge pull request #648 from Scrumplex/bump-6.1 6.1 2022-12-19 16:45:02 +01:00
Sefa Eyeoglu
e1e0166c95 Merge pull request #649 from Scrumplex/fix-winget-release-no9999999 2022-12-19 16:38:13 +01:00
Sefa Eyeoglu
6f8e1ccf89 chore: bump to 6.1 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-12-19 16:11:10 +01:00
Sefa Eyeoglu
3751856a4e Merge pull request #647 from Scrumplex/update-flake 2022-12-19 16:10:14 +01:00
Sefa Eyeoglu
5203e72199 Merge pull request #628 from flowln/fix_multiple_resource_packs_crash 
Fixes https://github.com/PrismLauncher/PrismLauncher/issues/624
 2022-12-19 15:36:51 +01:00
Sefa Eyeoglu
3b1ab3c974 Merge pull request #642 from DioEgizio/dont-ship-unnecessary-tlsbackends 
fix: exclude unused tls backends
 2022-12-18 17:46:58 +01:00
Sefa Eyeoglu
3476bbebd9 Merge pull request #636 from flowln/fix_component_version_when_updating 
Correctly set component versions in Modrinth pack updating
 2022-12-17 18:20:41 +01:00
flow
45870497c6 Merge pull request #630 from leo78913/yeet-scrollbars 2022-12-17 18:20:41 +01:00
flow
bcf506488f Merge pull request #631 from getchoo/better-msvc-flags 2022-12-17 15:19:42 +01:00
flow
040774d67b Merge pull request #607 from flowln/dont_crash_on_zip_import 
Fixes https://github.com/PrismLauncher/PrismLauncher/issues/609
 2022-12-16 18:05:35 +01:00
flow
94410352f5 Merge pull request #625 from Edgars-Cirulis/develop 2022-12-15 17:29:52 +01:00
Sefa Eyeoglu
2a819f1ca0 Merge pull request #593 from Scrumplex/fix-winget-release-no999999 2022-12-15 16:36:26 +01:00
flow
25c63dd1e0 Merge pull request #605 from flowln/fix_crash_in_downloader_image 
Fixes https://github.com/PrismLauncher/PrismLauncher/issues/590
 2022-12-15 16:36:20 +01:00
Sefa Eyeoglu
d7223972d8 Merge pull request #612 from DioEgizio/move-cat-right 
closes https://github.com/PrismLauncher/PrismLauncher/issues/611
 2022-12-14 13:05:22 +01:00
flow
0a6c1238eb Merge pull request #601 from Scrumplex/fix-translations-3 2022-12-14 13:05:22 +01:00
Sefa Eyeoglu
c11575f5f5 Merge pull request #604 from flowln/fix_crash_with_gtk2 
fix: crash with GTK2 theme due to QProxyStyle in ManagedPackPage
 2022-12-13 11:09:00 +01:00
flow
783761ca2e Merge pull request #600 from TheLastRar/reset-stylesheet 
Resolves https://github.com/PrismLauncher/PrismLauncher/issues/510
 2022-12-13 11:09:00 +01:00
flow
15084c8d6d Merge pull request #587 from unascribed/patch/libraries-wording 6.0 2022-12-11 16:57:45 -08:00
Una
822c5a530e Not all libraries are from Mojang 
Signed-off-by: Una <me@unascribed.com>
 2022-12-11 16:11:32 -08:00
flow
6eb641ae56 Merge pull request #585 from DioEgizio/remove-leftover-todo 2022-12-11 13:02:08 -08:00
DioEgizio
9eb14e6b9b fix: remove leftover TODO 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2022-12-11 20:35:39 +01:00
Sefa Eyeoglu
7cc42269a9 Merge pull request #569 from Jan200101/PR/fix-mangohud 2022-12-11 18:31:05 +01:00
flow
c45442760c Merge pull request #584 from TayouVR/fix-breeze-colors-and-matrix-icon 2022-12-11 09:24:53 -08:00
Tayou
83f0611200 fix breeze icon colors and matrix icon 
Signed-off-by: Tayou <tayou@gmx.net>
 2022-12-11 17:36:05 +01:00
flow
d95625ed88 Merge pull request #486 from flowln/wide_bar_customization 2022-12-11 04:16:45 -08:00
flow
5622bcc563 Merge pull request #461 from flowln/fix_big_resource_pack_imgs 
Fixes https://github.com/PrismLauncher/PrismLauncher/issues/360
 2022-12-11 04:16:21 -08:00
Jan200101
deb9c98630 chore: replace naive mangohud preload with vklayer detection 
Signed-off-by: Jan200101 <sentrycraft123@gmail.com>
 2022-12-11 11:01:34 +01:00
Jan200101
2c1e887c8d chore: replace naive mangohud detection with vulkan layer detection 
Signed-off-by: Jan200101 <sentrycraft123@gmail.com>
 2022-12-11 11:01:33 +01:00
flow
4a13d72997 Merge pull request #32 from flowln/modpack_update_page 
Closes https://github.com/PrismLauncher/PrismLauncher/issues/180
Closes https://github.com/PrismLauncher/PrismLauncher/issues/170
 2022-12-10 06:34:18 -08:00
Sefa Eyeoglu
590875d022 Merge pull request #575 from Ryex/blockedmods-only-drop-local 
Prevent potental crash if droping non local files in BlockedModsDialog
 2022-12-10 02:46:55 +01:00
Rachel Powers
8f30237765 fix: prevent potental crash if droping non local files 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-12-09 17:21:40 -07:00
flow
cb0339b492 Merge pull request #572 from DioEgizio/breeze-icons-improvements 2022-12-09 04:14:36 -08:00
Sefa Eyeoglu
e427174ff0 Merge pull request #571 from Ryex/blocked-targetFolder 
fix(blockedmods): Track and use targetFolder for blocked files
 2022-12-09 08:33:10 +01:00
DioEgizio
fc4c57f0d9 feat: improve new.svg in breeze icon packs 
makes it better and more similar to the one in legacy

Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2022-12-09 07:49:16 +01:00
flow
9ad4ae5340 Merge pull request #568 from leo78913/flatpak-shortcuts 2022-12-08 17:53:33 -08:00
Rachel Powers
0f48e0fc06 fix(blockedmods): Track and use targetFolder for blocked files 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-12-08 18:42:51 -07:00
leo78913
37ad1b40d8 fix: fix creating instance shortcuts in flatpak 
Signed-off-by: leo78913 <leo3758@riseup.net>
 2022-12-08 20:18:07 -03:00
Jan200101
514e7ae6a0 fix: re-add LD_LIBARY_PATH to mangohud 
Upstream officially supports the use of $LIB/mangohud/

Signed-off-by: Jan200101 <sentrycraft123@gmail.com>
 2022-12-08 23:09:14 +01:00
flow
34230bfcf4 fix: don't try updating Flame instance names when updating versions 
Since the exact version string is only available in the manifest,
there's no easy way of getting it before commiting to the update, so
there's not much of a good way of showing the updated name in the UI,
and using the displayName is weird and gives some buggy behavior.

We may want to re-enable it in the future if we find a reliable way of
showing the correct info on the UI before starting the update.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-07 18:05:46 -03:00
flow
c390e211ee Merge pull request #565 from DioEgizio/shortcut-menu-bar 2022-12-07 12:57:46 -08:00
DioEgizio
b0d69db878 fix: add instance shortcut creation action to menubar 
also moves deleteinstance to the same place as the instance toolbar

Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2022-12-07 16:52:06 +01:00