Merge branch 'main' of http://sgda.game-dev.space/SGDA/EGJ25

# Conflicts:
#	assets/garance/EGJ-Green-tiles.png
#	assets/garance/EGJ-Green-tiles.png.import

assets/garance/EGJ-PriseElectrique.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://bc3tdjrupw6vf"
+path="res://.godot/imported/EGJ-PriseElectrique.png-a8fa4eaee2608b011ea3ea9509ee8c06.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/garance/EGJ-PriseElectrique.png"
+dest_files=["res://.godot/imported/EGJ-PriseElectrique.png-a8fa4eaee2608b011ea3ea9509ee8c06.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1