Josh Roy 10fc005652 Merge remote-tracking branch 'upstream/2.x' into refactor/folia ... # Conflicts: # EssentialsDiscord/src/main/java/net/essentialsx/discord/util/ConsoleInjector.java		2023-07-27 19:30:00 -04:00
..
src/main	Merge remote-tracking branch 'upstream/2.x' into refactor/folia	2023-07-27 19:30:00 -04:00
build.gradle	Clean up gradle build scripts	2021-06-07 08:17:39 -04:00