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
@@ -1,5 +1,6 @@
 fileFormatVersion: 2
-guid: 3c30eca10dcc29448a7002261aa4155a
+guid: e84df5fb440a92e40a048fc13e628d67
+folderAsset: yes
 DefaultImporter:
  externalObjects: {}
  userData: