Merge remote-tracking branch 'origin/1.20.1' into module-permissions-… · Ale32bit/Solstice@18c6903 · GitHub

Commit

Merge remote-tracking branch 'origin/1.20.1' into module-permissions-…

Browse files

…rework

# Conflicts:
#	src/main/java/me/alexdevs/solstice/modules/smite/commands/SmiteCommand.java
#	src/main/java/me/alexdevs/solstice/util/Raycast.java

Loading branch information

Ale32bit committed Dec 28, 2024

2 parents 910018e + 1cfe58b commit 18c6903