New abilities #248

Open

Alkanphel wants to merge 1 commit from Alkanphel/Palladium:26.1/dev into 26.1/dev

pull from: Alkanphel/Palladium:26.1/dev

merge into: ThreeTAG:26.1/dev

ThreeTAG:1.20/main

ThreeTAG:1.20/dev

ThreeTAG:26.1/dev

ThreeTAG:1.21.10/dev

Conversation 1 Commits 1 Files changed 8 +238 -3

Alkanphel commented 2026-07-31 18:14:32 +00:00

Contributor

Copy link

• Prevent Healing
• Prevent Effects
• Prevent Sprinting

- Prevent Healing - Prevent Effects - Prevent Sprinting

Alkanphel added 1 commit 2026-07-31 18:14:32 +00:00

New abilities: ... 598d27ed9d

- Prevent Healing
- Prevent Effects
- Prevent Sprinting

Lucraft commented 2026-07-31 18:15:32 +00:00

Owner

Copy link

Dont forget the language data gen :P

Dont forget the language data gen :P

Lucraft self-assigned this 2026-07-31 18:15:33 +00:00

This pull request has changes conflicting with the target branch.

• src/main/java/net/threetag/palladium/power/ability/AbilityEventHandler.java

View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Merge commit title Merge pull request 'New abilities' (#248) from Alkanphel/Palladium:26.1/dev into 26.1/dev

Merge commit body Reviewed-on: https://git.threetag.net/ThreeTAG/Palladium/pulls/248

Merge pull request 'New abilities' (#248) from Alkanphel/Palladium:26.1/dev into 26.1/dev Reviewed-on: https://git.threetag.net/ThreeTAG/Palladium/pulls/248 Copy merge commit message

Checkout

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

git fetch -u 26.1/dev:Alkanphel-26.1/dev

git switch Alkanphel-26.1/dev

Merge

Merge the changes and update on Forgejo.

git switch 26.1/dev

git merge --no-ff Alkanphel-26.1/dev

git switch Alkanphel-26.1/dev

git rebase 26.1/dev

git switch 26.1/dev

git merge --ff-only Alkanphel-26.1/dev

git switch Alkanphel-26.1/dev

git rebase 26.1/dev

git switch 26.1/dev

git merge --no-ff Alkanphel-26.1/dev

git switch 26.1/dev

git merge --squash Alkanphel-26.1/dev

git switch 26.1/dev

git merge --ff-only Alkanphel-26.1/dev

git switch 26.1/dev

git merge Alkanphel-26.1/dev

git push origin 26.1/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

Lucraft

2 participants

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

ThreeTAG/Palladium!248

No description provided.