Merge branch 'pull/54'

# Conflicts:
#	pom.xml
This commit is contained in:
Narimm
2020-06-18 17:05:40 +10:00
29 changed files with 501 additions and 452 deletions

View File

@@ -2,13 +2,13 @@
<modelVersion>4.0.0</modelVersion>
<groupId>nl.Steffion</groupId>
<artifactId>BlockHunt</artifactId>
<version>0.4.0-SNAPSHOT</version>
<version>0.5.0-SNAPSHOT</version>
<name>BlockHunt</name>
<properties>
<plugin.version>${project.version}-${buildnumber}</plugin.version>
<buildnumber />
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spigot.api.version>1.13</spigot.api.version>
<spigot.api.version>1.15</spigot.api.version>
<spigot.version>${spigot.api.version}.2-R0.1-SNAPSHOT</spigot.version>
</properties>
<scm>