ThreeTAG/Palladium
ThreeTAG/Palladium
Watch
8
4
Fork
You've already forked Palladium
 9
Code Issues 92 Pull requests 3 Projects Releases Packages Wiki Activity Actions

Added Eye Selection menu #368

Open
codecreality wants to merge 1 commit from codecreality/Palladium:1.20/dev into 1.20/dev
pull from: codecreality/Palladium:1.20/dev
merge into: ThreeTAG:1.20/dev
Conversation 0 Commits 1 Files changed 28 +539 -10
codecreality commented 2026-10-05 22:47:31 +00:00
Contributor
Copy link

Includes eye selection transformer and variable, works with alpha masks
Test pack example

Includes eye selection transformer and variable, works with alpha masks Test pack example
Includes eye selection transformer and variable, works with alpha masks
Test pack example
This pull request has changes conflicting with the target branch.
  • forge/src/generated/resources/.cache/66dc3be8a8ab4f896edc70f08b05ce747aa15c08
  • forge/src/main/java/net/threetag/palladium/data/forge/PalladiumLangProvider.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 1.20/dev:codecreality-1.20/dev
git switch codecreality-1.20/dev

Merge

Merge the changes and update on Forgejo.
git switch 1.20/dev
git merge --no-ff codecreality-1.20/dev
git switch codecreality-1.20/dev
git rebase 1.20/dev
git switch 1.20/dev
git merge --ff-only codecreality-1.20/dev
git switch codecreality-1.20/dev
git rebase 1.20/dev
git switch 1.20/dev
git merge --no-ff codecreality-1.20/dev
git switch 1.20/dev
git merge --squash codecreality-1.20/dev
git switch 1.20/dev
git merge --ff-only codecreality-1.20/dev
git switch 1.20/dev
git merge codecreality-1.20/dev
git push origin 1.20/dev
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
Bug
Bug report

  
Help needed
Extra attention is needed

  
Palladium 4 / 1.20.1
Applies to Palladium 4 (1.20.1)

  
Palladium 5 / 26.1
Applies to 26.1 versions of Palladium

  
Suggestion
No labels
Bug
Help needed
Palladium 4 / 1.20.1
Palladium 5 / 26.1
Suggestion
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
ThreeTAG/Palladium!368
No description provided.