Merge from main (deeply cursed merge) Manual changes in: GameManifest-Generate.cs CopyPaste.cs BaseNetworkable.cs BaseEntity.server.cs - could not merge at all, ran text merge GeneralEditorPrefProvider.cs - could not merge at all, ran text merge GameUI.Hud.Map.prefab - kept source changes, will need to redo naval map changes JunkpileWater.cs - complete nightmare, kept source changes and will redo naval changes