Commit Graph

7 Commits

Author SHA1 Message Date
Axel Galand
f774a35bcd added hands to figurines 2023-01-26 16:38:01 +01:00
ac1b67140b
netbox optimized 2023-01-26 11:14:01 +01:00
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
7c2b32d452
small laser cutter fixes 2023-01-23 10:44:35 +01:00
Axel Galand
7851343575 merge + added city 2023-01-23 09:17:24 +01:00
400e23adc9
merge remote to laser cutter 2023-01-19 12:18:04 +01:00
947ce85ffb
laser cutter done 2023-01-19 12:04:13 +01:00