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/Fire_Column_Medium_10.png-505d756e8645c45b6fb339fbb6f8add5.stex"
path="res://.import/fire_column_medium_10.png-9ae78a0f5ef8531c3b56d09574ecd317.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://Sprites/Levels/Environment/Fire_Column_Medium_10.png"
dest_files=[ "res://.import/Fire_Column_Medium_10.png-505d756e8645c45b6fb339fbb6f8add5.stex" ]
source_file="res://Sprites/Levels/Environment/fire_column_medium_10.png"
dest_files=[ "res://.import/fire_column_medium_10.png-9ae78a0f5ef8531c3b56d09574ecd317.stex" ]
[params]