Offhand rendering issue fix #435

Open
FSang18 wants to merge 1 commit from FSang18/Palladium:fsang18-offhand-render into 26.1/dev
Contributor
No description provided.
This pull request has changes conflicting with the target branch.
  • src/main/java/net/threetag/palladium/client/renderer/entity/layer/pack/DefaultPackRenderLayer.java
View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u fsang18-offhand-render:FSang18-fsang18-offhand-render
git switch FSang18-fsang18-offhand-render

Merge

Merge the changes and update on Forgejo.
git switch 26.1/dev
git merge --no-ff FSang18-fsang18-offhand-render
git switch FSang18-fsang18-offhand-render
git rebase 26.1/dev
git switch 26.1/dev
git merge --ff-only FSang18-fsang18-offhand-render
git switch FSang18-fsang18-offhand-render
git rebase 26.1/dev
git switch 26.1/dev
git merge --no-ff FSang18-fsang18-offhand-render
git switch 26.1/dev
git merge --squash FSang18-fsang18-offhand-render
git switch 26.1/dev
git merge --ff-only FSang18-fsang18-offhand-render
git switch 26.1/dev
git merge FSang18-fsang18-offhand-render
git push origin 26.1/dev
Sign in to join this conversation.
No reviewers
No milestone
No project
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
ThreeTAG/Palladium!435
No description provided.