Merge remote-tracking branch 'upstream/general-devel' into cfs-modified

Conflicts:
	TShockAPI/Commands.cs
Merge branch 'cfs-modified' of https://github.com/ColinBohn/TShock into cfs-modified

Conflicts:
	TShockAPI/Commands.cs