Portal breaks now if you do stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/erebus/tileentity/TileEntityPortal.java
Portal breaks now if you do stuff