Merge branch 'master' of git@ooftooft.net:Let-Him-Cook.git

# Conflicts:
#	Assets/Sprites/dårlig_toast.png.meta
#	Assets/Sprites/flour.png.meta
#	Assets/Sprites/meat_sauce_and_rice.png.meta
#	Assets/Sprites/onion.png.meta
#	Assets/Sprites/steak.png.meta

Assets/Scripts/Cooking.cs

@@ -4,30 +4,17 @@ using UnityEngine;
 
 public class Cooking : MonoBehaviour
 {
-    
-    private string[] ingrediens = {"L","Egg"};
-
-    
-
-    List <GameObject> GetIngredients()
-    {
-
-        
-
-        return currentCollisions;
-    }
-
     void CheckDishes()
     {   
         foreach (GameObject ingredient in currentCollisions) {
 			
             Debug.Log(ingredient.name);
+            Debug.Log(ingredient.GetComponent<Ingredient>().NutritionalValue);
         }
         
     }
 
 
-
     // Keep track of ingredients going on and off the cooker.
 	List <GameObject> currentCollisions = new List <GameObject> ();
     private void OnTriggerEnter2D(Collider2D other) {
@@ -44,5 +31,10 @@ public class Cooking : MonoBehaviour
         GetIngredients();
     }
 
+    List <GameObject> GetIngredients()
+    {
+        return currentCollisions;
+    }
+
 
 }

Assets/Scripts/Ingredient.cs

@@ -9,6 +9,7 @@ public class Ingredient : MonoBehaviour
     Vector3 mousePosition;
     new public Transform transform;
     public List <GameObject> IngredientIn;
+    public int NutritionalValue;
     bool isMoving = false;
     //public GameObject table;
     void Start()

Assets/Sprites/dårlig_toast.png.meta

@@ -1,5 +1,9 @@
 fileFormatVersion: 2
+<<<<<<< HEAD
 guid: dfaf1935e2abff14da7316045bc12c66
+=======
+guid: 55aa772debf415445ad407407fda730b
+>>>>>>> c889a936f796b33877ab0923b1a52bc2c35e6883
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
@@ -81,6 +85,7 @@ TextureImporter:
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
+<<<<<<< HEAD
     buildTarget: WebGL
     maxTextureSize: 2048
     resizeAlgorithm: 0
@@ -94,6 +99,8 @@ TextureImporter:
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
+=======
+>>>>>>> c889a936f796b33877ab0923b1a52bc2c35e6883
     buildTarget: Standalone
     maxTextureSize: 2048
     resizeAlgorithm: 0

Assets/Sprites/flour.png.meta

@@ -1,5 +1,9 @@
 fileFormatVersion: 2
+<<<<<<< HEAD
 guid: 0b40c517a63588746a7668929bfc8ca7
+=======
+guid: 9a214110406ce4c46b321f25182d929f
+>>>>>>> c889a936f796b33877ab0923b1a52bc2c35e6883
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
@@ -81,6 +85,7 @@ TextureImporter:
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
+<<<<<<< HEAD
     buildTarget: WebGL
     maxTextureSize: 2048
     resizeAlgorithm: 0
@@ -94,6 +99,8 @@ TextureImporter:
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
+=======
+>>>>>>> c889a936f796b33877ab0923b1a52bc2c35e6883
     buildTarget: Standalone
     maxTextureSize: 2048
     resizeAlgorithm: 0

Assets/Sprites/meat_sauce_and_rice.png.meta

@@ -1,5 +1,9 @@
 fileFormatVersion: 2
+<<<<<<< HEAD
 guid: 6658aaa835fd0354c8369158b264a7d7
+=======
+guid: 72abe25f265d220419f4031009164cb2
+>>>>>>> c889a936f796b33877ab0923b1a52bc2c35e6883
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
@@ -81,6 +85,7 @@ TextureImporter:
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
+<<<<<<< HEAD
     buildTarget: WebGL
     maxTextureSize: 2048
     resizeAlgorithm: 0
@@ -94,6 +99,8 @@ TextureImporter:
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
+=======
+>>>>>>> c889a936f796b33877ab0923b1a52bc2c35e6883
     buildTarget: Standalone
     maxTextureSize: 2048
     resizeAlgorithm: 0

Assets/Sprites/onion.png.meta

@@ -1,5 +1,9 @@
 fileFormatVersion: 2
+<<<<<<< HEAD
 guid: 168c51d9cab206d42a3c6aabeff98162
+=======
+guid: c9ff353953cc92841af8c10f5fa8ef79
+>>>>>>> c889a936f796b33877ab0923b1a52bc2c35e6883
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
@@ -81,6 +85,7 @@ TextureImporter:
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
+<<<<<<< HEAD
     buildTarget: WebGL
     maxTextureSize: 2048
     resizeAlgorithm: 0
@@ -94,6 +99,8 @@ TextureImporter:
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
+=======
+>>>>>>> c889a936f796b33877ab0923b1a52bc2c35e6883
     buildTarget: Standalone
     maxTextureSize: 2048
     resizeAlgorithm: 0

Assets/Sprites/steak.png.meta

@@ -1,5 +1,9 @@
 fileFormatVersion: 2
+<<<<<<< HEAD
 guid: b4d7d234e66457440bf28b559697e18f
+=======
+guid: b7c1d78f668acb24fb5f1ade1fafe261
+>>>>>>> c889a936f796b33877ab0923b1a52bc2c35e6883
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
@@ -81,6 +85,7 @@ TextureImporter:
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
+<<<<<<< HEAD
     buildTarget: WebGL
     maxTextureSize: 2048
     resizeAlgorithm: 0
@@ -94,6 +99,8 @@ TextureImporter:
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
+=======
+>>>>>>> c889a936f796b33877ab0923b1a52bc2c35e6883
     buildTarget: Standalone
     maxTextureSize: 2048
     resizeAlgorithm: 0