Hopefully fixed ActiveEffects other than PSHOOOES stuff
Merge remote-tracking branch 'origin/Effects' into Computers

Conflicts:
	src/co/sblock/Sblock/Events/Listeners/EntityDamageByEntityListener.java
	src/co/sblock/Sblock/Events/Listeners/PlayerDropItemListener.java
	src/co/sblock/Sblock/Events/Listeners/PlayerInteractListener.java
	src/co/sblock/Sblock/Events/Listeners/PlayerPickupItemListener.java
	src/co/sblock/Sblock/Events/SblockEvents.java