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:
@@ -0,0 +1,22 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!114 &11400000
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 844fe8613bd719748bb374323f3f1e0d, type: 3}
|
||||
m_Name: NewRecipe
|
||||
m_EditorClassIdentifier: Assembly-CSharp::Ashwild.Crafting.CraftingRecipe
|
||||
recipeName: Pioche en Bois
|
||||
resultItem: {fileID: 11400000, guid: 87cbf77d115c72d4e9cbcc71feceab59, type: 2}
|
||||
resultQuantity: 1
|
||||
ingredients:
|
||||
- item: {fileID: 11400000, guid: 9340c6bceb10c9b47bdaf993427004e3, type: 2}
|
||||
quantity: 4
|
||||
- item: {fileID: 11400000, guid: 97ba39137a324f19ac1a910464492297, type: 2}
|
||||
quantity: 2
|
||||
Reference in New Issue
Block a user