Skip to content

Commit

Permalink
Merge branch 'master' into recode
Browse files Browse the repository at this point in the history
# Conflicts:
#	bukkit/src/main/java/com/archyx/aureliumskills/mana/Absorption.java
#	bukkit/src/main/java/com/archyx/aureliumskills/mana/ChargedShot.java
#	bukkit/src/main/java/com/archyx/aureliumskills/mana/ManaAbilityProvider.java
#	bukkit/src/main/java/com/archyx/aureliumskills/mana/Replenish.java
#	bukkit/src/main/java/com/archyx/aureliumskills/mana/Treecapitator.java
#	bukkit/src/main/java/dev/aurelium/auraskills/bukkit/skills/excavation/Terraform.java
  • Loading branch information
Archy-X committed Nov 11, 2023
2 parents ec419de + 6d61d59 commit 074fc13
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 074fc13

Please sign in to comment.