nossr50 5facd8d412 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

2019-04-09 14:38:49 -07:00

..

Repairable.java

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

2019-04-09 14:38:49 -07:00

RepairableManager.java

Code Cleanup Pt 2

2019-04-03 19:25:14 -07:00