Merge branch 'master' into trackball

joshreve · Aug 20, 2021 · 8f7580b · 8f7580b
2 parents cdcde68 + 338510f
commit 8f7580b
Show file tree

Hide file tree

Showing 28 changed files with 34,110 additions and 234 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,6 +9,7 @@
 *.scad
 /target
 .idea/
+.DS_Store
 *.FCStd1
 debug_*
 */__pycache__/*

diff --git a/resources/Trackball_JS_Cluster.PNG b/resources/Trackball_JS_Cluster.PNG
diff --git a/resources/trackball_early_render.png b/resources/trackball_early_render.png
diff --git a/resources/trackball_early_render2.png b/resources/trackball_early_render2.png
diff --git a/resources/trackball_in_wall.png b/resources/trackball_in_wall.png
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,6 +9,7 @@ @@
     *.scad
     /target
     .idea/
+    .DS_Store
     *.FCStd1
     debug_*
     */__pycache__/*
@@ Expand Down @@