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
@@ -11,7 +11,9 @@ GameObject:
- component: {fileID: 8601272150287418368}
- component: {fileID: 5277363453092475638}
- component: {fileID: 985001107293900664}
m_Layer: 0
- component: {fileID: 4899225885515038724}
- component: {fileID: 9147875731561641991}
m_Layer: 6
m_Name: Stations_5
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -58,10 +60,15 @@ MeshRenderer:
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1
m_ForceMeshLod: -1
m_MeshLodSelectionBias: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 1537286330038668216, guid: 8fba432c73804d647a5ad53df341f01e, type: 3}
- {fileID: 1537286330038668216, guid: 73f5d288fb608fb4e9959cf5e9655783, type: 3}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@@ -79,7 +86,44 @@ MeshRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_GlobalIlluminationMeshLod: 0
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_MaskInteraction: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!65 &4899225885515038724
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 781270504346949712}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 0
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Size: {x: 2.7156103, y: 1.8032616, z: 1.15291}
m_Center: {x: 0.3753096, y: 0.90680677, z: 0.050604135}
--- !u!114 &9147875731561641991
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 781270504346949712}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3323e66aad475444191d473bbba8673a, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::Ashwild.Crafting.CraftingStation
stationType: 1
displayName: "\xC9tabli"