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
Green tiles (correct)
2025-06-29 09:54:51 +02:00 · 2025-06-29 09:49:48 +02:00
2 changed files with 3 additions and 3 deletions
--- a/assets/garance/EGJ-Green-tiles.png
+++ b/assets/garance/EGJ-Green-tiles.png
--- a/assets/garance/EGJ-Green-tiles.png.import
+++ b/assets/garance/EGJ-Green-tiles.png.import
@ -2,7 +2,7 @@

 importer="texture"
 type="CompressedTexture2D"
-uid="uid://ch7k58hcv4d0y"
+uid="uid://lqn1agbqybrv"
 path="res://.godot/imported/EGJ-Green-tiles.png-1c52bebef5d392ae5c1aa00936fe3f02.ctex"
 metadata={
 "vram_texture": false
Author	SHA1	Message	Date
Garance	de8079f0da	Merge branch 'main' of http://sgda.game-dev.space/SGDA/EGJ25 All checks were successful Create tag and build when new code gets to main / BumpTag (push) Successful in 8s Details Create tag and build when new code gets to main / Export (push) Successful in 2m32s Details # Conflicts: # assets/garance/EGJ-Green-tiles.png # assets/garance/EGJ-Green-tiles.png.import	2025-06-29 09:54:51 +02:00
Garance	ad040b4940	Green tiles (correct)	2025-06-29 09:49:48 +02:00