exituser/Brewery
1
0
Fork 0
mirror of https://github.com/exituser/Brewery.git synced 2026-09-17 04:19:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #435 from EpicPlayerA10/master

Browse Source 
Update Slimefun integration and fix pom
This commit is contained in:
Sn0wStorm
2022-06-30 21:03:53 +02:00
committed by GitHub
parent 3a44141a44 e9a8fefb39
commit d9c3898dd5
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pom.xml
+4 -3
View File
@@ -34,6 +34,7 @@
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version> <version>3.8.0</version>
<configuration> <configuration>
@@ -73,7 +74,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-javadoc-plugin</artifactId>
<version>3.2.0</version> <version>3.3.1</version>
<executions> <executions>
<execution> <execution>
<phase>compile</phase> <phase>compile</phase>
@@ -135,7 +136,7 @@
<repository> <repository>
<!-- MythicLib (MMOItems) --> <!-- MythicLib (MMOItems) -->
<id>MMOPlugins</id> <id>MMOPlugins</id>
<url>https://mvn.lumine.io/repository/maven-releases/</url> <url>https://mvn.lumine.io/repository/maven-public/</url>
</repository> </repository>
<repository> <repository>
<!-- Shopkeepers --> <!-- Shopkeepers -->
@@ -267,7 +268,7 @@
<!-- https://github.com/Slimefun/Slimefun4/releases --> <!-- https://github.com/Slimefun/Slimefun4/releases -->
<groupId>com.github.slimefun</groupId> <groupId>com.github.slimefun</groupId>
<artifactId>Slimefun4</artifactId> <artifactId>Slimefun4</artifactId>
<version>RC-24</version> <version>RC-27</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<!--<dependency> <!--<dependency>
src/com/dre/brewery/integration/item/SlimefunPluginItem.java
+1 -1
View File
@@ -3,7 +3,7 @@ package com.dre.brewery.integration.item;
import com.dre.brewery.P; import com.dre.brewery.P;
import com.dre.brewery.filedata.BConfig; import com.dre.brewery.filedata.BConfig;
import com.dre.brewery.recipe.PluginItem; import com.dre.brewery.recipe.PluginItem;
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem; import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
public class SlimefunPluginItem extends PluginItem { public class SlimefunPluginItem extends PluginItem {