Skip to content

[pull] develop from PrismLauncher:develop#13

Open
pull[bot] wants to merge 3303 commits into
EvilToasterDBU:developfrom
PrismLauncher:develop
Open

[pull] develop from PrismLauncher:develop#13
pull[bot] wants to merge 3303 commits into
EvilToasterDBU:developfrom
PrismLauncher:develop

Conversation

@pull
Copy link
Copy Markdown

@pull pull Bot commented Dec 18, 2024 •
edited
Loading

See Commits and Changes for more details.

Created by pull[bot] (v2.0.0-alpha.4)

Can you help keep this open source service alive? 💖 Please sponsor : )

@pull pull Bot added ⤵️ pull merge-conflict Resolve conflicts manually labels Dec 18, 2024
DioEgizio and others added 28 commits March 20, 2026 17:52
@DioEgizio
fix: only enable fortify on optimized builds (#5223)
2514c8b
@Ryex
Sort modpack versions properly (#5170)
26a2b35
@Ryex
handle mod formatting codes (#4550)
d0705a9
@Ryex
Overwrite component update task when it has different network mode (#…
731866c 
…5216)
@Ryex
fix: allow disabling gl and vulkan features with an envvar and disabl…
2f62b8e 
…e it by default on appimage/portable (#5224)
@Trial97
feat: ibm semeru runtime open edition support (openj9 jvm) (#5138)
39bb912
@DioEgizio
Add CLI option to open main window when launching instance (#5107)
03543a0
@getchoo
build(cmake): avoid re-defining _FORTIFY_SOURCE
e9fab9a 
Previously, applying this to anything except the default `Debug` build
configuration opened us up to issues with packaging systems (i.e.,
Arch's `makepkg` and Flatpak) who already define this OOTB. Specifically
matching the configurations we want to apply this to and checking if this
is applied globally by `$CFLAGS` or similar should prevent this
re-definition, restoring the behavior from before 8477cc4 and 5d0eeae

Signed-off-by: Seth Flynn <getchoo@tuta.io>
@getchoo
build(cmake): avoid re-defining _FORTIFY_SOURCE (#5228)
eed06a7
@github-actions
chore(nix): update lockfile
d43c213 
Flake lock file updates:

• Updated input 'nixpkgs':
    'https://releases.nixos.org/nixos/25.11/nixos-25.11.7516.3e20095fe3c6/nixexprs.tar.xz?narHash=sha256-C/pSy3nRByzeKFcdtv4pNc8uYuT02pBdQB4BE3knKus%3D' (2026-03-13)
  → 'https://releases.nixos.org/nixos/25.11/nixos-25.11.7849.812b3986fd15/nixexprs.tar.xz?narHash=sha256-d2Q5VNbc91GloTZNByC4u3JS8Tj5BjfuOF19/vuJ/iM%3D' (2026-03-20)
@Ryex
Update update-flake.yml with new labels
988ec79 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
@Ryex
add priority label
0daf466 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
@Trial97
chore(nix): update lockfile (#5230)
09823db
@Octol1ttle
fix: log error if file open/commit fails
838687f 
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
@Ryex
add robot type label
f0f26bb 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
@Trial97
rate limit the FTB mod downloads
5136c15 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
@DioEgizio
rate limit the FTB mod downloads (#5237)
e90ecda
@Trial97
do not delete mod on cancel
3a65ed4 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
@Trial97
Update update-flake.yml with new labels (#5231)
6c6dc55
@Trial97
Log error if file open/commit fails (#5235)
f91accd
@TayouVR
make OpenJ9 logo square
19eba5c 
Signed-off-by: Tayou <git@tayou.org>
@timoreo22
make OpenJ9 logo square (#5240)
c16a25f
@Trial97
Revert "Sort modpack entries by version, rather than publishing date"
6674f1e 
This reverts commit 9e3893f.

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
@Octol1ttle
feat: warn user on launch if there is not enough available RAM
69fe3e3 
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
@Octol1ttle
change: enable automatic update checking by default
b3fa99d 
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
@TheKodeToad @Octol1ttle
Backport new NetJob failure dialog from Octol1ttle's libcurl PR
e6d7e5c 
Co-authored-by: Octol1ttle <l1ttleofficial@outlook.com>
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
@TheKodeToad @Octol1ttle
My tweaks
4bc72cc 
Use a tree view instead of table view, remove toggle button (janky)

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
@TheKodeToad @Octol1ttle
Safer dialog
7bb746d 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
Trial97 and others added 30 commits May 9, 2026 21:07
@Trial97
Suppress sfinae-incomplete warning (#5523)
d146972
@TayouVR
Fixes to translations (#5512)
0fee295
@Octol1ttle
change: enable automatically enabling automatic merging on backport PRs
d741b40 
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
@Trial97
Don't delete base directories when evicting metacache (#5513)
ecc551b
@Octol1ttle
fix: do not open account select dialog if there are no valid accounts
d6db750 
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
@TayouVR
Do not open account select dialog if there are no accounts (#5535)
8d89514
@Trial97
Enable automatically enabling automatic merging on backport PRs (#5534)
323c25d
@getchoo
revert: "change: enable automatically enabling automatic merging on b…
40824a1 
…ackport PRs"

Refs: d741b40
Signed-off-by: Seth Flynn <getchoo@tuta.io>
@Trial97
clang-tidy: clang-analyzer-*
6699d3e 
This commit aims to fix all clang-analyzer-* warnings from clang-tidy.
Here is the list of the ones found in project:
    "clang-analyzer-core.uninitialized.UndefReturn",
    "clang-analyzer-deadcode.DeadStores",
    "clang-analyzer-optin.core.EnumCastOutOfRange",
Some exceptions:
  clang-analyzer-cplusplus.NewDeleteLeaks -> may need to disable it as
is a false positive
  clang-analyzer-optin.cplusplus.VirtualCall -> may need to disable it
(or refactor a bunch of code to drop the virtual from those functions)

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
@Octol1ttle
fix offline accounts not being refreshed during launch
bc1f9db 
Closes #5435
Closes #5537

Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
@mctaylors
change(bug_report.yml): use input type where short answer is preferred
558e5bc 
Signed-off-by: mctaylors <95250141+mctaylors@users.noreply.github.com>
@Scrumplex
flake.lock: Update
8a7b17f 
Flake lock file updates:

• Updated input 'nixpkgs':
    'https://releases.nixos.org/nixos/unstable/nixos-26.05pre990025.15f4ee454b1d/nixexprs.tar.xz?narHash=sha256-fN6ynMvcdwPDB09LpWJNO5ogu%2BHFydrBWXJywoI/NNg%3D' (2026-04-30)
  → 'https://releases.nixos.org/nixos/unstable/nixos-26.05pre995699.da5ad661ba4e/nixexprs.tar.xz?narHash=sha256-rNDJzV2JTV5SUTwv1cgKZYMdyoUYU9/YfegSaUf3QfY%3D' (2026-05-10)

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
@getchoo
change(bug_report.yml): use input type where short answer is preferred (
de60d80 
#5544)
@Scrumplex
fix(nix): switch to KF6 ECM
8ba5444 
The override can be removed after
NixOS/nixpkgs#518987 reaches nixos-unstable

See NixOS/nixpkgs#513691

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
@Octol1ttle
fix renovate using old label
f4567bc 
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
@Octol1ttle
feat(instance logs): log components
547b4c0 
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
@TayouVR
Log components in instance logs (#5560)
43c11a8
@renovate
chore(deps): update cachix/install-nix-action digest to 8aa0397
61cdabd
@renovate
chore(deps): update korthout/backport-action action to v4.5
d4d032a
@Trial97
chore(deps): update cachix/install-nix-action digest to 8aa0397 (#5469)
22bfe06
@Scrumplex
revert: "change: enable automatically enabling automatic merging on b…
d7fc7fd 
…ackport PRs" (#5540)
@Scrumplex
Fix offline accounts not being refreshed during launch (#5542)
23c34f4
@Scrumplex
clang-tidy: clang-analyzer-* (#5103)
64abd37
@getchoo
fix(nix): switch to KF6 ECM (#5545)
a80995a
@Scrumplex
chore(deps): update korthout/backport-action action to v4.5 (#5466)
f67a670
@getchoo
fix renovate using old label (#5549)
f5d7e76
@renovate
chore(deps): update azure/artifact-signing-action action to v2
2bf64ef
@renovate
chore(deps): update determinatesystems/magic-nix-cache-action action …
9929118 
…to v14
@Trial97
chore(deps): update azure/artifact-signing-action action to v2 (#5547)
cc466b4
@getchoo
chore(deps): update determinatesystems/magic-nix-cache-action action …
bf8d1ca 
…to v14 (#5606)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

⤵️ pull merge-conflict Resolve conflicts manually

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.