Refactored Action requirements a bit, more work on the combat.
Merge branch 'master' of https://github.com/floAr/ADG_Scarlet_Gamma

Conflicts:
	ScarletGamma/src/gamerules/Combat.cpp
	ScarletGamma/src/network/CombatMessages.cpp
	ScarletGamma/src/network/CombatMessages.hpp