Jonathan/Babushka
2
0
Fork 0
Code Pull Requests 1 Releases Activity

Merge remote-tracking branch 'origin/main' into c_sharp_setup

Browse Source 
# Conflicts:
#	scripts/CSharp/Common/CharacterControls/VesnaBehaviour.cs.uid
#	scripts/CSharp/Common/Farming/FieldService.cs.uid
This commit is contained in:
Katharina Ziolkowski
2025-04-24 21:22:56 +02:00
parent 20b37de108 7d1187d218
commit 7e19268847
21 changed files with 317 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
art/mockups/3d/best_house_blender.blend.import
+2 -1
View File
@@ -4,11 +4,12 @@ importer="scene"
importer_version=1
type="PackedScene"
uid="uid://b3kyrsoobmkhp"
valid=false
path="res://.godot/imported/best_house_blender.blend-ac89c74aef2f275bdf4b4baadee17c0c.scn"
[deps]
source_file="res://art/mockups/3d/best_house_blender.blend"
dest_files=["res://.godot/imported/best_house_blender.blend-ac89c74aef2f275bdf4b4baadee17c0c.scn"]
[params]