merge with main

This commit is contained in:
2021-12-07 20:21:41 -06:00
parent 05e04c7db9
commit 7d04c41d79
15 changed files with 203 additions and 204 deletions

View File

@@ -2,15 +2,15 @@
importer="texture"
type="StreamTexture"
path="res://.import/Resources_Basic.png-ace2281282b93b7ae48cda9c52d377ad.stex"
path="res://.import/resources_basic.png-128bab182945611297ec1bda48bed0c4.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://Sprites/Assets/Resources_Basic.png"
dest_files=[ "res://.import/Resources_Basic.png-ace2281282b93b7ae48cda9c52d377ad.stex" ]
source_file="res://Sprites/Assets/resources_basic.png"
dest_files=[ "res://.import/resources_basic.png-128bab182945611297ec1bda48bed0c4.stex" ]
[params]