Merge conflict patch and map texture update

This commit is contained in:
2026-05-17 22:50:01 +02:00
parent 843c121666
commit c2566b8db0
13 changed files with 517 additions and 1237 deletions

View File

@@ -8,7 +8,6 @@
"com.unity.remote-config": "4.2.5",
"com.unity.render-pipelines.universal": "17.2.0",
"com.unity.toolchain.linux-x86_64": "2.0.11",
"com.unity.ugui": "2.0.0",
"com.unity.modules.accessibility": "1.0.0",
"com.unity.modules.ai": "1.0.0",
"com.unity.modules.androidjni": "1.0.0",