Skip to content

Commit

Permalink
v3.0 merge.
Browse files Browse the repository at this point in the history
  • Loading branch information
revarbat committed Jan 10, 2018
2 parents 217f8d4 + 991e18d commit 1af4801
Show file tree
Hide file tree
Showing 157 changed files with 196,756 additions and 180,862 deletions.
11 changes: 7 additions & 4 deletions GDMUtils.scad
Original file line number Diff line number Diff line change
Expand Up @@ -818,7 +818,7 @@ module fillet_hole_mask(r=1.0, fillet=0.25, xtilt=0, ytilt=0)


// For when you MUST pass a child to a module, but you want it to be nothing.
module nil() difference() {cube(0.1, center=true); cube(0.2, center=true);}
module nil() union();


// Makes a cube that is centered in X and Y axes, and has its bottom aligned with Z=0.
Expand Down Expand Up @@ -1085,9 +1085,12 @@ module right_triangle(size=[1, 1, 1], center=false)
],
faces=[
[0, 1, 2],
[0, 2, 5, 3],
[0, 3, 4, 1],
[1, 4, 5, 2],
[0, 2, 5],
[0, 5, 3],
[0, 3, 4],
[0, 4, 1],
[1, 4, 5],
[1, 5, 2],
[3, 5, 4]
],
convexity=2
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
OPENSCAD=/Applications/OpenSCAD.app/Contents/MacOS/OpenSCAD
CONVERT=convert
SNAPPYVER="v2.0"
SNAPPYVER="v3.0"
PARTFILES=$(sort $(wildcard *_parts.scad))
TARGETS=$(patsubst %.scad,STLs/%.stl,${PARTFILES})
ROTFILES=$(shell seq -f 'wiki/${SNAPPYVER}-snappy_rot%03g.png' 0 10 359.99)
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
![Snappy Full Rendering](https://github.com/revarbat/snappy-reprap/wiki/v2.0-snappy_small.png)
![Snappy Full Rendering](https://github.com/revarbat/snappy-reprap/wiki/v3.0-snappy_small.png)

Snappy-Reprap 2
Snappy-Reprap 3
===============

A parametric design for a cheap self-replicating 3D printer (reprap) that snaps together to minimize screws and non-printed parts.
Expand All @@ -10,9 +10,9 @@ Important Links:
What | URL
-------------------- | -------------------------------------------------------
GitHub Repository | https://github.com/revarbat/snappy-reprap
Project Wiki | https://github.com/revarbat/snappy-reprap/wiki/v2.0-Home
Bill of Materials | https://github.com/revarbat/snappy-reprap/wiki/v2.0-BOM
How to Assemble | https://github.com/revarbat/snappy-reprap/wiki/v2.0-Assembly
Project Wiki | https://github.com/revarbat/snappy-reprap/wiki/v3.0-Home
Bill of Materials | https://github.com/revarbat/snappy-reprap/wiki/v3.0-BOM
How to Assemble | https://github.com/revarbat/snappy-reprap/wiki/v3.0-Assembly
RepRap.org Wiki Page | http://reprap.org/wiki/Snappy
Dev Forum | https://groups.google.com/forum/#!forum/snappy-reprap-dev

Expand Down
Loading

0 comments on commit 1af4801

Please sign in to comment.