Minor
Merge remote-tracking branch 'origin/IllyDev' into IllyDev

Conflicts:
	src/main/java/com/newlinegaming/Runix/AbstractRune.java
Merge branch 'IllyDev' of https://github.com/Runix-Minecraft/Runix into IllyDev

Conflicts:
	src/main/java/com/newlinegaming/Runix/rune/TeleporterRune.java