flatten folder structure to prevent user error when files downloaded individually

regenerate stl files, no significant difference

Author: vector76

Renders/base_lid.stl

@@ -10,7 +10,7 @@
 %OPENSCAD% gridfinity_basic_cup.scad -D width=2 -D depth=1 -D height=3 -D chambers=5 -D fingerslide=true -D withLabel=true -o Renders/divided_cup_2x1x3x5.stl --export-format binstl
 %PYTHON% canonicalize.py Renders/divided_cup_2x1x3x5.stl
 
-%OPENSCAD% gridfinity_baseplate.scad -D -o Renders/baseplate.stl --export-format binstl
+%OPENSCAD% gridfinity_baseplate.scad -o Renders/baseplate.stl --export-format binstl
 %PYTHON% canonicalize.py Renders/baseplate.stl
 
 %OPENSCAD% gridfinity_baseplate.scad -D weighted=true -o Renders/weighted_baseplate.stl --export-format binstl
@@ -19,28 +19,28 @@
 %OPENSCAD% gridfinity_baseplate.scad -D lid=true -o Renders/base_lid.stl --export-format binstl
 %PYTHON% canonicalize.py Renders/base_lid.stl
 
-%OPENSCAD% gridfinity_glue_stick.scad -o  Renders/glue_stick_cup.stl --export-format binstl
-%PYTHON% canonicalize.py  Renders/glue_stick_cup.stl
+%OPENSCAD% gridfinity_glue_stick.scad -o Renders/glue_stick_cup.stl --export-format binstl
+%PYTHON% canonicalize.py Renders/glue_stick_cup.stl
 
-%OPENSCAD% gridfinity_flsun_q5.scad -o  Renders/flsun_q5.stl --export-format binstl
-%PYTHON% canonicalize.py  Renders/flsun_q5.stl
+%OPENSCAD% gridfinity_flsun_q5.scad -o Renders/flsun_q5.stl --export-format binstl
+%PYTHON% canonicalize.py Renders/flsun_q5.stl
 
-%OPENSCAD% gridfinity_socket_holder.scad -D part=1 -o  Renders/socket_holder_metric.stl --export-format binstl
-%PYTHON% canonicalize.py  Renders/socket_holder_metric.stl
+%OPENSCAD% gridfinity_socket_holder.scad -D part=1 -o Renders/socket_holder_metric.stl --export-format binstl
+%PYTHON% canonicalize.py Renders/socket_holder_metric.stl
 
-%OPENSCAD% gridfinity_socket_holder.scad -D part=2 -o  Renders/socket_holder_imperial.stl --export-format binstl
-%PYTHON% canonicalize.py  Renders/socket_holder_imperial.stl
+%OPENSCAD% gridfinity_socket_holder.scad -D part=2 -o Renders/socket_holder_imperial.stl --export-format binstl
+%PYTHON% canonicalize.py Renders/socket_holder_imperial.stl
 
-%OPENSCAD% gridfinity_socket_holder.scad -D part=3 -o  Renders/socket_holder_imperial_small.stl --export-format binstl
-%PYTHON% canonicalize.py  Renders/socket_holder_imperial_small.stl
+%OPENSCAD% gridfinity_socket_holder.scad -D part=3 -o Renders/socket_holder_imperial_small.stl --export-format binstl
+%PYTHON% canonicalize.py Renders/socket_holder_imperial_small.stl
 
-%OPENSCAD% gridfinity_socket_holder.scad -D part=4 -o  Renders/socket_holder_imperial_big.stl --export-format binstl
-%PYTHON% canonicalize.py  Renders/socket_holder_imperial_big.stl
+%OPENSCAD% gridfinity_socket_holder.scad -D part=4 -o Renders/socket_holder_imperial_big.stl --export-format binstl
+%PYTHON% canonicalize.py Renders/socket_holder_imperial_big.stl
 
