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	Setup Neon Lighting	2023-01-10 10:41:31 +01:00
IndoorPlant	indoor plants	2023-01-12 12:07:26 +01:00
Keyboard	Fix blender	2023-01-12 12:06:12 +01:00
Screen	fix blender imports	2023-01-12 11:56:39 +01:00
Screwdriver	added some colliders and models to scene	2023-01-12 10:48:37 +01:00
Table	Placing assets in scene	2023-01-09 15:42:52 +01:00
TV	Placing assets in scene	2023-01-09 15:42:52 +01:00
Chair wheels.physicMaterial	Tri	2023-01-06 08:55:48 +01:00
Chair wheels.physicMaterial.meta	Tri	2023-01-06 08:55:48 +01:00
Environment.meta	Tri	2023-01-06 08:55:48 +01:00
Glass.mat	added glass shelf	2023-01-10 11:41:06 +01:00
Glass.mat.meta	added glass shelf	2023-01-10 11:41:06 +01:00
Hologram.mat	Test Hologram	2023-01-06 14:43:29 +01:00
Hologram.mat.meta	Test Hologram	2023-01-06 14:43:29 +01:00
Hologram.shader	Test Hologram	2023-01-06 14:43:29 +01:00
Hologram.shader.meta	Test Hologram	2023-01-06 14:43:29 +01:00
IndoorPlant.meta	indoor plants	2023-01-12 12:07:26 +01:00
Keyboard.meta	fix blender imports	2023-01-12 11:56:39 +01:00
Screen.meta	fix blender imports	2023-01-12 11:56:39 +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
TV.meta	Placing assets in scene	2023-01-09 15:42:52 +01:00
Ultimaker.mat	Tri	2023-01-06 08:55:48 +01:00
Ultimaker.mat.meta	Tri	2023-01-06 08:55:48 +01:00