Paul Reilly df442ef4b0 Merge branch 'Implementations' into update/toml-json-config ... # Conflicts: # Patchwork/src/main/java/fns/patchwork/config/Configuration.java # Veritas/src/main/java/fns/veritas/Aggregate.java # Veritas/src/main/java/fns/veritas/bukkit/ServerListener.java # Veritas/src/main/java/fns/veritas/client/BotClient.java # Veritas/src/main/java/fns/veritas/client/BotConfig.java		2023-09-09 19:11:19 -05:00
..
src/main/java/fns/patchwork	Merge branch 'Implementations' into update/toml-json-config	2023-09-09 19:11:19 -05:00
.gitignore	Upgrades	2023-05-15 01:30:37 -05:00
build.gradle	Fully implement Discord bot (#33)	2023-08-29 17:32:13 -05:00