Commit Graph

2 Commits

Author SHA1 Message Date
114a65b46f Merge branch 'master' of ooftooft.net:Racesm
# Conflicts:
#	Assets/Imported Assets/SimpleNaturePack/SimpleNaturePack_2020.3_HDRP_v1.24.unitypackage.meta
#	Assets/ML-Agents/Timers/Car Customization_timers.json.meta
#	Assets/Prefabs/City Pieces/building_12.prefab.meta
#	Assets/Prefabs/City Pieces/building_13.prefab.meta
2024-04-23 13:04:00 +02:00
PokingPines
7b24b32475 map 3 updates 2024-04-23 10:46:43 +02:00