You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Katharina Ziolkowski 8a93b00e72 Merge branch 'develop' into feature/entity_rework ... # Conflicts: # scenes/scene_credits.tscn # scenes/scene_farm_outside_2d.tscn # scenes/scene_fight_world_room.tscn # scenes/scene_indoor_vesnas_room.tscn # scenes/scene_outside_beets.tscn # scripts/CSharp/Common/Farming/PlantBehaviour2D.cs		2 months ago
..
CSharp	Merge branch 'develop' into feature/entity_rework	2 months ago
GdScript	🐛 fixed dialogic bugs and moved trash items out of the way	4 months ago