Merge branch 'master' of https://github.com/mcMMO-dev/mcmmo into configurable

# Conflicts:
#	Changelog.txt
#	pom.xml
#	src/main/java/com/gmail/nossr50/skills/acrobatics/AcrobaticsManager.java
This commit is contained in:
nossr50
2019-04-09 14:38:49 -07:00
10 changed files with 13 additions and 14 deletions

View File

@@ -5,7 +5,6 @@ import com.gmail.nossr50.datatypes.skills.ItemType;
import com.gmail.nossr50.util.ItemUtils;
import org.bukkit.Material;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;