Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/Wertik/BlockRegen
Browse files Browse the repository at this point in the history
� 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
Wertik committed Jan 16, 2023
2 parents d67ec44 + a9495fe commit 17cca62
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 17cca62

Please sign in to comment.