Nick 34102e9b22 Merge branch 'master' of https://git.fascinated.cc/Fascinated/Bat ... # Conflicts: # pom.xml		2024-07-03 18:55:48 -05:00
..
main	Merge branch 'master' of https://git.fascinated.cc/Fascinated/Bat	2024-07-03 18:55:48 -05:00