Mathew/Emberwild
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/feat/inport-props' into feat/craft-discovery

Browse Source 
# 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:
Mathew
2026-07-25 19:42:26 +02:00
parent 0052b0d98e f47baf957e
commit 78bfdf2828
954 changed files with 999772 additions and 26193 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/GAME/Resources/ItemDatabase.asset
+1
View File
@@ -24,6 +24,7 @@ MonoBehaviour:
- {fileID: 11400000, guid: a827e12e2b364d73bd1038d60d5258a1, type: 2}
- {fileID: 11400000, guid: 0c27b42a96974b60b484bf475036ef58, type: 2}
- {fileID: 11400000, guid: db082cae7b71f3643ad33fcc5d4c474b, type: 2}
- {fileID: 11400000, guid: 87cbf77d115c72d4e9cbcc71feceab59, type: 2}
- {fileID: 11400000, guid: 60132cba2202496eb74f2afc1f89c81a, type: 2}
- {fileID: 11400000, guid: f9cafd470cfc4aa8aceea5b263c4c25c, type: 2}
- {fileID: 11400000, guid: 6b543ed8734f4dcf984c1c43d63a9207, type: 2}