after merge

Assets/PlayMaker/Editor/Resources/EditorStartupPrefs.asset

@@ -16,5 +16,5 @@ MonoBehaviour:
   playmakerVersion: 
   showWelcomeScreen: 0
   showUpgradeGuide: 0
-  lastAutoUpdateSignature: 6000.0.35f1__/Users/marcin/projects/beyondGit/Assets__0.0.0.0
+  lastAutoUpdateSignature: 6000.0.36f1__G:/PROJEKTY/BEYOND/BeyonGit/Assets__0.0.0.0
   useLegacyNetworking: 0

Assets/Plugins/Easy Save 3/Resources/ES3/ES3Defaults.asset

@@ -36,9 +36,9 @@ MonoBehaviour:
     - NavMeshComponents
     - Boxophobic.Utils.Editor
     - FullSerializer
-    - PPv2URPConverters
     - fluxy
     - StompyRobot.SRDebugger
+    - PPv2URPConverters
     - Boxophobic.AtmosphericHeightFog.Editor
     - Sirenix.OdinInspector.Modules.UnityLocalization.Editor
     - StompyRobot.SRF.Editor

Packages/packages-lock.json

@@ -1,5 +1,20 @@
 {
   "dependencies": {
+    "com.unity.addressables": {
+      "version": "2.2.2",
+      "depth": 1,
+      "source": "registry",
+      "dependencies": {
+        "com.unity.profiling.core": "1.0.2",
+        "com.unity.modules.assetbundle": "1.0.0",
+        "com.unity.modules.jsonserialize": "1.0.0",
+        "com.unity.modules.imageconversion": "1.0.0",
+        "com.unity.modules.unitywebrequest": "1.0.0",
+        "com.unity.scriptablebuildpipeline": "2.1.4",
+        "com.unity.modules.unitywebrequestassetbundle": "1.0.0"
+      },
+      "url": "https://packages.unity.com"
+    },
     "com.unity.burst": {
       "version": "1.8.18",
       "depth": 2,
@@ -29,6 +44,16 @@
       "dependencies": {},
       "url": "https://packages.unity.com"
     },
+    "com.unity.localization": {
+      "version": "1.5.4",
+      "depth": 0,
+      "source": "registry",
+      "dependencies": {
+        "com.unity.addressables": "1.22.2",
+        "com.unity.nuget.newtonsoft-json": "3.0.2"
+      },
+      "url": "https://packages.unity.com"
+    },
     "com.unity.mathematics": {
       "version": "1.3.2",
       "depth": 2,
@@ -51,6 +76,13 @@
       "dependencies": {},
       "url": "https://packages.unity.com"
     },
+    "com.unity.nuget.newtonsoft-json": {
+      "version": "3.2.1",
+      "depth": 1,
+      "source": "registry",
+      "dependencies": {},
+      "url": "https://packages.unity.com"
+    },
     "com.unity.postprocessing": {
       "version": "3.4.0",
       "depth": 0,
@@ -60,6 +92,13 @@
       },
       "url": "https://packages.unity.com"
     },
+    "com.unity.profiling.core": {
+      "version": "1.0.2",
+      "depth": 2,
+      "source": "registry",
+      "dependencies": {},
+      "url": "https://packages.unity.com"
+    },
     "com.unity.render-pipelines.core": {
       "version": "17.0.3",
       "depth": 1,
@@ -103,6 +142,13 @@
         "com.unity.modules.terrain": "1.0.0"
       }
     },
+    "com.unity.scriptablebuildpipeline": {
+      "version": "2.1.4",
+      "depth": 2,
+      "source": "registry",
+      "dependencies": {},
+      "url": "https://packages.unity.com"
+    },
     "com.unity.searcher": {
       "version": "4.9.2",
       "depth": 2,