-%OPENSCAD% gridfinity_socket_holder.scad -D part=5 -o  Renders/socket_holder_metric_stacking.stl --export-format binstl
-%PYTHON% canonicalize.py  Renders/socket_holder_metric_stacking.stl
+%OPENSCAD% gridfinity_socket_holder.scad -D part=5 -o Renders/socket_holder_metric_stacking.stl --export-format binstl
+%PYTHON% canonicalize.py Renders/socket_holder_metric_stacking.stl
 
-%OPENSCAD% gridfinity_socket_holder.scad -D part=6 -o  Renders/socket_holder_metric_small.stl --export-format binstl
-%PYTHON% canonicalize.py  Renders/socket_holder_metric_small.stl
+%OPENSCAD% gridfinity_socket_holder.scad -D part=6 -o Renders/socket_holder_metric_small.stl --export-format binstl
+%PYTHON% canonicalize.py Renders/socket_holder_metric_small.stl
 
 pause

Renders/baseplate.stl

@@ -1,5 +1,5 @@
 // include instead of use, so we get the pitch
-include <modules/gridfinity_modules.scad>
+include <gridfinity_modules.scad>
 
 xsize = 5;
 ysize = 3;

Renders/divided_cup_2x1x2x5.stl

@@ -1,5 +1,5 @@
-// include <modules/gridfinity_modules.scad>
-use <modules/gridfinity_cup_modules.scad>
+// include <gridfinity_modules.scad>
+use <gridfinity_cup_modules.scad>
 
 // X dimension in grid units
 width = 2;
@@ -14,8 +14,8 @@ chambers = 1;
 withLabel = false;
 // Include larger corner fillet
 fingerslide = true;
-// Width of the label in number of units: positive numbers are measured from the 0 end, negative numbers are measured from the far end
-labelWidth = -1;  // .1
+// Width of the label in number of units: positive numbers are measured from the 0 end, negative numbers are measured from the far end, value of zero means full width (as long as withLabel is true)
+labelWidth = 0;  // .1
 
 // Set magnet diameter and depth to 0 to print without magnet holes
 // (Zack's design uses magnet diameter of 6.5)

Renders/divided_cup_2x1x3x5.stl

@@ -103,7 +103,7 @@ module partitioned_cavity(num_x, num_y, num_z, chambers=default_chambers, withLa
     }
     // this is the label
     if (withLabel) {
-      label_num_x = labelWidth == "full" ? num_x : labelWidth;
+      label_num_x = (labelWidth == "full" || labelWidth == 0) ? num_x : labelWidth;
       label_pos_x = label_num_x >= 0 ? 0 : num_x + label_num_x;
       hull() for (i=[0,1, 2])
       translate([(-gridfinity_pitch/2) + (label_pos_x * gridfinity_pitch), yz[i][0], yz[i][1]])

Renders/flsun_q5.stl

@@ -1,5 +1,5 @@
 // include instead of use, so we get the pitch
-include <modules/gridfinity_modules.scad>
+include <gridfinity_modules.scad>
 use <gridfinity_baseplate.scad>   // for frame_plain
 
 translate([gridfinity_pitch/2, gridfinity_pitch/2, 0]) frame_plain(4, 1);

Renders/socket_holder_imperial.stl

@@ -1,4 +1,4 @@
-include <modules/gridfinity_modules.scad>
+include <gridfinity_modules.scad>
 
 cup_height = 5;
 stick_diameter = 30;

Renders/socket_holder_imperial_big.stl

@@ -1,4 +1,4 @@
-include <modules/gridfinity_modules.scad>
+include <gridfinity_modules.scad>
 
 /* [Utensil count and measurements] */
 // Utensil definitions above this number are ignored

Renders/socket_holder_imperial_small.stl

@@ -1,4 +1,4 @@
-include <modules/gridfinity_modules.scad>
+include <gridfinity_modules.scad>
 
 part = 5;