From 7623bc466030474ac7b8869db80b3e5bf47a169f Mon Sep 17 00:00:00 2001
From: Fen Dweller <chemicalcrux@gmail.com>
Date: Thu, 30 Dec 2021 10:05:39 -0600
Subject: [PATCH] Add corks

---
 media/attribution.js                    |  7 +++++
 media/objects/Corks/Champagne-Front.svg | 40 +++++++++++++++++++++++++
 media/objects/Corks/Champagne-Top.svg   | 40 +++++++++++++++++++++++++
 media/objects/Corks/Regular-Front.svg   | 40 +++++++++++++++++++++++++
 media/objects/Corks/Regular-Top.svg     | 40 +++++++++++++++++++++++++
 presets/objects.js                      |  1 +
 6 files changed, 168 insertions(+)
 create mode 100644 media/objects/Corks/Champagne-Front.svg
 create mode 100644 media/objects/Corks/Champagne-Top.svg
 create mode 100644 media/objects/Corks/Regular-Front.svg
 create mode 100644 media/objects/Corks/Regular-Top.svg

diff --git a/media/attribution.js b/media/attribution.js
index 2a8227db..57455ffe 100644
--- a/media/attribution.js
+++ b/media/attribution.js
@@ -20701,6 +20701,13 @@ const attributionData = {
                 "chemicalcrux"
             ]
         },
