Merge branch 'master' of https://github.com/plexusorg/plex into taah-cmd-blocker

 Conflicts:

	src/main/java/dev/plex/command/blocker/CommandBlockerManager.java

	src/main/java/dev/plex/listener/impl/CommandListener.java

	src/main/resources/commands.yml

src/main/java/dev/plex/Plex.java

@@ -255,4 +255,4 @@ public class Plex extends JavaPlugin
             }
         }
     }
-}
+}