|
|
cb917ad376
|
Merge remote-tracking branch 'origin/Assets' into Assets
# Conflicts:
# Assets/Materials/LaserCutter.meta
# Assets/Materials/LaserCutter/laser_cutter-Body.mat.meta
# Assets/Materials/LaserCutter/laser_cutter-Posts.mat.meta
# Assets/Materials/LaserCutter/laser_cutter-Wheels.mat.meta
# Assets/Models/Blender/laser_cutter.mtl.meta
# Assets/Models/Blender/laser_cutter.obj.meta
# Assets/Texture/LaserCutter/LaserCutterInteriorBack.jpg.meta
# Assets/Texture/LaserCutter/LaserCutterInteriorLeft.jpg.meta
# Assets/Texture/LaserCutter/LaserCutterInteriorRight.jpg.meta
|
2023-01-23 10:45:24 +01:00 |
|