+        {
+            prefix: "./media/objects/Corks/",
+            all: null,
+            authors: [
+                "chemicalcrux"
+            ]
+        },
         {
             prefix: "./media/real-buildings/",
             all: "https://wiki.openstreetmap.org/wiki/Blender",
diff --git a/media/objects/Corks/Champagne-Front.svg b/media/objects/Corks/Champagne-Front.svg
new file mode 100644
index 00000000..de539d78
--- /dev/null
+++ b/media/objects/Corks/Champagne-Front.svg
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="1174pt"
+   height="1704pt"
+   viewBox="0 0 1174 1704"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg14"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs18" />
+  <metadata
+     id="metadata2">
+Created by potrace 1.16, written by Peter Selinger 2001-2019
+</metadata>
+  <g
+     transform="matrix(0.1,0,0,-0.1,-413,1852)"
+     fill="#000000"
+     stroke="none"
+     id="g6">
+    <path
+       d="m 5890,18499 c -231,-42 -242,-46 -436,-136 -181,-85 -197,-95 -310,-190 -153,-130 -223,-203 -435,-453 -128,-150 -201,-248 -276,-366 -92,-146 -109,-180 -173,-355 -66,-177 -74,-210 -101,-379 l -29,-185 v -1873 -1873 l 36,-177 c 40,-192 39,-192 157,-397 83,-145 105,-171 292,-340 64,-58 153,-116 445,-289 346,-205 370,-221 467,-314 92,-87 109,-109 164,-212 60,-110 63,-121 85,-255 l 22,-140 -250,-4165 -250,-4165 32,-165 c 18,-91 38,-179 45,-197 15,-36 246,-278 285,-298 14,-7 93,-31 176,-54 l 152,-41 h 4012 4012 l 152,41 c 83,23 165,49 183,58 40,21 262,256 278,296 7,17 27,104 45,195 l 32,165 -250,4165 -250,4165 22,140 c 22,135 25,144 86,255 55,101 75,126 165,213 99,95 119,109 468,316 360,213 368,218 505,343 140,127 140,128 225,275 122,215 121,212 161,405 l 36,177 v 1873 1873 l -29,185 c -26,169 -35,201 -100,379 -66,177 -81,208 -176,357 -82,130 -149,217 -323,421 -190,223 -240,274 -360,375 -145,121 -177,140 -412,246 -125,56 -148,63 -310,91 l -176,31 -3994,-1 c -3884,-1 -3998,-1 -4100,-20 z"
+       id="path4" />
+  </g>
+  <g
+     transform="matrix(0.1,0,0,-0.1,-413,1852)"
+     fill="#1a1a1a"
+     stroke="none"
+     id="g10">
+    <path
+       d="m 5890,18116 c -95,-18 -141,-33 -265,-91 -214,-98 -313,-183 -577,-490 -262,-305 -350,-441 -437,-678 -108,-296 -101,-131 -101,-2292 v -1855 l 26,-122 c 23,-114 31,-133 102,-259 72,-128 84,-143 177,-227 87,-78 146,-116 450,-297 193,-114 364,-217 381,-230 17,-13 90,-80 162,-150 l 131,-126 86,-162 c 47,-89 90,-180 96,-202 5,-22 20,-113 33,-202 l 23,-161 -250,-4164 -250,-4163 23,-100 c 21,-95 25,-103 80,-165 56,-64 59,-66 151,-92 l 94,-27 h 3975 3975 l 94,27 c 92,26 95,28 151,92 56,62 59,69 80,165 l 23,100 -250,4164 -250,4163 23,162 c 13,88 28,179 33,201 6,22 49,113 96,202 l 87,163 131,126 c 73,70 146,137 162,149 17,13 188,116 380,230 304,181 363,219 450,297 93,84 105,99 177,227 71,126 79,145 102,259 l 26,122 v 1855 c 0,2161 7,1996 -101,2292 -87,237 -175,373 -437,678 -267,311 -363,392 -582,492 -135,62 -170,73 -278,92 l -122,21 -3983,-1 -3982,-1 z"
+       id="path8" />
+  </g>
+  <g
+     transform="matrix(0.1,0,0,-0.1,-413,1852)"
+     fill="#333333"
+     stroke="none"
+     id="g12" />
+</svg>
diff --git a/media/objects/Corks/Champagne-Top.svg b/media/objects/Corks/Champagne-Top.svg
new file mode 100644
index 00000000..aec93076
--- /dev/null
+++ b/media/objects/Corks/Champagne-Top.svg
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="1722.4pt"
+   height="1721.9127pt"
+   viewBox="0 0 1722.4 1721.9127"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg14"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs18" />
+  <metadata
+     id="metadata2">
+Created by potrace 1.16, written by Peter Selinger 2001-2019
+</metadata>
+  <g
+     transform="matrix(0.1,0,0,-0.1,-138.8,1860.7127)"
+     fill="#000000"
+     stroke="none"
+     id="g6">
+    <path
+       d="m 9515,18589 c -337,-18 -386,-23 -770,-80 -390,-58 -430,-66 -830,-165 -397,-100 -441,-113 -820,-249 -362,-130 -436,-160 -775,-320 -334,-158 -414,-201 -735,-393 -323,-193 -396,-242 -708,-474 -308,-228 -384,-291 -657,-539 -268,-242 -347,-321 -589,-589 -248,-273 -311,-349 -539,-657 -232,-312 -281,-385 -474,-708 -192,-321 -235,-401 -393,-735 -160,-339 -190,-413 -320,-775 -136,-379 -149,-423 -249,-820 -99,-400 -107,-439 -165,-830 -59,-400 -61,-420 -82,-832 l -21,-423 21,-422 c 21,-413 23,-433 82,-833 58,-391 66,-430 165,-830 100,-397 113,-441 249,-820 130,-362 160,-436 320,-775 158,-334 201,-414 393,-735 193,-323 242,-396 474,-708 228,-308 291,-384 539,-657 242,-268 321,-347 589,-589 273,-248 349,-311 657,-539 312,-232 385,-281 708,-474 321,-192 401,-235 735,-393 339,-160 413,-190 775,-320 378,-136 423,-150 820,-249 401,-100 439,-107 830,-165 399,-59 421,-61 832,-82 l 423,-21 422,21 c 412,21 434,23 833,82 391,58 429,65 830,165 397,99 442,113 820,249 362,130 436,160 775,320 334,158 414,201 735,393 323,193 396,242 708,474 308,228 384,291 657,539 268,242 347,321 589,589 248,273 311,349 539,657 232,312 281,385 474,708 192,321 235,401 393,735 160,339 190,413 320,775 136,378 150,423 249,820 100,401 107,439 165,830 59,399 61,421 82,833 l 21,422 -21,423 c -21,411 -23,433 -82,832 -58,391 -65,429 -165,830 -99,397 -113,442 -249,820 -130,362 -160,436 -320,775 -158,334 -201,414 -393,735 -193,323 -242,396 -474,708 -228,308 -291,384 -539,657 -242,268 -321,347 -589,589 -273,248 -349,311 -657,539 -312,232 -385,281 -708,474 -321,192 -401,235 -735,393 -339,160 -413,190 -775,320 -379,136 -423,149 -820,249 -400,99 -439,107 -830,165 -396,59 -424,61 -813,81 -466,23 -454,23 -927,-1 z"
+       id="path4" />
+  </g>
+  <g
+     transform="matrix(0.1,0,0,-0.1,-138.8,1860.7127)"
+     fill="#1a1a1a"
+     stroke="none"
+     id="g10">
+    <path
+       d="m 9505,18034 c -229,-12 -328,-22 -655,-70 -361,-52 -410,-62 -785,-155 -370,-92 -428,-110 -776,-234 -334,-120 -416,-154 -734,-305 -312,-147 -403,-196 -699,-374 -188,-112 -386,-238 -441,-279 -55,-40 -199,-147 -319,-237 -158,-118 -299,-235 -505,-422 -241,-219 -327,-305 -551,-552 -226,-249 -300,-340 -501,-612 -203,-273 -266,-368 -441,-659 -176,-294 -226,-388 -371,-694 -147,-312 -182,-397 -302,-730 -124,-348 -142,-406 -234,-776 -92,-373 -103,-425 -155,-780 -49,-342 -57,-412 -71,-700 -19,-399 -19,-511 0,-910 14,-288 22,-358 71,-700 52,-355 63,-407 155,-780 92,-370 110,-428 234,-776 120,-333 155,-418 302,-730 145,-306 195,-400 371,-694 175,-291 238,-386 441,-659 200,-270 277,-364 499,-610 216,-239 312,-335 535,-539 261,-238 336,-298 817,-656 69,-51 278,-185 466,-297 296,-178 387,-227 699,-374 318,-151 400,-185 734,-305 348,-124 406,-142 776,-234 373,-92 425,-103 780,-155 342,-49 412,-57 700,-71 399,-19 511,-19 910,0 288,14 358,22 700,71 355,52 407,63 780,155 370,92 428,110 776,234 334,120 416,154 735,305 316,149 400,195 709,380 289,174 398,246 625,415 339,252 337,250 657,542 214,194 311,292 525,529 222,246 300,340 499,610 203,273 266,368 441,659 176,294 226,388 371,694 147,312 182,397 302,730 124,348 142,406 234,776 92,373 103,425 155,780 49,342 57,412 71,700 19,399 19,511 0,910 -14,288 -22,358 -71,700 -52,355 -63,407 -155,780 -92,370 -110,428 -234,776 -120,333 -155,418 -302,730 -145,306 -195,400 -371,694 -175,291 -238,386 -441,659 -200,271 -276,364 -499,610 -225,248 -307,331 -560,560 -163,148 -322,287 -352,309 -74,55 -341,253 -464,344 -55,41 -253,166 -441,279 -297,178 -388,227 -700,374 -318,151 -400,185 -734,305 -348,124 -406,142 -776,234 -373,92 -425,103 -780,155 -342,49 -412,57 -700,71 -371,18 -575,17 -950,-1 z"
+       id="path8" />
+  </g>
+  <g
+     transform="matrix(0.1,0,0,-0.1,-138.8,1860.7127)"
+     fill="#333333"
+     stroke="none"
+     id="g12" />
+</svg>
diff --git a/media/objects/Corks/Regular-Front.svg b/media/objects/Corks/Regular-Front.svg
new file mode 100644
index 00000000..5f1ef260
--- /dev/null
+++ b/media/objects/Corks/Regular-Front.svg
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="834pt"
+   height="1704pt"
+   viewBox="0 0 834 1704"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg14"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs18" />
+  <metadata
+     id="metadata2">
+Created by potrace 1.16, written by Peter Selinger 2001-2019
+</metadata>
+  <g
+     transform="matrix(0.1,0,0,-0.1,-583,1852)"
+     fill="#000000"
+     stroke="none"
+     id="g6">
+    <path
+       d="m 6425,18485 c -66,-18 -140,-38 -165,-45 -37,-10 -67,-34 -178,-143 -74,-73 -140,-145 -148,-160 -9,-16 -35,-103 -60,-195 l -44,-166 V 10000 2224 l 44,-166 c 25,-92 51,-179 60,-195 8,-15 74,-87 148,-159 147,-146 115,-128 359,-193 l 116,-31 h 3443 3443 l 116,31 c 244,65 212,47 359,193 74,72 140,144 148,159 9,16 35,103 60,195 l 44,166 v 7776 7776 l -44,166 c -25,92 -51,179 -60,195 -8,15 -74,87 -148,159 -147,146 -115,128 -359,193 l -116,31 -3449,-1 -3449,-1 z"
+       id="path4" />
+  </g>
+  <g
+     transform="matrix(0.1,0,0,-0.1,-583,1852)"
+     fill="#1a1a1a"
+     stroke="none"
+     id="g10">
+    <path
+       d="m 6494,18113 c -88,-24 -94,-28 -158,-92 -66,-66 -67,-68 -96,-177 l -30,-109 V 10000 2265 l 30,-109 c 29,-109 30,-111 96,-177 65,-66 67,-67 167,-93 l 102,-26 h 3395 3395 l 102,26 c 100,26 102,27 167,93 66,66 67,68 96,177 l 30,109 v 7735 7735 l -30,109 c -29,109 -30,111 -96,177 -65,66 -67,67 -167,93 l -102,26 -3405,-1 -3405,-2 z"
+       id="path8" />
+  </g>
+  <g
+     transform="matrix(0.1,0,0,-0.1,-583,1852)"
+     fill="#333333"
+     stroke="none"
+     id="g12" />
+</svg>
diff --git a/media/objects/Corks/Regular-Top.svg b/media/objects/Corks/Regular-Top.svg
new file mode 100644
index 00000000..d2f98eb2
--- /dev/null
+++ b/media/objects/Corks/Regular-Top.svg
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="1746.2pt"
+   height="1745.8pt"
+   viewBox="0 0 1746.2 1745.8"
+   preserveAspectRatio="xMidYMid meet"
+   id="svg14"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs18" />
+  <metadata
+     id="metadata2">
+Created by potrace 1.16, written by Peter Selinger 2001-2019
+</metadata>
+  <g
+     transform="matrix(0.1,0,0,-0.1,-126.9,1872.7)"
+     fill="#000000"
+     stroke="none"
+     id="g6">
+    <path
+       d="m 9530,18709 c -344,-17 -390,-22 -785,-80 -407,-59 -433,-64 -855,-170 -412,-102 -456,-115 -830,-249 -359,-129 -430,-158 -780,-323 -350,-165 -419,-202 -758,-405 -335,-201 -410,-250 -716,-477 -295,-219 -381,-290 -631,-516 -352,-318 -340,-306 -664,-664 -227,-250 -297,-335 -516,-631 -227,-306 -276,-381 -477,-716 -203,-339 -240,-408 -405,-758 -165,-350 -194,-421 -323,-780 -132,-369 -148,-423 -247,-815 -101,-404 -107,-436 -168,-845 -63,-420 -64,-430 -85,-853 l -21,-427 21,-428 c 21,-422 22,-432 85,-852 61,-409 67,-441 168,-845 99,-392 115,-446 247,-815 129,-359 158,-430 323,-780 165,-350 202,-419 405,-758 201,-335 250,-410 477,-716 219,-294 290,-382 516,-631 321,-355 309,-343 664,-664 249,-226 337,-297 631,-516 306,-227 381,-276 716,-477 339,-203 408,-240 758,-405 350,-165 421,-194 780,-323 369,-132 423,-148 815,-247 404,-101 436,-107 845,-168 420,-63 430,-64 852,-85 l 428,-21 427,21 c 423,21 433,22 853,85 409,61 441,67 845,168 392,99 446,115 815,247 359,129 430,158 780,323 350,165 419,202 758,405 333,199 411,251 710,473 293,216 378,287 651,532 281,253 344,316 613,611 270,298 324,363 553,672 227,306 276,381 477,716 203,339 240,408 405,758 165,350 194,421 323,780 132,369 148,423 247,815 101,404 107,436 168,845 63,420 64,430 85,853 l 21,427 -21,428 c -21,422 -22,432 -85,852 -61,409 -67,441 -168,845 -99,392 -115,446 -247,815 -129,359 -158,430 -323,780 -165,350 -202,419 -405,758 -201,335 -250,410 -477,716 -229,309 -283,374 -553,672 -269,295 -332,358 -613,611 -273,245 -358,316 -651,532 -299,222 -377,274 -710,473 -339,203 -408,240 -758,405 -350,165 -421,194 -780,323 -369,132 -423,148 -815,247 -404,101 -436,107 -845,168 -419,63 -431,64 -845,84 -481,24 -427,24 -905,0 z"
+       id="path4" />
+  </g>
+  <g
+     transform="matrix(0.1,0,0,-0.1,-126.9,1872.7)"
+     fill="#1a1a1a"
+     stroke="none"
+     id="g10">
+    <path
+       d="m 9600,17919 c -336,-17 -395,-23 -745,-75 -354,-52 -407,-62 -775,-154 -361,-90 -427,-110 -758,-229 -314,-113 -409,-153 -711,-296 -302,-142 -394,-192 -687,-368 -187,-112 -384,-236 -439,-277 -89,-66 -201,-148 -449,-333 -43,-32 -208,-175 -365,-317 -239,-217 -328,-306 -541,-541 -212,-235 -294,-334 -489,-597 -199,-268 -263,-364 -437,-654 -177,-295 -227,-387 -369,-689 -143,-302 -183,-397 -296,-711 -119,-331 -139,-397 -229,-758 -91,-366 -103,-422 -154,-770 -52,-354 -56,-397 -74,-763 -19,-380 -19,-394 0,-775 18,-365 22,-408 74,-762 51,-348 63,-404 154,-770 90,-361 110,-427 229,-758 113,-314 153,-409 296,-711 142,-302 192,-394 369,-689 174,-290 238,-386 437,-654 196,-264 276,-361 493,-601 215,-237 305,-327 535,-535 271,-246 323,-288 646,-527 88,-65 183,-135 210,-156 28,-20 205,-130 394,-243 298,-179 390,-228 692,-371 302,-143 397,-183 711,-296 331,-119 397,-139 758,-229 366,-91 422,-103 770,-154 354,-52 397,-56 762,-74 381,-19 395,-19 775,0 366,18 409,22 763,74 348,51 404,63 770,154 361,90 427,110 758,229 312,112 411,154 705,292 298,141 388,189 697,375 347,207 377,228 861,588 53,39 224,187 381,330 240,216 328,304 544,544 217,239 297,336 493,600 199,268 263,364 437,654 177,295 227,387 369,689 143,302 183,397 296,711 119,331 139,397 229,758 91,366 103,422 154,770 52,354 56,397 74,763 19,380 19,394 0,775 -18,365 -22,408 -74,762 -51,348 -63,404 -154,770 -90,361 -110,427 -229,758 -113,314 -153,409 -296,711 -142,302 -192,394 -369,689 -174,290 -238,386 -437,654 -195,263 -276,362 -489,597 -213,235 -303,324 -546,545 -160,145 -344,303 -410,352 -65,48 -200,148 -299,222 -126,93 -287,198 -535,347 -309,185 -399,233 -697,374 -294,138 -393,180 -705,292 -331,119 -397,139 -758,229 -367,91 -422,103 -770,154 -342,50 -403,56 -700,70 -179,9 -361,18 -405,20 -44,2 -244,-4 -445,-15 z"
+       id="path8" />
+  </g>
+  <g
+     transform="matrix(0.1,0,0,-0.1,-126.9,1872.7)"
+     fill="#333333"
+     stroke="none"
+     id="g12" />
+</svg>
diff --git a/presets/objects.js b/presets/objects.js
index d21974db..36b7cc34 100644
--- a/presets/objects.js
+++ b/presets/objects.js
@@ -906,6 +906,7 @@ function makeObjects() {
     /* ***Christmas Trees*** */ results.push(makeModel({"name": "Christmas Trees", "kind": "objects", "forms": [{"name": "Christmas Tree", "views": [{"name": "Front", "height": 2.5790183544158936, "extra": 1.0018578258221682, "bottom": 0.0018509483429142528}, {"name": "Angled", "height": 2.5790183544158936, "extra": 1.0017254125814505, "bottom": 0.001719478960187692}, {"name": "Side", "height": 2.5790183544158936, "extra": 1.0018771924482337, "bottom": 0.0018701711060793292}, {"name": "Top", "height": 0.08875526487827301, "extra": 1.0000312, "bottom": 3.119805324149028e-05}]}]}));
     /* ***Nerf Darts*** */ results.push(makeModel({"name": "Nerf Darts", "kind": "objects", "forms": [{"name": "Elite", "views": [{"name": "Top", "height": 0.07250000536441803, "extra": 1.0029898101799761, "bottom": 0.0029720385179437593}, {"name": "Tip", "height": 0.012500002980232239, "extra": 1.0030365024065977, "bottom": 0.003018173027275935}, {"name": "Side", "height": 0.012500002980232239, "extra": 1.0173611111111112, "bottom": 0.016778523489932886}]}]}));
     /* ***Popsicle Sticks*** */ results.push(makeModel({"name": "Popsicle Sticks", "kind": "objects", "forms": [{"name": "Thin", "views": [{"name": "Top", "height": 0.11500000208616257, "extra": 1.0046167238023707, "bottom": 0.0045744855299115405}, {"name": "Front", "height": 0.0020000000949949026, "extra": 1.2473394461077845, "bottom": 0.16547998864234453}, {"name": "Side", "height": 0.0020000000949949026, "extra": 1.2582112068965519, "bottom": 0.17027656973934802}]}]}));
+    /* ***Corks*** */ results.push(makeModel({"name": "Corks", "kind": "objects", "forms": [{"name": "Regular", "views": [{"name": "Front", "height": 0.04400000348687172, "extra": 1.0113738671148191, "bottom": 0.011120892018779369}, {"name": "Top", "height": 0.021000001579523087, "extra": 1.023945585768944, "bottom": 0.022851214342994603}]}, {"name": "Champagne", "views": [{"name": "Front", "height": 0.044000186026096344, "extra": 1.0114045618247298, "bottom": 0.011150234741784037}, {"name": "Top", "height": 0.030000001192092896, "extra": 1.0167765827955573, "bottom": 0.016231949505918646}]}]}));
     /* ***INSERT HERE*** */
     return results;
 }