Commit Graph

5450 Commits

Author SHA1 Message Date
Sefa Eyeoglu
39bba9cbfa
Merge pull request #815 from Scrumplex/fix-funny 2023-02-03 18:44:33 +01:00
Sefa Eyeoglu
104c231740
Merge pull request #816 from Scrumplex/bump-6.3 2023-02-03 18:44:13 +01:00
Sefa Eyeoglu
bc376b22c7
chore: bump to 6.3
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-02-03 18:40:10 +01:00
Sefa Eyeoglu
54e03d602f
Merge pull request #813 from Scrumplex/bump-6.2 2023-02-03 17:07:48 +01:00
Sefa Eyeoglu
d8a84d2aa3
chore: bump to 6.2
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-02-03 10:58:22 +01:00
flow
a7ff74365d
Merge pull request #804 from flowln/improve_big_concurrent_task_test 2023-02-03 10:57:21 +01:00
flow
68c884f20d
Merge pull request #810 from flowln/error_on_bad_file_paths_as_we_should_catquake 2023-02-03 10:49:17 +01:00
flow
b7e96bdf62
Merge pull request #779 from TheLastRar/zlib-undo-rename 2023-02-02 15:17:16 +01:00
Sefa Eyeoglu
16b48866f4
Merge pull request #784 from flowln/fix_resource_folder_double_smart_ptrs 2023-02-02 15:17:16 +01:00
flow
4827f7e317
Merge pull request #781 from Ryex/patch-1 2023-02-02 15:17:16 +01:00
Sefa Eyeoglu
92f6a34624
Merge pull request #758 from flowln/fix_process_events_backstab 2023-02-02 15:17:16 +01:00
Sefa Eyeoglu
c5ce8bfb3e
Merge pull request #772 from TheLastRar/zlib-fallback-bundled-fix
Fix: zlib fallback not working
2023-02-02 15:17:15 +01:00
Sefa Eyeoglu
6429088472
Merge pull request #746 from RaptaG/patch-1 2023-02-02 15:17:15 +01:00
flow
bf9885dd7e
Merge pull request #743 from flowln/fix_mods_with_wrong_modListVersion 2023-02-02 15:17:15 +01:00
Sefa Eyeoglu
d16b6fe634
Merge pull request #732 from DioEgizio/actually-fix-openssl3-mac-failures 2023-02-02 15:17:15 +01:00
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 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 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