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:
+14
@@ -0,0 +1,14 @@
|
||||
fileFormatVersion: 2
|
||||
guid: a12f60b10f3ca864e87a3444a6f0a978
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 291300
|
||||
packageName: 'Shatter Stone: Stylized Gemstones'
|
||||
packageVersion: 3.0.0
|
||||
assetPath: Assets/External/NV3D/Shatter Stone/Stylized Gemstones/Legacy/SG_Prefabs_StylizedGemstones.unitypackage
|
||||
uploadId: 886884
|
||||
Reference in New Issue
Block a user