Florian b6816602ed Merge remote-tracking branch 'origin/main' ... # Conflicts: # blueberryPeak/Assets/Wwise/Editor/ProjectData/AkWwiseProjectData.asset		2025-06-13 16:04:07 +02:00
..
Char	beacer,json+beaver+forest	2025-06-13 15:17:42 +02:00
Env	Market with Sound	2025-06-13 16:00:09 +02:00
Forest	beacer,json+beaver+forest	2025-06-13 15:17:42 +02:00
Market	market 0.5	2025-06-13 11:13:07 +02:00
Camera.prefab	idk	2025-06-13 10:00:53 +02:00
Camera.prefab.meta	dialog builder 3.0	2025-06-12 16:24:01 +02:00
Char.meta	beacer,json+beaver+forest	2025-06-13 15:17:42 +02:00
Env.meta	wheres my ac	2025-06-11 15:36:54 +02:00
Forest.meta	beacer,json+beaver+forest	2025-06-13 15:17:42 +02:00
Market.meta	market 0.5	2025-06-13 11:13:07 +02:00