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/ScriptableObjects/Recipes/PickaxeRecipe.asset
+4 -3
View File
@@ -15,8 +15,9 @@ MonoBehaviour:
recipeName: Pioche
resultItem: {fileID: 11400000, guid: 60132cba2202496eb74f2afc1f89c81a, type: 2}
resultQuantity: 1
requiredStation: 1
ingredients:
- item: {fileID: 11400000, guid: 9340c6bceb10c9b47bdaf993427004e3, type: 2}
quantity: 2
- item: {fileID: 11400000, guid: 0cadc69b42f24da49ca5ef62adfbddf8, type: 2}
quantity: 7
- item: {fileID: 11400000, guid: 51e850551f3764447b2e8b6168f82e3b, type: 2}
quantity: 3
quantity: 6