Regalis 1f07b18e5b Merge branch 'master' into new-netcode ...

Conflicts:
	Subsurface/Properties/AssemblyInfo.cs
	Subsurface/Source/Items/Components/DockingPort.cs
	Subsurface/Source/Items/Components/Signal/Wire.cs
	Subsurface/Source/Items/Item.cs

2016-12-29 22:18:27 +02:00

33 KiB

Raw Blame History

View Raw