Some conflicts resolved

This commit is contained in:
2026-05-27 21:32:22 +02:00
909 changed files with 290753 additions and 12158 deletions

View File

@@ -1,8 +1,14 @@
{
"dependencies": {
"com.unity.2d.sprite": {
"version": "1.0.0",
"depth": 0,
"source": "builtin",
"dependencies": {}
},
"com.unity.burst": {
"version": "1.8.25",
"depth": 3,
"depth": 2,
"source": "registry",
"dependencies": {
"com.unity.mathematics": "1.2.1",
@@ -12,7 +18,7 @@
},
"com.unity.collections": {
"version": "2.5.7",
"depth": 3,
"depth": 2,
"source": "registry",
"dependencies": {
"com.unity.burst": "1.8.19",
@@ -49,7 +55,7 @@
},
"com.unity.mathematics": {
"version": "1.3.2",
"depth": 3,
"depth": 2,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.com"
@@ -64,7 +70,7 @@
},
"com.unity.nuget.mono-cecil": {
"version": "1.11.5",
"depth": 4,
"depth": 3,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.com"
@@ -88,9 +94,40 @@
},
"url": "https://packages.unity.com"
},
"com.unity.settings-manager": {
"version": "2.1.0",
"depth": 1,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.com"
},
"com.unity.remote-config": {
"version": "4.2.5",
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.nuget.newtonsoft-json": "3.0.2",
"com.unity.remote-config-runtime": "4.0.4",
"com.unity.modules.unitywebrequest": "1.0.0"
},
"url": "https://packages.unity.com"
},
"com.unity.remote-config-runtime": {
"version": "4.0.4",
"depth": 1,
"source": "registry",
"dependencies": {
"com.unity.services.core": "1.12.5",
"com.unity.nuget.newtonsoft-json": "3.0.2",
"com.unity.modules.unityanalytics": "1.0.0",
"com.unity.modules.unitywebrequest": "1.0.0",
"com.unity.services.authentication": "2.7.4"
},
"url": "https://packages.unity.com"
},
"com.unity.render-pipelines.core": {
"version": "17.2.0",
"depth": 2,
"depth": 1,
"source": "builtin",
"dependencies": {
"com.unity.burst": "1.8.14",
@@ -103,9 +140,27 @@
"com.unity.rendering.light-transport": "1.0.1"
}
},
"com.unity.render-pipelines.universal": {
"version": "17.2.0",
"depth": 0,
"source": "builtin",
"dependencies": {
"com.unity.render-pipelines.core": "17.2.0",
"com.unity.shadergraph": "17.2.0",
"com.unity.render-pipelines.universal-config": "17.0.3"
}
},
"com.unity.render-pipelines.universal-config": {
"version": "17.0.3",
"depth": 1,
"source": "builtin",
"dependencies": {
"com.unity.render-pipelines.core": "17.0.3"
}
},
"com.unity.rendering.light-transport": {
"version": "1.0.1",
"depth": 3,
"depth": 2,
"source": "builtin",
"dependencies": {
"com.unity.collections": "2.2.0",
@@ -120,11 +175,27 @@
"dependencies": {},
"url": "https://packages.unity.com"
},
"com.unity.settings-manager": {
"version": "2.1.0",
"depth": 1,
"com.unity.services.authentication": {
"version": "3.4.1",
"depth": 2,
"source": "registry",
"dependencies": {},
"dependencies": {
"com.unity.ugui": "1.0.0",
"com.unity.services.core": "1.14.0",
"com.unity.nuget.newtonsoft-json": "3.2.1",
"com.unity.modules.unitywebrequest": "1.0.0"
},
"url": "https://packages.unity.com"
},
"com.unity.services.core": {
"version": "1.14.0",
"depth": 2,
"source": "registry",
"dependencies": {
"com.unity.modules.androidjni": "1.0.0",
"com.unity.nuget.newtonsoft-json": "3.2.1",
"com.unity.modules.unitywebrequest": "1.0.0"
},
"url": "https://packages.unity.com"
},
"com.unity.shadergraph": {
@@ -136,6 +207,22 @@
"com.unity.searcher": "4.9.3"
}
},
"com.unity.sysroot": {
"version": "2.0.10",
"depth": 1,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.com"
},
"com.unity.sysroot.linux-x86_64": {
"version": "2.0.9",
"depth": 1,
"source": "registry",
"dependencies": {
"com.unity.sysroot": "2.0.10"
},
"url": "https://packages.unity.com"
},
"com.unity.test-framework": {
"version": "1.6.0",
"depth": 1,
@@ -148,7 +235,7 @@
},
"com.unity.test-framework.performance": {
"version": "3.2.0",
"depth": 4,
"depth": 3,
"source": "registry",
"dependencies": {
"com.unity.test-framework": "1.1.33",
@@ -156,6 +243,24 @@
},
"url": "https://packages.unity.com"
},
"com.unity.textmeshpro": {
"version": "5.0.0",
"depth": 0,
"source": "builtin",
"dependencies": {
"com.unity.ugui": "2.0.0"
}
},
"com.unity.toolchain.linux-x86_64": {
"version": "2.0.11",
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.sysroot": "2.0.10",
"com.unity.sysroot.linux-x86_64": "2.0.9"
},
"url": "https://packages.unity.com"
},
"com.unity.ugui": {
"version": "2.0.0",
"depth": 0,