Rachel Powers
046d510134
Merge pull request #1200 from Trial97/net_job_crash
...
Made ByteSynkArray to use shared_ptr
2023-06-23 09:13:52 -07:00
Trial97
85bbab0e92
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into net_job_crash
2023-06-23 14:38:30 +03:00
Trial97
67db141203
Renamed getResults to resultsReady
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-06-23 14:38:23 +03:00
seth
8df5ab8aa7
Merge pull request #1251 from getchoo/github-clarify
...
chore: add 'suggest a feature' message in help
2023-06-22 17:13:00 -04:00
seth
83efdccfe1
Merge pull request #1252 from getchoo/import-hehe
...
chore: avoid confusion in file/url import dialog
2023-06-22 17:12:35 -04:00
Rachel Powers
f1ebec641a
Merge pull request #1058 from Ryex/feature/images-for-resource-page
...
Feature: image coumn for Mod, Resource Pack, and Texturepack pages
2023-06-22 13:26:47 -07:00
seth
a4521ac0bb
chore: avoid confusion in file/url import dialog
...
Signed-off-by: seth <getchoo@tuta.io>
2023-06-22 16:15:03 -04:00
Tayou
c5f16276d7
Merge pull request #1235 from ChrisLane/java-check-debug-msg-fix
2023-06-22 22:03:30 +02:00
seth
03361e51ef
chore: add 'suggest a feature' message in help
...
Signed-off-by: seth <getchoo@tuta.io>
2023-06-22 15:58:53 -04:00
Sefa Eyeoglu
05a8232a8f
Merge pull request #1243 from Trial97/export
...
Added regex expresion to exclude .DS_Store files
2023-06-22 08:09:31 +02:00
Trial97
2e82c1d40c
Added regex expresion to exclude .DS_Store files
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-06-21 23:22:25 +03:00
TheKodeToad
0975dbc3dd
Merge pull request #1228 from Trial97/curent_pack_crash
...
Fixes #1212
2023-06-21 15:35:09 +01:00
DioEgizio
8aa02320e0
Merge pull request #1231 from telans/modrinth-default-icon
...
Modrinth: use default icon for non-managed packs
2023-06-21 12:25:26 +02:00
Rachel Powers
470518eb3a
fix: resize columns on hide ^& uniform heights
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-06-21 02:31:40 -07:00
seth
ca659136e2
Merge pull request #1119 from Trial97/mods_txt
...
Added dynamic page extra info
2023-06-20 19:56:38 -04:00
seth
f1a6dc5332
Merge pull request #1184 from clickdevin/develop
...
Fix bugs when updating curseforge modpacks
2023-06-20 19:55:48 -04:00
seth
4eaa7dc8b1
Merge pull request #1234 from Szowisz/develop
...
Fix compiling on FreeBSD
2023-06-20 19:55:03 -04:00
Chris Lane
9ad29e8d85
Remove extra spaces in one more Java checker debug
...
Signed-off-by: Chris Lane <git@chrislane.com>
2023-06-20 15:51:31 +01:00
Chris Lane
07f3d27fb8
Clean up 'Running java checker' debug msg code
...
Signed-off-by: Chris Lane <git@chrislane.com>
2023-06-20 15:36:25 +01:00
Chris Lane
f2692e60f3
Add missing space in java checker debug message
...
Signed-off-by: Chris Lane <git@chrislane.com>
2023-06-20 12:44:44 +01:00
James Beddek
009623823d
Modrinth: use default icon for non-managed packs
...
Fixes : #317
Signed-off-by: James Beddek <telans@posteo.de>
2023-06-20 23:00:13 +12:00
Jakub Wroński
a32a3e25ad
Fix compiling on FreeBSD
...
Signed-off-by: Jakub Wroński <kubawronski161@gmail.com>
2023-06-20 12:59:47 +02:00
TheKodeToad
3c648ff9fd
Merge pull request #1233 from p2js/ui-consistency-fix
...
Remove inconsistent/unneeded question marks in UI
2023-06-20 11:05:26 +01:00
Alfio
f769b0b4c6
Remove inconsistent/unneeded question marks in UI
...
Signed-off-by: P2 <tomarchioalfio5@gmail.com>
2023-06-20 10:40:27 +02:00
Trial97
d02858040e
Fixes #1212
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-06-19 13:09:37 +03:00
Trial97
3ee0fec729
Removed mods from lambda
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-06-19 12:22:22 +03:00
Trial97
ec063470d7
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into mods_txt
2023-06-19 12:20:50 +03:00
Trial97
b2ed2bf810
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into net_job_crash
2023-06-19 12:01:35 +03:00
Sefa Eyeoglu
af6bf11793
Merge pull request #1224 from DioEgizio/add-appstream
2023-06-19 09:35:56 +02:00
DioEgizio
d5b5f0503c
chore: change xml name to what linuxdeploy wants
...
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
2023-06-19 09:17:15 +02:00
DioEgizio
555cb40efd
chore: install appstream in appimage
...
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
2023-06-19 09:17:15 +02:00
seth
9d22fce53f
Merge pull request #1214 from PrismLauncher/renovate/cachix-install-nix-action-22.x
...
chore(deps): update cachix/install-nix-action action to v22
2023-06-18 22:06:47 -04:00
seth
aee0999daa
Merge pull request #1210 from getchoo/opengl-appimage
...
fix(appimage): bundle generic opengl lib
2023-06-18 22:06:03 -04:00
Trial97
4e66f55d84
Removed extra headers
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-06-18 23:32:17 +03:00
Trial97
6826f1d605
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into net_job_crash
2023-06-18 23:27:41 +03:00
Trial97
0161520b33
Fixed leaks
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-06-18 23:27:26 +03:00
Sefa Eyeoglu
12cd8a7bea
Merge pull request #1218 from flowln/bad_commit_string_in_bundled_package
...
Hide the Git commit entry on the About dialog when the build doesn't have git stuff support
2023-06-17 18:04:54 +02:00
flow
2d00a727f6
fix: hide git commit when the build doesn't have git stuff support
...
This fixes the Git commit string being "GITDIR-NOTFOUND" on the About
page when building a package from the bundled source archive.
Signed-off-by: flow <flowlnlnln@gmail.com>
2023-06-17 11:09:05 -03:00
renovate[bot]
b123f4f948
chore(deps): update cachix/install-nix-action action to v22
2023-06-16 21:58:32 +00:00
seth
fd9a8d1551
Merge pull request #1110 from TheKodeToad/version-search
...
Add a search bar to version lists
2023-06-16 14:47:39 -04:00
seth
6bc1150ad0
Merge pull request #1187 from getchoo/rel-8.0
...
chore: bump to 8.0
2023-06-16 14:46:25 -04:00
seth
45cce1d19a
fix(appimage): bundle generic opengl lib
...
Signed-off-by: seth <getchoo@tuta.io>
2023-06-16 14:34:44 -04:00
DioEgizio
412349ac58
Merge pull request #1135 from Trial97/installed_mods
2023-06-16 09:56:51 +02:00
Sefa Eyeoglu
000f4386a2
Merge pull request #1192 from Trial97/pre-lauch
2023-06-16 09:46:24 +02:00
Sefa Eyeoglu
5d3329b1ef
Merge pull request #1198 from TheKodeToad/remove-a-space
2023-06-16 09:42:41 +02:00
Trial97
147366bc0a
Made ByteSynkArray to use shared_ptr
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-06-15 22:59:41 +03:00
TheKodeToad
13804f80de
Fix trailing space in instance name
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-06-15 16:37:03 +01:00
Trial97
1d354df1f8
Fix tests for window
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-06-15 16:51:58 +03:00
Trial97
1b42b9a08e
Fixed tests
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-06-15 14:25:58 +03:00
Trial97
535fb2c4d6
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into pre-lauch
2023-06-15 14:13:30 +03:00