Merge branch 'master' into 'master'

Fixed dependency issues, added both factions MassiveCore and...

See merge request Songoda/epicbuckets!3
This commit is contained in:
Niels Vergucht 2019-01-11 22:48:58 +00:00
commit 5857dda523
3 changed files with 21 additions and 3 deletions

BIN
dependencies/Factions.jar vendored Normal file

Binary file not shown.

BIN
dependencies/MassiveCore.jar vendored Normal file

Binary file not shown.

24
pom.xml
View File

@ -197,10 +197,28 @@
<version>RELEASE</version>
<scope>provided</scope>
</dependency>
<!--The Dependencies below are for both FactionsUUID/SavageFactions/FactionsUltimate & MassiveCore Factions // By ProSavage <3 -->
<dependency>
<groupId>me.markeh</groupId>
<artifactId>factionsframework</artifactId>
<version>1.2.0</version>
<groupId>com.github.ProSavage</groupId>
<artifactId>SavageFactions</artifactId>
<version>1.6.x-0.1.21-gbdd5473-400</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.massivecraft.</groupId>
<artifactId>factions</artifactId>
<scope>system</scope>
<version>2.14.1-SNAPSHOT</version>
<systemPath>${project.basedir}/dependencies/Factions.jar</systemPath>
</dependency>
<dependency>
<groupId>com.massivecraft</groupId>
<artifactId>massivecore</artifactId>
<scope>system</scope>
<version>2.14.1-SNAPSHOT</version>
<systemPath>${project.basedir}/dependencies/MassiveCore.jar</systemPath>
</dependency>
<!--The Dependencies above are for both FactionsUUID/SavageFactions/FactionsUltimate & MassiveCore Factions // By ProSavage <3 -->
<!--Try not to mess it up -->
</dependencies>
</project>