Merge remote-tracking branch 'origin/NewStory' into NewStory
# Conflicts: # Assets/Meshes/Terrain/Terrain_Land01.asset # Assets/PlayMaker/Editor/Resources/EditorStartupPrefs.asset # Assets/Plugins/Easy Save 3/Resources/ES3/ES3Defaults.asset # Packages/packages-lock.json
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
{
|
||||
"dependencies": {
|
||||
"com.unity.localization": "1.5.4",
|
||||
"com.unity.multiplayer.center": "1.0.0",
|
||||
"com.unity.postprocessing": "3.4.0",
|
||||
"com.unity.render-pipelines.universal": "17.0.3",
|
||||
|
||||
Reference in New Issue
Block a user