Merge remote-tracking branch 'origin/master' into MartijnBranch

Conflicts:
common/com/ironhammer354/mythic/Mythic.java
common/com/ironhammer354/mythic/PacketHandler.java
common/com/ironhammer354/mythic/block/MythBlocks.java
common/com/ironhammer354/mythic/config/ConfigurationHandler.java
common/com/ironhammer354/mythic/entity/mob/EntityNymph.java
common/com/ironhammer354/mythic/item/MythItems.java
common/com/ironhammer354/mythic/lib/BlockIDs.java
common/com/ironhammer354/mythic/lib/ItemIDs.java
common/com/ironhammer354/mythic/lib/Strings.java
#
# It looks like you may be committing a merge.
# If this is not correct, please remove the file
# .git/MERGE_HEAD
# and try again.

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch MartijnBranch
# All conflicts fixed but you are still merging.
#   (use "git commit" to conclude merge)
#
# Changes to be committed:
#
# modified:   common/com/ironhammer354/mythic/Mythic.java
# modified:   common/com/ironhammer354/mythic/PacketHandler.java
# modified:   common/com/ironhammer354/mythic/block/MythBlocks.java
# modified:
common/com/ironhammer354/mythic/config/ConfigurationHandler.java
# modified:
common/com/ironhammer354/mythic/entity/mob/EntityNymph.java
# modified:   common/com/ironhammer354/mythic/item/MythItems.java
# modified:   common/com/ironhammer354/mythic/lib/BlockIDs.java
# modified:   common/com/ironhammer354/mythic/lib/ItemIDs.java
# modified:   common/com/ironhammer354/mythic/lib/Strings.java