master #15

Open

tekkitdooood wants to merge 6 commits from tekkitdooood/codmod:master into master

pull from: tekkitdooood/codmod:master

merge into: MC3699:master

MC3699:master

Conversation 1 Commits 6 Files changed 51 +2307 -250

tekkitdooood commented 2026-02-03 08:24:59 -06:00

Contributor

Copy link

been busy huh yzir

been busy huh yzir

tekkitdooood added 4 commits 2026-02-03 08:25:00 -06:00

some guys gay little boom sword thing 570b0b76a6

skaven spear for moth dba51b5780

the farter has arrived caeec8e5a9

the farter has arrived 505da385d9

tekkitdooood reviewed 2026-02-03 08:32:45 -06:00

tekkitdooood left a comment

Author

Contributor

Copy link

spoke with the guy who made this he a real one on god for true i give him a pass

spoke with the guy who made this he a real one on god for true i give him a pass

tekkitdooood added 1 commit 2026-03-06 08:14:29 -06:00

control rontrod c2588ac379

tekkitdooood added 1 commit 2026-03-10 20:45:53 -05:00

toasted chee bd294fd8f0

This pull request has changes conflicting with the target branch.

• src/generated/resources/assets/codmod/lang/en_ud.json
• src/generated/resources/assets/codmod/lang/en_us.json
• src/generated/resources/assets/codmod/sounds.json

View command line instructions

Checkout

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

git fetch -u master:tekkitdooood-master

git switch tekkitdooood-master

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 tekkitdooood-master

git switch tekkitdooood-master

git rebase master

git switch master

git merge --ff-only tekkitdooood-master

git switch tekkitdooood-master

git rebase master

git switch master

git merge --no-ff tekkitdooood-master

git switch master

git merge --squash tekkitdooood-master

git switch master

git merge --ff-only tekkitdooood-master

git switch master

git merge tekkitdooood-master

git push origin master

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels

No items

No labels

Milestone

Clear milestone

No items

No milestone

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

1 participant

Notifications

Subscribe

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

MC3699/codmod!15

No description provided.