Merge remote-tracking branch 'origin/dev' into dev · FixedDev/command-flow@320392c · GitHub

Commit

Merge remote-tracking branch 'origin/dev' into dev

Browse files

# Conflicts:
#	brigadier/paper/src/main/java/team/unnamed/commandflow/brigadier/BrigaderProvider.java

Loading branch information

FixedDev committed Jan 4, 2024

2 parents ce91ab3 + dc66980 commit 320392c