Revert "correct merge"

This reverts commit 7f605f27a1.
2022-03-21 23:19:30 +08:00 · 2022-03-21 23:19:30 +08:00 · f18ccccd7e
commit f18ccccd7e
parent 7f605f27a1
75 changed files with 3558 additions and 1983 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