 Mathew
|
78bfdf2828
|
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 |
|