Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' of https://github.com/Wertik/BlockRegen
� Conflicts: � blockregen-ancient/pom.xml � blockregen-common/pom.xml � blockregen-legacy/pom.xml � blockregen-plugin/pom.xml � blockregen-plugin/src/main/java/nl/aurorion/blockregen/commands/Commands.java � blockregen-plugin/src/main/java/nl/aurorion/blockregen/system/regeneration/RegenerationManager.java � blockregen-plugin/src/main/resources/plugin.yml � blockregen-version/pom.xml � pom.xml
- Loading branch information