.gitignore

@@ -1,2 +1 @@
 *.gcode
-*.json

Bookmark/Cat/LICENSE.txt

@@ -1,3 +0,0 @@
-https://www.thingiverse.com/thing:6152924
-
-Peeking Cat Bookmark by sameenkarim is licensed under the Creative Commons - Attribution license.

BreadLame/LICENSE.txt

@@ -1 +0,0 @@
-This thing was created by Thingiverse user Gyrobot, and is licensed under Creative Commons - Attribution - Share Alike

BreadLame/Mod/LICENSE.txt

@@ -1 +0,0 @@
-This thing was created by Thingiverse user stxal, and is licensed under Creative Commons - Attribution - Share Alike

Fidget Toys/Fractal Fidget Star/LICENSE.txt

@@ -1,3 +0,0 @@
-https://www.thingiverse.com/thing:4802126
-
-Fractal Fidget Star by chuuckaduuck is licensed under the Creative Commons - Public Domain Dedication license.

Fidget Toys/Gear/LICENSE.txt

@@ -1,3 +0,0 @@
-https://www.thingiverse.com/thing:2234364
-
-MakerBot Fidget Gear by MakerBotPartnerLibrary is licensed under the Creative Commons - Attribution - Non-Commercial license.

Fidget Toys/New Gear/LICENSE.txt

@@ -1,3 +0,0 @@
-https://www.thingiverse.com/thing:5246683
-
-Symmetrical version of MakerBot Fidget Gear (Three gears instead of two) by Zachthedude101 is licensed under the Creative Commons - Attribution license.

Kobayashi/LICENSE.txt

@@ -1,3 +0,0 @@
-https://www.thingiverse.com/thing:6385663
-
-Customizable Text Kobayashi Fidget Cube by Seriousbug is licensed under the Creative Commons - Attribution - Share Alike license.

Kobayashi/Original/LICENSE.txt

@@ -1,3 +0,0 @@
-https://www.thingiverse.com/thing:1790624
-
-Kobayashi Fidget Cube - Fat Hinge - Flat by markinthebox is licensed under the Creative Commons - Attribution - Share Alike license.

gift-box.scad

@@ -3,25 +3,21 @@
 # Parameters
 
  */
-$box_inner_width = 88;
-$box_inner_depth = 56;
-$box_inner_height = 56;
+$box_inner_width = 15;
+$box_inner_depth = 6;
+$box_inner_height = 15;
 $box_wall_thickness = 6;
 // [0, 1] Higher the ratio, the bigger the bottom will be.
 $box_bottom_top_height_fraction = 0.2;
 // [0, 1] The amount the bottom and top will overlap.
-$overlap_fraction = 0.45;
+$overlap_fraction = 0.8;
 // [0, 1] The thickness of the overlap as a fraction of the wall thickness.
 $overlap_thickness_fraction = 0.5;
-// In mm, the gap between the lid and bottom in the overlap area. Increase this number if the lid is too tight, lower it if the lid is too loose.
-$overlap_gap = 0.25;
+// [1, *] Bottom scale. Scale the bottom up by settings this to a small amount like 1.05 to increase the gap between lid and bottom. Raise this number if the lid is too tight and won't go in, lower it if the lid is too loose.
+$bottom_scale = 1.05;
 // [0, 1] Screw scale. Lower this number if the screw is too tight and won't go through the hole.
 $lid_screw_scale = 0.94;
 
-$lid = true;
-$bottom = true;
-$screw = true;
-
 /**
  
 # Code
@@ -41,33 +37,27 @@ $top_height = $box_inner_height * (1 - $box_bottom_top_height_fraction);
 $overlap_height = $box_inner_height * $overlap_fraction;
 $overlap_thickness = $box_wall_thickness * $overlap_thickness_fraction;
 
-/* ====  Screw ==== */
-if ($screw) {
-    scale([$lid_screw_scale, $lid_screw_scale, $lid_screw_scale])
-        translate([0, 0, 5])
-        rotate([90, 0, 0])
-        screw();
-};
-/* ====  Lid ==== */
-if ($lid) {
-    difference() {
-        bottom(overlap_gap=$overlap_gap * -1);
-        thread();
-    };
+scale([$lid_screw_scale, $lid_screw_scale, $lid_screw_scale])
+translate([0, 0, 5])
+rotate([90, 0, 0])
+    screw();
+
+difference() {
+    scale([$bottom_scale, $bottom_scale, 1])
+        bottom();
+    thread();
 };
 
-/* ====  Box ==== */
-if ($bottom) {
-    translate([-10, 0, $bottom_height + $top_height + 2 * $box_wall_thickness])
-        rotate([0, 180, 0])
-        difference() {
-            color("blue")
-                translate([$box_outer_width, 0, $bottom_height + $top_height + 2 * $box_wall_thickness])
-                rotate([0, 180, 0])
-                top();
-           thread();
-        };
-};
+translate([-10, 0, $bottom_height + $top_height + 2 * $box_wall_thickness])
+    rotate([0, 180, 0])
+    difference() {
+        color("blue")
+            translate([$box_outer_width, 0, $bottom_height + $top_height + 2 * $box_wall_thickness])
+            rotate([0, 180, 0])
+            top();
+       thread();
+    };
+
 module top() {
     difference() {
         box_half($box_inner_width, $box_inner_depth, $top_height, $box_wall_thickness);
@@ -80,15 +70,13 @@ module top() {
     };
 }    
 
-module bottom(overlap_gap=0) {
+module bottom() {
     union() {
         box_half($box_inner_width, $box_inner_depth, $bottom_height, $box_wall_thickness);
-        color("#FF0")
         box_half(
-            $box_inner_width + $box_wall_thickness - overlap_gap * 2,
-            $box_inner_depth + $box_wall_thickness - overlap_gap * 2,
-            $overlap_height + $box_wall_thickness,
-            $overlap_thickness + overlap_gap
+            $box_inner_width + $box_wall_thickness,
+            $box_inner_depth + $box_wall_thickness, $overlap_height + $box_wall_thickness,
+            $overlap_thickness
         );
     };
 };
@@ -105,12 +93,12 @@ module box_half($width, $depth, $height, $wall_thickness) {
     };
 };
 
-$thread_z_offset = $bottom_height + $overlap_height / 2 + 2;
+$thread_z_offset = $bottom_height + $overlap_height / 2 + 7;
 
-$screw_scale = 0.5;
+$screw_scale = 0.33;
 module thread(length=$box_wall_thickness * (1/$screw_scale)) {
     color("pink")
-        translate([$box_outer_width / 2, $box_wall_thickness + 1.1, $thread_z_offset])
+        translate([$box_outer_width / 2, $box_wall_thickness + 0.1, $thread_z_offset])
         rotate([90, 0, 0])
         scale([$screw_scale, $screw_scale, $screw_scale])
         trapezoidThread(length=length);
@@ -120,7 +108,7 @@ module screw() {
     color("orange")
         translate([$box_outer_width / 2, 0, $thread_z_offset])
         rotate([90, 0, 0])
-        cylinder(h=5, d=18, $fn=6);
+        cylinder(h=5, d=15, $fn=6);
     color("red")
         translate([0, 0, 0])
         thread(length=$box_wall_thickness * (1/$screw_scale));