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
parent 0052b0d98e f47baf957e
commit 78bfdf2828
954 changed files with 999772 additions and 26193 deletions
@@ -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
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a625d4daf313b1d4d9113244ea7826ec
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -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
@@ -15,6 +15,7 @@ MonoBehaviour:
  recipeName: Planche
  resultItem: {fileID: 11400000, guid: f9cafd470cfc4aa8aceea5b263c4c25c, type: 2}
  resultQuantity: 4
+  requiredStation: 1
  ingredients:
  - item: {fileID: 11400000, guid: 0cadc69b42f24da49ca5ef62adfbddf8, type: 2}
    quantity: 1