[email protected]

## [1.5.7] - 2021-04-07
### Unreleased
- The Version Control package will be expanding to include both Collaborate and Plastic SCM version control interfaces. This release is preparing for that move and contains no new functionality or bug fixes for Collaborate.
### Changed
- Collaborate Package renamed to Version Control with changes to package display name and description.
### Fixed
- Fixed NPE when updating the version of the Collab package.

CHANGELOG.md

@@ -4,6 +4,14 @@ All notable changes to this package will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [1.5.7] - 2021-04-07
+### Unreleased
+- The Version Control package will be expanding to include both Collaborate and Plastic SCM version control interfaces. This release is preparing for that move and contains no new functionality or bug fixes for Collaborate.
+### Changed
+- Collaborate Package renamed to Version Control with changes to package display name and description.
+### Fixed
+- Fixed NPE when updating the version of the Collab package.
+
 ## [1.3.9] - 2020-07-13
 ### Fixed
 - Unnecessary use of texture compression in icons that slowed down platform switching
@@ -20,7 +28,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Changed
 - Bulk revert is now supported.
 - Collab is blocked in play mode.
-## Fixed
+### Fixed
 - Fixed services window's links to open Collab.
 
 ## [1.3.6] - 2020-01-21

Documentation~/unity-cloud-collaborate.md

