Commit Graph

7 Commits

Author SHA1 Message Date
PokingPines
d018ddeda1 L 2024-03-12 16:16:21 +01:00
PokingPines
c1f68db956 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
2024-03-12 16:13:49 +01:00
PokingPines
01feedfe38 Milk 2024-03-12 14:46:09 +01:00
0f25538814 Fixed sprites 2024-03-12 13:55:11 +01:00
magn9775
48e5607fe4 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
2024-03-12 13:52:54 +01:00
c889a936f7 Added nutrionional value 2024-03-12 13:50:20 +01:00
magn9775
a87d99b3f3 L til Noah 2024-03-12 13:49:58 +01:00