Merge remote-tracking branch 'origin/feat/inport-props' into feat/craft-discovery

# Conflicts:
#	Assets/External/Animated PBR Chest Demo/Materials/WoodChest.mat
#	Packages/com.distantlands.cozy.core/Content/Integration/Import for BiRP.unitypackage.meta
#	Packages/com.distantlands.cozy.core/Content/Integration/Import for HDRP.unitypackage.meta
#	Packages/com.distantlands.cozy.core/Content/Integration/Import for URP.unitypackage.meta
This commit is contained in:
2026-07-25 19:42:26 +02:00
954 changed files with 999772 additions and 26193 deletions
+1 -1
View File
@@ -14,7 +14,7 @@ namespace Ashwild.Network
#region Serialized Fields
[Header("Identity")]
[Tooltip("Baked scene id (>= 0), assigned by Tools ▸ Ashwild ▸ Assign World Object IDs. Runtime objects get a negative id.")]
[Tooltip("Baked scene id (>= 0), assigned by Tools ▸ Ashwild ▸ Setup World Object IDs. Runtime objects get a negative id.")]
[SerializeField] private int id = -1;
#endregion