mirror of
https://github.com/StarWishsama/Slimefun4.git
synced 2024-09-20 03:35:51 +00:00
Merge remote-tracking branch 'origin/master'
# Conflicts: # src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/enchanting/AbstractEnchantmentMachine.java # src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/enchanting/AutoDisenchanter.java # src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/enchanting/AutoEnchanter.java
This commit is contained in:
commit
d28a97f729
6
pom.xml
6
pom.xml
@ -392,7 +392,7 @@
|
||||
<dependency>
|
||||
<groupId>com.sk89q.worldedit</groupId>
|
||||
<artifactId>worldedit-core</artifactId>
|
||||
<version>7.2.3</version>
|
||||
<version>7.2.5</version>
|
||||
<scope>provided</scope>
|
||||
|
||||
<exclusions>
|
||||
@ -406,7 +406,7 @@
|
||||
<dependency>
|
||||
<groupId>com.sk89q.worldedit</groupId>
|
||||
<artifactId>worldedit-bukkit</artifactId>
|
||||
<version>7.2.4</version>
|
||||
<version>7.2.5</version>
|
||||
<scope>provided</scope>
|
||||
|
||||
<exclusions>
|
||||
@ -474,4 +474,4 @@
|
||||
</exclusions>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</project>
|
||||
</project>
|
Loading…
Reference in New Issue
Block a user