Ciakon/let-him-cook
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
# 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
This commit is contained in:
magn9775
2024-03-12 13:52:54 +01:00
parent a87d99b3f3 c889a936f7
commit 48e5607fe4
7 changed files with 43 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Assets/Sprites/flour.png.meta
View File

@@ -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