K0RB4K dadb97e2c6 Merge remote-tracking branch 'origin/Assets' into Assets ... # Conflicts: # Assets/Models/Blender/Indoor_plant_02.blend # Assets/Models/Blender/Indoor_plant_02.blend.meta # Assets/Models/Blender/laser_cutter.blend.meta # Assets/Texture/LaserCutter.meta # Assets/Texture/LaserCutter/Body.png.meta		2023-01-12 12:09:52 +01:00
..
Environment	Working on table hologram	2023-01-06 13:13:52 +01:00
IndoorPlants	indoor plants	2023-01-12 12:07:26 +01:00
LaserCutter	indoor plants	2023-01-12 12:07:26 +01:00
Screwdriver	added some colliders and models to scene	2023-01-12 10:48:37 +01:00
Table	Working on table hologram	2023-01-06 13:13:52 +01:00
Environment.meta	Tri	2023-01-06 08:55:48 +01:00
IndoorPlants.meta	indoor plants	2023-01-12 12:07:26 +01:00
LaserCutter.meta	indoor plants	2023-01-12 12:07:26 +01:00
Office_chair_fabric_dif.png	Tri	2023-01-06 08:55:48 +01:00
Office_chair_fabric_dif.png.meta	Tri	2023-01-06 08:55:48 +01:00
Screwdriver.meta	added some colliders and models to scene	2023-01-12 10:48:37 +01:00
Table.meta	Tri	2023-01-06 08:55:48 +01:00
Ultimaker.png	Tri	2023-01-06 08:55:48 +01:00
Ultimaker.png.meta	Tri	2023-01-06 08:55:48 +01:00
Wood.jpg	added glass shelf	2023-01-10 11:41:06 +01:00
Wood.jpg.meta	added glass shelf	2023-01-10 11:41:06 +01:00