Merge branch 'dev-v1.1'

Conflicts: Mult-material/Openscad/extruder-drive.scad Mult-material/Print-mendel-mult-material/Individual-STLs/Old/bottom-arm.stl Mult-material/Print-mendel-mult-material/Individual-STLs/Old/drive-plate.stl Mult-material/Print-mendel-mult-material/Individual-STLs/Old/peristaltic-pump-arm.gcode Mult-material/Print-mendel-mult-material/Individual-STLs/Old/top-arm.stl Openscad/pcb-clip-readme.scad Openscad/x-carriage-readme.scad dxf/tapered-nut.dxf
ashahin91 · Apr 18, 2013 · 995196f · 995196f
2 parents 3ac5957 + e4d895c
commit 995196f
Show file tree

Hide file tree

Showing 270 changed files with 1,420,465 additions and 1,829,187 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,2 @@
+.DS_Store
+~*
diff --git a/Instructions/Bed Assembly.odt b/Instructions/Bed Assembly.odt
diff --git a/Instructions/P1 Introduction.odt b/Instructions/P1 Introduction.odt
diff --git a/Instructions/P2 Frame.odt b/Instructions/P2 Frame.odt
diff --git a/Instructions/P3 Y axis.odt b/Instructions/P3 Y axis.odt
diff --git a/Instructions/P4 X axis.odt b/Instructions/P4 X axis.odt
diff --git a/Mult-material/Calibration/Calibration 1/Calibration.ipt b/Mult-material/Calibration/Calibration 1/Calibration.ipt
diff --git a/Mult-material/Calibration/Calibration 1/Calibration.rfo b/Mult-material/Calibration/Calibration 1/Calibration.rfo
diff --git a/Mult-material/Calibration/Calibration 1/Calibration.stl b/Mult-material/Calibration/Calibration 1/Calibration.stl
diff --git a/Mult-material/Calibration/Calibration 1/Extruder1.stl b/Mult-material/Calibration/Calibration 1/Extruder1.stl
diff --git a/Mult-material/Calibration/Calibration 1/Extruder2.stl b/Mult-material/Calibration/Calibration 1/Extruder2.stl
diff --git a/Mult-material/Calibration/Calibration 1/Extruder3.stl b/Mult-material/Calibration/Calibration 1/Extruder3.stl
diff --git a/Mult-material/Calibration/Calibration 1/OldVersions/Calibration.0003.ipt b/Mult-material/Calibration/Calibration 1/OldVersions/Calibration.0003.ipt
diff --git a/Mult-material/Calibration/Calibration 2/Calibration.SLDPRT b/Mult-material/Calibration/Calibration 2/Calibration.SLDPRT
diff --git a/Mult-material/Calibration/Calibration 2/Mainextruder.STL b/Mult-material/Calibration/Calibration 2/Mainextruder.STL
diff --git a/Mult-material/Calibration/Calibration 2/SecondaryExtruder.STL b/Mult-material/Calibration/Calibration 2/SecondaryExtruder.STL
diff --git a/Mult-material/README b/Mult-material/README
diff --git a/Mult-material/Sample Parts/Companion Cube/DarkGrey.stl b/Mult-material/Sample Parts/Companion Cube/DarkGrey.stl
diff --git a/Mult-material/Sample Parts/Companion Cube/Extra_Printable_Companion_Cube.SLDPRT b/Mult-material/Sample Parts/Companion Cube/Extra_Printable_Companion_Cube.SLDPRT
diff --git a/...ube/Imported Components/Extra_Printable_Companion_Cube/Extra_Printable_Companion_Cube.htm b/...ube/Imported Components/Extra_Printable_Companion_Cube/Extra_Printable_Companion_Cube.htm
diff --git a/Mult-material/Sample Parts/Companion Cube/LightGrey.STL b/Mult-material/Sample Parts/Companion Cube/LightGrey.STL
diff --git a/Mult-material/Sample Parts/Companion Cube/Red.STL b/Mult-material/Sample Parts/Companion Cube/Red.STL
diff --git a/Mult-material/Sample Parts/Companion Cube/cube.rfo b/Mult-material/Sample Parts/Companion Cube/cube.rfo
diff --git a/Mult-material/Sample Parts/Dice/Black.stl b/Mult-material/Sample Parts/Dice/Black.stl
diff --git a/Mult-material/Sample Parts/Dice/Dice.ipt b/Mult-material/Sample Parts/Dice/Dice.ipt
diff --git a/Mult-material/Sample Parts/Dice/Dice.rfo b/Mult-material/Sample Parts/Dice/Dice.rfo
diff --git a/Mult-material/Sample Parts/Dice/Dice.scad b/Mult-material/Sample Parts/Dice/Dice.scad
@@ -0,0 +1,12 @@
+union()
+{
+ multmatrix(m = [ [1.0, 0.0, 0.0, 100.0], 
+   [0.0, 1.0, 0.0, 85.0], 
+   [0.0, 0.0, 1.0, 15.0], 
+   [0.0, 0.0, 0.0, 1.0]]) 
+   {
+      import_stl("Red.stl", convexity = 10);
+      import_stl("White.stl", convexity = 10);
+      import_stl("Black.stl", convexity = 10);
+   }
+}
diff --git a/Mult-material/Sample Parts/Dice/OldVersions/Dice.0002.ipt b/Mult-material/Sample Parts/Dice/OldVersions/Dice.0002.ipt
diff --git a/Mult-material/Sample Parts/Dice/Red.stl b/Mult-material/Sample Parts/Dice/Red.stl
diff --git a/Mult-material/Sample Parts/Dice/White.stl b/Mult-material/Sample Parts/Dice/White.stl
diff --git a/Mult-material/Sample Parts/Love Sculpture/Combine.scad b/Mult-material/Sample Parts/Love Sculpture/Combine.scad
@@ -0,0 +1,2 @@
+import("LOVE_SCULPTURE_L.STL");
+import("LOVE_SCULPTURE_E.STL");
diff --git a/Mult-material/Sample Parts/Love Sculpture/LOVE_SCULPTURE.rfo b/Mult-material/Sample Parts/Love Sculpture/LOVE_SCULPTURE.rfo
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		import("LOVE_SCULPTURE_L.STL");
		import("LOVE_SCULPTURE_E.STL");