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
2026-07-25 19:42:26 +02:00
parent 0052b0d98e f47baf957e
commit 78bfdf2828
954 changed files with 999772 additions and 26193 deletions
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 49b0a1ef6f3c8fd4284595527b21938e
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,14 @@
+fileFormatVersion: 2
+guid: b00964b2cdb977f44ad34e9e73a76363
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 291300
+  packageName: 'Shatter Stone: Stylized Gemstones'
+  packageVersion: 3.0.0
+  assetPath: Assets/NV3D/Shatter Stone/Stylized Gemstones/StylizedGemstones_BiRP_6.unitypackage
+  uploadId: 886884
@@ -0,0 +1,14 @@
+fileFormatVersion: 2
+guid: c0206a0d54b752b4b81a1fcd363827d3
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 291300
+  packageName: 'Shatter Stone: Stylized Gemstones'
+  packageVersion: 3.0.0
+  assetPath: Assets/NV3D/Shatter Stone/Stylized Gemstones/StylizedGemstones_HDRP_6.unitypackage
+  uploadId: 886884