Revert "Merge remote-tracking branch 'upstream/master'"

This reverts commit 290cd474d7df5b209ebe584ecbbf8dd97293655a, reversing
changes made to 97e77324fea4f4f326c0d867561cbdabef98594f.
Revert "Merge remote-tracking branch 'upstream/master'"

This reverts commit 1ff4a5bcc9b21340942562b9c6502293efeeb8c0, reversing
changes made to 290cd474d7df5b209ebe584ecbbf8dd97293655a.

Conflicts:
	SEModAPIInternal/API/Entity/BaseObject.cs
	SEModAPIInternal/API/Entity/InventoryEntity.cs

	SEModAPIInternal/API/Entity/Sector/SectorObject/CubeGrid/CubeBlockEntity.cs
	SEModAPIInternal/API/Entity/SectorEntity.cs