Merge branch 'main' of https://github.com/Netherlands3D/twin into fix…

…/gearwheel_red_ui # Conflicts: # Assets/Prefabs/UI/Layers/LayerUI.prefab: used theirs
Netherlands3D · Oct 17, 2024 · ea7a594 · ea7a594
2 parents 028cbca + 3d8d498
commit ea7a594
Show file tree

Hide file tree

Showing 43 changed files with 7,411 additions and 1,408 deletions.
diff --git a/Assets/Prefabs/3DTiles/Nieuwe laag (3D Tiles).prefab b/Assets/Prefabs/3DTiles/Nieuwe laag (3D Tiles).prefab
diff --git a/Assets/Prefabs/ObjImporter.prefab b/Assets/Prefabs/ObjImporter.prefab
diff --git a/Assets/Prefabs/ObjImporter.prefab.meta b/Assets/Prefabs/ObjImporter.prefab.meta
diff --git a/Assets/Prefabs/UI/Layers/LayerUI.prefab b/Assets/Prefabs/UI/Layers/LayerUI.prefab