Merge branch 'master' into temp-alex

This commit is contained in:
chickeneer
2021-12-21 11:13:42 -06:00
837 changed files with 65985 additions and 116678 deletions
+2 -2
View File
@@ -25,7 +25,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>co.aikar</groupId>
<artifactId>acf-parent</artifactId>
<version><!--VERSION-->0.5.0-SNAPSHOT<!--VERSION--></version>
<version><!--VERSION-->0.5.1-SNAPSHOT<!--VERSION--></version>
<packaging>pom</packaging>
<name>ACF (All)</name>
<url>https://acf.emc.gs</url>
@@ -127,7 +127,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.2.0</version>
<version>3.3.1</version>
<configuration>
<sourcepath>src/main/java</sourcepath>
<destDir>../docs/${project.artifactId}/</destDir>