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:
PokingPines
2024-03-12 16:13:49 +01:00
parent 3614027731 fa28ffeb51
commit c1f68db956
27 changed files with 2153 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Assets/Sprites/steak.png.meta
View File

@@ -1,5 +1,9 @@
fileFormatVersion: 2
<<<<<<< HEAD
guid: 6169f026a7dd5de4d98e97294c0052ec
=======
guid: b4d7d234e66457440bf28b559697e18f
>>>>>>> fa28ffeb51c24a5110062cdfeb77b207a92fd94d
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
@@ -39,7 +43,11 @@ TextureImporter:
mipBias: 0
wrapU: 1
wrapV: 1
<<<<<<< HEAD
wrapW: 1
=======
wrapW: 0
>>>>>>> fa28ffeb51c24a5110062cdfeb77b207a92fd94d
nPOTScale: 0
lightmap: 0
compressionQuality: 50
@@ -63,16 +71,26 @@ TextureImporter:
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
<<<<<<< HEAD
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
=======
applyGammaDecoding: 1
swizzle: 50462976
cookieLightType: 2
>>>>>>> fa28ffeb51c24a5110062cdfeb77b207a92fd94d
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
<<<<<<< HEAD
textureCompression: 1
=======
textureCompression: 0
>>>>>>> fa28ffeb51c24a5110062cdfeb77b207a92fd94d
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
@@ -85,7 +103,11 @@ TextureImporter:
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
<<<<<<< HEAD
textureCompression: 1
=======
textureCompression: 0
>>>>>>> fa28ffeb51c24a5110062cdfeb77b207a92fd94d
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
@@ -98,7 +120,11 @@ TextureImporter:
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
<<<<<<< HEAD
textureCompression: 1
=======
textureCompression: 0
>>>>>>> fa28ffeb51c24a5110062cdfeb77b207a92fd94d
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0