update modpack to v5.5.0 #10

Open

cheesec4ke wants to merge 3 commits from v5.5.0 into main

cheesec4ke commented

2026-04-21 05:21:42 +00:00

(Migrated from github.com)

No description provided.

MrN0pe (Migrated from github.com) reviewed

2026-04-22 05:46:21 +00:00

MrN0pe (Migrated from github.com) left a comment

it good

MrN0pe (Migrated from github.com) reviewed

2026-04-22 05:46:35 +00:00

This pull request has changes conflicting with the target branch.

forgeserver.nix

View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Merge commit title

Merge pull request 'update modpack to v5.5.0' (#10) from v5.5.0 into main

Merge commit body

Reviewed-on: https://git.ps2.dev/painandsuffering2electricboogaloo/forgeserver/pulls/10

Merge pull request 'update modpack to v5.5.0' (#10) from v5.5.0 into main

Reviewed-on: https://git.ps2.dev/painandsuffering2electricboogaloo/forgeserver/pulls/10

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u origin v5.5.0:v5.5.0

git switch v5.5.0

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch main

git merge --no-ff v5.5.0

git switch v5.5.0

git rebase main

git switch main

git merge --ff-only v5.5.0

git switch v5.5.0

git rebase main

git switch main

git merge --no-ff v5.5.0

git switch main

git merge --squash v5.5.0