correct merge

2022-03-21 22:01:45 +08:00 · 2022-03-21 22:01:45 +08:00 · 7f605f27a1
commit 7f605f27a1
parent 0495bc4dcd
75 changed files with 1984 additions and 3559 deletions
--- a/rasmt_support/meshes/collision/Base_Link.STL
+++ b/rasmt_support/meshes/collision/Base_Link.STL
--- a/rasmt_support/meshes/collision/Base_Link.stl
+++ b/rasmt_support/meshes/collision/Base_Link.stl
--- a/rasmt_support/meshes/collision/Dock_Link.STL
+++ b/rasmt_support/meshes/collision/Dock_Link.STL
--- a/rasmt_support/meshes/collision/Dock_Link.stl
+++ b/rasmt_support/meshes/collision/Dock_Link.stl
--- a/rasmt_support/meshes/collision/Fork_1.STL
+++ b/rasmt_support/meshes/collision/Fork_1.STL
--- a/rasmt_support/meshes/collision/Fork_1.stl
+++ b/rasmt_support/meshes/collision/Fork_1.stl
--- a/rasmt_support/meshes/collision/Fork_2.STL
+++ b/rasmt_support/meshes/collision/Fork_2.STL
--- a/rasmt_support/meshes/collision/Fork_2.stl
+++ b/rasmt_support/meshes/collision/Fork_2.stl
--- a/rasmt_support/meshes/collision/Fork_3.STL
+++ b/rasmt_support/meshes/collision/Fork_3.STL
--- a/rasmt_support/meshes/collision/Fork_3.stl
+++ b/rasmt_support/meshes/collision/Fork_3.stl
--- a/rasmt_support/meshes/collision/Grip_Body.STL
+++ b/rasmt_support/meshes/collision/Grip_Body.STL
--- a/rasmt_support/meshes/collision/Grip_Body.stl
+++ b/rasmt_support/meshes/collision/Grip_Body.stl
--- a/rasmt_support/meshes/collision/Grip_L.STL
+++ b/rasmt_support/meshes/collision/Grip_L.STL
--- a/rasmt_support/meshes/collision/Grip_L.stl
+++ b/rasmt_support/meshes/collision/Grip_L.stl
--- a/rasmt_support/meshes/collision/Grip_R.STL
+++ b/rasmt_support/meshes/collision/Grip_R.STL
--- a/rasmt_support/meshes/collision/Grip_R.stl
+++ b/rasmt_support/meshes/collision/Grip_R.stl
--- a/rasmt_support/meshes/collision/Link_1.STL
+++ b/rasmt_support/meshes/collision/Link_1.STL
--- a/rasmt_support/meshes/collision/Link_1.stl
+++ b/rasmt_support/meshes/collision/Link_1.stl
--- a/rasmt_support/meshes/collision/Link_2.STL
+++ b/rasmt_support/meshes/collision/Link_2.STL
--- a/rasmt_support/meshes/collision/Link_2.stl
+++ b/rasmt_support/meshes/collision/Link_2.stl
--- a/rasmt_support/meshes/collision/cube5x.STL
+++ b/rasmt_support/meshes/collision/cube5x.STL
--- a/rasmt_support/meshes/images/Base_Link.jpg
+++ b/rasmt_support/meshes/images/Base_Link.jpg
--- a/rasmt_support/meshes/images/Dock_Link.jpg
+++ b/rasmt_support/meshes/images/Dock_Link.jpg
--- a/rasmt_support/meshes/images/Fork_1,2,3.jpg
+++ b/rasmt_support/meshes/images/Fork_1,2,3.jpg
--- a/rasmt_support/meshes/images/Grip_Body.jpg
+++ b/rasmt_support/meshes/images/Grip_Body.jpg
--- a/rasmt_support/meshes/images/Grip_L,R.jpg
+++ b/rasmt_support/meshes/images/Grip_L,R.jpg
--- a/rasmt_support/meshes/images/Link_1,2.jpg
+++ b/rasmt_support/meshes/images/Link_1,2.jpg
--- a/rasmt_support/meshes/visual/Base_Link.dae
+++ b/rasmt_support/meshes/visual/Base_Link.dae
--- a/rasmt_support/meshes/visual/Dock_Link.dae
+++ b/rasmt_support/meshes/visual/Dock_Link.dae
--- a/rasmt_support/meshes/visual/Fork_1.dae
+++ b/rasmt_support/meshes/visual/Fork_1.dae
--- a/rasmt_support/meshes/visual/Fork_2.dae
+++ b/rasmt_support/meshes/visual/Fork_2.dae
--- a/rasmt_support/meshes/visual/Fork_3.dae
+++ b/rasmt_support/meshes/visual/Fork_3.dae
--- a/rasmt_support/meshes/visual/Grip_Body.dae
+++ b/rasmt_support/meshes/visual/Grip_Body.dae
--- a/rasmt_support/meshes/visual/Grip_L.dae
+++ b/rasmt_support/meshes/visual/Grip_L.dae
--- a/rasmt_support/meshes/visual/Grip_R.dae
+++ b/rasmt_support/meshes/visual/Grip_R.dae
--- a/rasmt_support/meshes/visual/Link_1.dae
+++ b/rasmt_support/meshes/visual/Link_1.dae
--- a/rasmt_support/meshes/visual/Link_2.dae
+++ b/rasmt_support/meshes/visual/Link_2.dae