@@ -1,5 +1,6 @@
-# About Unity Collaborate
-
-Collaborate is a simple way for teams to save, share, and sync their Unity project.
-
-Please refer to the online documentation [here.](https://docs.unity3d.com/Manual/UnityCollaborate.html)
+# About Version Control
+The Version Control package provides an in-editor interface for teams to work with Collaborate and Plastic SCM (coming soon).
+## Collaborate
+Collaborate makes it easy for teams to save, share, and sync their Unity projects with others, regardless of location. It is cloud enabled and built directly into Unity. Please refer to the online documentation for Unity Collaborate [here.](https://docs.unity3d.com/Manual/UnityCollaborate.html)
+## Plastic SCM
+Plastic SCM Plugin for Unity (beta) is a free Unity plugin that gives you the ability to use Plastic SCM, a leading version control solution, directly in Unity. It is currently available on the Unity Asset Store but will be moving to this package in an upcoming release.

Editor/Assets/Styles/AlertBox.uss → Editor/Collaborate/Assets/Styles/AlertBox.uss

@@ -28,25 +28,25 @@
 }
 
 .dark .alert-box__icon.icon-info {
-    background-image: resource("Packages/com.unity.collab-proxy/Editor/Assets/Icons/status-info-dark.png");
+    background-image: resource("Packages/com.unity.collab-proxy/Editor/Collaborate/Assets/Icons/status-info-dark.png");
 }
 
 .light .alert-box__icon.icon-info {
-    background-image: resource("Packages/com.unity.collab-proxy/Editor/Assets/Icons/status-info-light.png");
+    background-image: resource("Packages/com.unity.collab-proxy/Editor/Collaborate/Assets/Icons/status-info-light.png");
 }
 
 .dark .alert-box__icon.icon-warning {
-    background-image: resource("Packages/com.unity.collab-proxy/Editor/Assets/Icons/status-warning-dark.png");
+    background-image: resource("Packages/com.unity.collab-proxy/Editor/Collaborate/Assets/Icons/status-warning-dark.png");
 }
 
 .light .alert-box__icon.icon-warning {
-    background-image: resource("Packages/com.unity.collab-proxy/Editor/Assets/Icons/status-warning-light.png");
+    background-image: resource("Packages/com.unity.collab-proxy/Editor/Collaborate/Assets/Icons/status-warning-light.png");
 }
 
 .dark .alert-box__icon.icon-alert {
-    background-image: resource("Packages/com.unity.collab-proxy/Editor/Assets/Icons/status-error-dark.png");
+    background-image: resource("Packages/com.unity.collab-proxy/Editor/Collaborate/Assets/Icons/status-error-dark.png");
 }
 
 .light .alert-box__icon.icon-alert {
-    background-image: resource("Packages/com.unity.collab-proxy/Editor/Assets/Icons/status-error-light.png");
+    background-image: resource("Packages/com.unity.collab-proxy/Editor/Collaborate/Assets/Icons/status-error-light.png");
 }

Editor/Assets/Styles/BaseChangeListElement.uss → Editor/Collaborate/Assets/Styles/BaseChangeListElement.uss

@@ -60,41 +60,41 @@
 /* File status icons */
 
 .dark .base-change-list-element__icon.added {
-    background-image: resource("Packages/com.unity.collab-proxy/Editor/Assets/Icons/added-file-dark.png");
+    background-image: resource("Packages/com.unity.collab-proxy/Editor/Collaborate/Assets/Icons/added-file-dark.png");
 }
 
 .light .base-change-list-element__icon.added {
-    background-image: resource("Packages/com.unity.collab-proxy/Editor/Assets/Icons/added-file-light.png");
+    background-image: resource("Packages/com.unity.collab-proxy/Editor/Collaborate/Assets/Icons/added-file-light.png");
 }
 
 .dark .base-change-list-element__icon.moved {
-    background-image: resource("Packages/com.unity.collab-proxy/Editor/Assets/Icons/moved-file-dark.png");
+    background-image: resource("Packages/com.unity.collab-proxy/Editor/Collaborate/Assets/Icons/moved-file-dark.png");
 }
 
 .light .base-change-list-element__icon.moved {
-    background-image: resource("Packages/com.unity.collab-proxy/Editor/Assets/Icons/moved-file-light.png");
+    background-image: resource("Packages/com.unity.collab-proxy/Editor/Collaborate/Assets/Icons/moved-file-light.png");
 }
 
 .dark .base-change-list-element__icon.edited {
-    background-image: resource("Packages/com.unity.collab-proxy/Editor/Assets/Icons/edited-file-dark.png");
+    background-image: resource("Packages/com.unity.collab-proxy/Editor/Collaborate/Assets/Icons/edited-file-dark.png");
 }
 
 .light .base-change-list-element__icon.edited {
-    background-image: resource("Packages/com.unity.collab-proxy/Editor/Assets/Icons/edited-file-light.png");
+    background-image: resource("Packages/com.unity.collab-proxy/Editor/Collaborate/Assets/Icons/edited-file-light.png");
 }
 
 .dark .base-change-list-element__icon.deleted {
-    background-image: resource("Packages/com.unity.collab-proxy/Editor/Assets/Icons/deleted-file-dark.png");
+    background-image: resource("Packages/com.unity.collab-proxy/Editor/Collaborate/Assets/Icons/deleted-file-dark.png");
 }
 
 .light .base-change-list-element__icon.deleted {
-    background-image: resource("Packages/com.unity.collab-proxy/Editor/Assets/Icons/deleted-file-light.png");
+    background-image: resource("Packages/com.unity.collab-proxy/Editor/Collaborate/Assets/Icons/deleted-file-light.png");
 }
 
 .dark .base-change-list-element__icon.conflicted {
-    background-image: resource("Packages/com.unity.collab-proxy/Editor/Assets/Icons/conflicted-file-dark.png");
+    background-image: resource("Packages/com.unity.collab-proxy/Editor/Collaborate/Assets/Icons/conflicted-file-dark.png");
 }
 
 .light .base-change-list-element__icon.conflicted {
-    background-image: resource("Packages/com.unity.collab-proxy/Editor/Assets/Icons/conflicted-file-light.png");
+    background-image: resource("Packages/com.unity.collab-proxy/Editor/Collaborate/Assets/Icons/conflicted-file-light.png");
 }

Editor/Assets/Styles/IconButton.uss → Editor/Collaborate/Assets/Styles/IconButton.uss

@@ -9,75 +9,75 @@
 }
 
 .dark .unity-icon-button.btn-overflow {
-    background-image: resource("Packages/com.unity.collab-proxy/Editor/Assets/Icons/more-vert-dark.png");
+    background-image: resource("Packages/com.unity.collab-proxy/Editor/Collaborate/Assets/Icons/more-vert-dark.png");
 }
 
 .light .unity-icon-button.btn-overflow {
-    background-image: resource("Packages/com.unity.collab-proxy/Editor/Assets/Icons/more-vert-light.png");
+    background-image: resource("Packages/com.unity.collab-proxy/Editor/Collaborate/Assets/Icons/more-vert-light.png");
 }
 
 .dark .unity-icon-button.btn-undo {
-    background-image: resource("Packages/com.unity.collab-proxy/Editor/Assets/Icons/undo-dark.png");
+    background-image: resource("Packages/com.unity.collab-proxy/Editor/Collaborate/Assets/Icons/undo-dark.png");
 }
 
 .light .unity-icon-button.btn-undo {
-    background-image: resource("Packages/com.unity.collab-proxy/Editor/Assets/Icons/undo-light.png");
+    background-image: resource("Packages/com.unity.collab-proxy/Editor/Collaborate/Assets/Icons/undo-light.png");
 }
 
 .dark .unity-icon-button.btn-revert {
-    background-image: resource("Packages/com.unity.collab-proxy/Editor/Assets/Icons/revert-asset-dark.png");
+    background-image: resource("Packages/com.unity.collab-proxy/Editor/Collaborate/Assets/Icons/revert-asset-dark.png");
 }
 
 .light .unity-icon-button.btn-revert {
-    background-image: resource("Packages/com.unity.collab-proxy/Editor/Assets/Icons/revert-asset-light.png");
+    background-image: resource("Packages/com.unity.collab-proxy/Editor/Collaborate/Assets/Icons/revert-asset-light.png");
 }
 
 .dark .unity-icon-button.btn-back {
-    background-image: resource("Packages/com.unity.collab-proxy/Editor/Assets/Icons/back-dark.png");
+    background-image: resource("Packages/com.unity.collab-proxy/Editor/Collaborate/Assets/Icons/back-dark.png");
 }
 
 .light .unity-icon-button.btn-back {
-    background-image: resource("Packages/com.unity.collab-proxy/Editor/Assets/Icons/back-light.png");
+    background-image: resource("Packages/com.unity.collab-proxy/Editor/Collaborate/Assets/Icons/back-light.png");
 }
 
 .dark .unity-icon-button.btn-show {
-    background-image: resource("Packages/com.unity.collab-proxy/Editor/Assets/Icons/show-dark.png");
+    background-image: resource("Packages/com.unity.collab-proxy/Editor/Collaborate/Assets/Icons/show-dark.png");
 }
 
 .light .unity-icon-button.btn-show {
-    background-image: resource("Packages/com.unity.collab-proxy/Editor/Assets/Icons/show-light.png");
+    background-image: resource("Packages/com.unity.collab-proxy/Editor/Collaborate/Assets/Icons/show-light.png");
 }
 
 .dark .unity-icon-button.btn-merge {
-    background-image: resource("Packages/com.unity.collab-proxy/Editor/Assets/Icons/merge-dark.png");
+    background-image: resource("Packages/com.unity.collab-proxy/Editor/Collaborate/Assets/Icons/merge-dark.png");
 }
 
 .light .unity-icon-button.btn-merge {
-    background-image: resource("Packages/com.unity.collab-proxy/Editor/Assets/Icons/merge-light.png");
+    background-image: resource("Packages/com.unity.collab-proxy/Editor/Collaborate/Assets/Icons/merge-light.png");
 }
 
 .dark .unity-icon-button.btn-choose-remote {
-    background-image: resource("Packages/com.unity.collab-proxy/Editor/Assets/Icons/choose-remote-dark.png");
+    background-image: resource("Packages/com.unity.collab-proxy/Editor/Collaborate/Assets/Icons/choose-remote-dark.png");
 }
 
 .light .unity-icon-button.btn-choose-remote {
-    background-image: resource("Packages/com.unity.collab-proxy/Editor/Assets/Icons/choose-remote-light.png");
+    background-image: resource("Packages/com.unity.collab-proxy/Editor/Collaborate/Assets/Icons/choose-remote-light.png");
 }
 
 .dark .unity-icon-button.btn-choose-mine {
-    background-image: resource("Packages/com.unity.collab-proxy/Editor/Assets/Icons/choose-mine-dark.png");
+    background-image: resource("Packages/com.unity.collab-proxy/Editor/Collaborate/Assets/Icons/choose-mine-dark.png");
 }
 
 .light .unity-icon-button.btn-choose-mine {
-    background-image: resource("Packages/com.unity.collab-proxy/Editor/Assets/Icons/choose-mine-light.png");
+    background-image: resource("Packages/com.unity.collab-proxy/Editor/Collaborate/Assets/Icons/choose-mine-light.png");
 }
 
 .dark .unity-icon-button.btn-diff {
-    background-image: resource("Packages/com.unity.collab-proxy/Editor/Assets/Icons/diff-dark.png");
+    background-image: resource("Packages/com.unity.collab-proxy/Editor/Collaborate/Assets/Icons/diff-dark.png");
 }
 
 .light .unity-icon-button.btn-diff {
-    background-image: resource("Packages/com.unity.collab-proxy/Editor/Assets/Icons/diff-light.png");
+    background-image: resource("Packages/com.unity.collab-proxy/Editor/Collaborate/Assets/Icons/diff-light.png");
 }
 
 .dark .unity-icon-button:focus {