Rachel Powers
daa5fcce67
Merge pull request #1351 from Trial97/ftb_import
...
fixed substatus on ftb_import
2023-07-16 20:43:16 +02:00
seth
2bcebe2989
Merge pull request #1336 from Ryex/packaging/fix-duplicate-share-directories
...
packaging: fix duplicate share directories (use only lowercase)
2023-07-16 20:43:15 +02:00
Sefa Eyeoglu
27f6debdaf
Merge pull request #1306 from Ryex/ci/address-sanitiser_on_debug_builds
2023-07-16 20:43:15 +02:00
seth
7926170073
Merge pull request #1335 from Ryex/fix/gh-1322-old-zip-mods-in-wrong-place
...
fix(flame install): don't assume .zip is a resource pack. default to mod
2023-07-16 20:43:15 +02:00
Rachel Powers
79537f2948
Merge pull request #1352 from Trial97/crash_after_abort
...
Do not reset shared pointer if it's already empty
2023-07-16 20:43:15 +02:00
Tayou
2b3021b7c2
Merge pull request #1345 from Trial97/time2
...
feat:Added option to use system locale
2023-07-16 20:43:15 +02:00
Rachel Powers
b11b86e026
Merge pull request #1350 from Trial97/fix_managed_pack_crash
...
fixed crash if no version is loaded on managed page
2023-07-16 20:43:15 +02:00
Sefa Eyeoglu
a0ddd85b32
Merge pull request #1333 from Ryex/fix/null_instance_edit_crash
2023-07-16 20:43:15 +02:00
seth
6f86e8b66e
Merge pull request #1331 from TheKodeToad/hungry-trash
...
Fix updating trashing resources
2023-07-16 20:43:15 +02:00
Rachel Powers
6cd259becd
Merge pull request #1337 from getchoo/fix-flake-workflow
...
fix(actions): give update-flake content write perms
2023-07-16 20:43:10 +02:00
Rachel Powers
d9de326f22
Merge pull request #1321 from TheKodeToad/mr-optional
...
Optional mods in mrpack export
2023-07-16 20:43:02 +02:00
seth
1d4cf0fd03
Merge pull request #1329 from Ryex/fix/progress_dialog_centering
...
fix(progress dialog): if there is a parent center on creation
2023-07-16 20:43:02 +02:00
Rachel Powers
a65e4af365
Merge pull request #1302 from Ryex/fix/progress-dialog-segfault
...
fix: segfault in progress dialog
2023-07-16 20:43:02 +02:00
seth
721ac015f3
Merge pull request #1325 from Scrumplex/validate-meta-url
...
Validate Meta URL
2023-07-16 20:42:55 +02:00
seth
c5572a5e0b
Merge pull request #1310 from getchoo/autoupdate-flake
...
feat(actions): add update-flake-lock
2023-07-16 20:42:49 +02:00
Sefa Eyeoglu
81757717f7
Merge pull request #1284 from Ryex/fix/properly-track-failed-copies-and-clones
2023-07-16 20:42:48 +02:00
seth
1ab35357e9
Merge pull request #1304 from Scrumplex/chore-flake-update-1
...
flake.lock: Update
2023-07-16 20:42:48 +02:00
Tayou
7025f75903
Merge pull request #1127 from Trial97/scale_cat
2023-07-16 20:42:48 +02:00
TheKodeToad
3cc68fcea4
Merge pull request #1232 from telans/screenshots-update
...
ScreenshotsPage fixes
2023-07-16 20:42:48 +02:00
Sefa Eyeoglu
34be098f12
Merge pull request #1298 from TurboWafflz/develop
2023-07-16 20:42:48 +02:00
seth
fb5655085f
Merge pull request #1292 from Trial97/export5
...
Removed logs from instance export
2023-07-16 20:42:48 +02:00
Sefa Eyeoglu
316ef9b725
Merge pull request #1266 from TheKodeToad/smol-tweaks
2023-07-16 20:42:48 +02:00
seth
5fdbc9d75e
Merge pull request #1280 from Trial97/shortcut
...
Fixed illegal characters in shortcuts name
2023-07-16 20:42:48 +02:00
seth
6464127d05
Merge pull request #1281 from Trial97/screenshot
...
Added more information to the screenshot upload warning
2023-07-16 20:42:48 +02:00
TheKodeToad
c349eff522
Merge pull request #1277 from Trial97/remove_mojang
...
Removed unused files
2023-07-16 20:42:47 +02:00
Sefa Eyeoglu
5fdf73a2ff
Merge pull request #1274 from TheKodeToad/java-signature
2023-07-16 20:42:47 +02:00
Sefa Eyeoglu
6963bfc6c9
Merge pull request #1275 from Scrumplex/git-blame-ignore
2023-07-16 20:42:47 +02:00
Sefa Eyeoglu
a25a5a7c9f
Merge pull request #1065 from leo78913/gamescope-close-button
2023-07-16 20:42:47 +02:00
Sefa Eyeoglu
20e9bf0e11
Merge pull request #1261 from telans/modrinthexport-url
2023-07-16 20:42:26 +02:00
Rachel Powers
21ccf47ea7
Merge pull request #1255 from Trial97/export4
...
Added Thumbs.db to excluded files in MrPackExport
2023-07-16 20:42:26 +02:00
Rachel Powers
6856c2f922
Merge pull request #1259 from PrismLauncher/update-devs
...
Update developers
2023-07-16 20:42:26 +02:00
TheKodeToad
e52fd9d4fe
Merge pull request #1256 from Trial97/fix11
...
Fixed hashers
2023-07-16 20:42:25 +02:00
Rachel Powers
05056e1abf
Merge pull request #1200 from Trial97/net_job_crash
...
Made ByteSynkArray to use shared_ptr
2023-07-16 20:42:25 +02:00
seth
9df3c5d3c0
Merge pull request #1251 from getchoo/github-clarify
...
chore: add 'suggest a feature' message in help
2023-07-16 20:42:25 +02:00
seth
1a4ea3b1cd
Merge pull request #1252 from getchoo/import-hehe
...
chore: avoid confusion in file/url import dialog
2023-07-16 20:42:25 +02:00
Tayou
0a7a7d9bfd
Merge pull request #1235 from ChrisLane/java-check-debug-msg-fix
2023-07-16 20:42:25 +02:00
Sefa Eyeoglu
8b017f9a5f
Merge pull request #1243 from Trial97/export
...
Added regex expresion to exclude .DS_Store files
2023-07-16 20:42:25 +02:00
TheKodeToad
b1fe4d1d93
Merge pull request #1228 from Trial97/curent_pack_crash
...
Fixes #1212
2023-07-16 20:42:25 +02:00
DioEgizio
80463f9761
Merge pull request #1231 from telans/modrinth-default-icon
...
Modrinth: use default icon for non-managed packs
2023-07-16 20:42:25 +02:00
TheKodeToad
567af5b22d
Merge pull request #1233 from p2js/ui-consistency-fix
...
Remove inconsistent/unneeded question marks in UI
2023-07-16 20:42:24 +02:00
seth
7ed15b2687
Merge pull request #1214 from PrismLauncher/renovate/cachix-install-nix-action-22.x
...
chore(deps): update cachix/install-nix-action action to v22
2023-07-16 20:42:24 +02:00
Sefa Eyeoglu
3d502b12a9
Merge pull request #1224 from DioEgizio/add-appstream
2023-07-16 19:59:30 +02:00
seth
f0d1df9139
Merge pull request #1210 from getchoo/opengl-appimage
...
fix(appimage): bundle generic opengl lib
2023-07-16 19:59:30 +02:00
Sefa Eyeoglu
0fcaa336dc
Merge pull request #1377 from PrismLauncher/backport-1184-to-release-7.x
2023-07-16 19:55:45 +02:00
clickdevin
949da6b50e
Fix bugs when updating curseforge modpacks
...
Signed-off-by: clickdevin <git@clickdevin.me>
(cherry picked from commit d4f2059b78
)
2023-07-16 17:55:05 +00:00
Sefa Eyeoglu
fd0ba70080
Merge pull request #1376 from PrismLauncher/backport-1234-to-release-7.x
2023-07-16 19:52:08 +02:00
Jakub Wroński
89dd981dd7
Fix compiling on FreeBSD
...
Signed-off-by: Jakub Wroński <kubawronski161@gmail.com>
(cherry picked from commit a32a3e25ad
)
2023-07-16 17:51:53 +00:00
Sefa Eyeoglu
30fda57c64
Merge pull request #1375 from PrismLauncher/backport-1218-to-release-7.x
2023-07-16 19:49:45 +02:00
flow
1d75c58d6c
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>
(cherry picked from commit 2d00a727f6
)
2023-07-16 17:49:15 +00:00
Sefa Eyeoglu
34d80a8c75
Merge pull request #1181 from DioEgizio/bump-7.1
2023-06-16 13:07:25 +02:00