TysonTheEmber/configurablewaterlogging
1
0
Fork 1
Code Issues 1 Pull requests 1 Projects Releases Packages Activity Actions

1.21.1-neo #2

Open
murphy-slaw wants to merge 4 commits from murphy-slaw/configurablewaterlogging:1.21.1-neo into master
pull from: murphy-slaw/configurablewaterlogging:1.21.1-neo
merge into: TysonTheEmber:master
Conversation 0 Commits 4 Files changed 15 +437 -469
murphy-slaw commented 2026-06-19 15:30:18 -06:00
First-time contributor
Copy link

Port to Neoforge on MC 1.21.1

Port to Neoforge on MC 1.21.1
This pull request can be merged automatically.
You are not authorized to merge this pull request.
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u 1.21.1-neo:murphy-slaw-1.21.1-neo
git switch murphy-slaw-1.21.1-neo

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 master
git merge --no-ff murphy-slaw-1.21.1-neo
git switch murphy-slaw-1.21.1-neo
git rebase master
git switch master
git merge --ff-only murphy-slaw-1.21.1-neo
git switch murphy-slaw-1.21.1-neo
git rebase master
git switch master
git merge --no-ff murphy-slaw-1.21.1-neo
git switch master
git merge --squash murphy-slaw-1.21.1-neo
git switch master
git merge --ff-only murphy-slaw-1.21.1-neo
git switch master
git merge murphy-slaw-1.21.1-neo
git push origin master
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
bug
Something isn't working

  
documentation
Improvements or additions to documentation

  
duplicate
This issue or pull request already exists

  
enhancement
New feature or request

  
good first issue
Good for newcomers

  
help wanted
Extra attention is needed

  
invalid
This doesn't seem right

  
question
Further information is requested

  
wontfix
This will not be worked on

No labels
bug
documentation
duplicate
enhancement
good first issue
help wanted
invalid
question
wontfix
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
TysonTheEmber/configurablewaterlogging!2
No description provided.