Merge branch 'develop' of github.com:freesewing/freesewing into develop

packages/i18n/src/locales/de/optiongroups.yaml

@@ -13,3 +13,7 @@ preferences: Präferenzen
 sleevecap: Ärmelkappe
 sleeves: Ärmel
 style: Stil
+backPockets: Back pockets
+frontPockets: Front pockets
+waistband: Waistband
+fly: Fly

packages/i18n/src/locales/de/options/charlie.yml

@@ -0,0 +1,49 @@
+---
+backPocketHorizontalPlacement:
+  title: Back pocket horizontal placement
+  description: Controls the horizontal placement of the back pocket
+backPocketVerticalPlacement:
+  title: Back pocket vertical placement
+  description: Controls the vertical placement of the back pocket
+backPocketWidth:
+  title: Back pocket width
+  description: Controls the width of the back pocket
+backPocketDepth:
+  title: Back pocket depth
+  description: Controls the depth of the back pocket
+frontPocketSlantDepth:
+  title: Front pocket slant depth
+  description: Controls the depth of the (front) pocket slant
+frontPocketSlantWidth:
+  title: Front pocket slant width
+  description: Controls the width of the (front) pocket slant
+frontPocketSlantRound:
+  title: Front pocket slant round
+  description: Controls how far from the end of the slant we start rounding into the outseam
+frontPocketSlantBend:
+  title: Front pocket slant bend
+  description: Controls the radius by which we round the pocket slant into the outseam
+frontPocketWidth:
+  title: Front pocket width
+  description: Controls the width of the front pocket bag
+frontPocketDepth:
+  title: Front pocket depth
+  description: Controls the depth of the front pocket bag
+frontPocketFacing:
+  title: Front pocket facing
+  description: Controls how far the pocket facing extends into the pocket bag
+beltLoops:
+  title: Belt loops
+  description: Controls the amount of belt loops
+flyCurve:
+  title: Fly curve
+  description: Controls the curvature of the fly J-seam
+flyLength:
+  title: Fly length
+  description: Controls the length of the fly
+flyWidth:
+  title: Fly width
+  description: Controls how far the J-seam of offset from the fly edge
+waistbandCurve:
+  title: Waistband Curve
+  description: Controls how curved the waistband is.

packages/i18n/src/locales/de/options/paco.yml

@@ -11,9 +11,6 @@ backPockets:
 elasticatedHem:
   title: Elastischer Saum
   description: Ob ein elastischer Saum gewünscht ist oder nicht
-waistElastic:
-  title: Breite des Taillengummizugs
-  description: Breite des Gummizugs an der Taille
 ankleElastic:
   title: Knöchel/Saum Gummizugbreite
   description: Breite des (optionalen) Gummizugs am Knöchel/Saum

packages/i18n/src/locales/de/options/titan.yml

@@ -23,15 +23,24 @@ crossSeamCurveStart:
 crossSeamCurveBend:
   title: Cross seam bend
   description: Controls the curvature of the cross seam
+crossSeamCurveAngle:
+  title: Cross seam angle
+  description: Controls the angle of the cross seam
 crotchSeamCurveStart:
   title: Start of the crotch seam curve
   description: Controls how far into the crotch seam we start to curve
 crotchSeamCurveBend:
   title: Crotch seam bend
   description: Controls the curvature of the crotch seam
+crotchSeamCurveAngle:
+  title: Crotch seam angle
+  description: Controls the angle of the crotch seam
 waistBalance:
   title: Waist balance
   description: Controls the horizontal position of the waist relative to the seat
+waistbandWidth:
+  title: Waistband width
+  description: The width of the waistband
 grainlinePosition:
   title: Grainline position
   description: Controls the horizontal position of the leg relative to the seat

packages/i18n/src/locales/de/patterns.yml

@@ -32,6 +32,9 @@ carlton:
 cathrin:
   description: Cathrin ist ein Unterbrustkorsett oder Taillentrainer.
   title: Korsett Cathrin
+charlie:
+  description: Charlie is a chino trouser pattern.
+  title: Charlie chinos
 cornelius:
   description: Cornelius are cycling breeches based on the Keystone drafting method.
   title: Cornelius cycling breeches

packages/i18n/src/locales/es/optiongroups.yaml

@@ -13,3 +13,7 @@ preferences: Preferencias
 sleevecap: Funda de manga
 sleeves: Mangas
 style: Estilo
+backPockets: Back pockets
+frontPockets: Front pockets
+waistband: Waistband
+fly: Fly

packages/i18n/src/locales/es/options/charlie.yml

@@ -0,0 +1,49 @@
+---
+backPocketHorizontalPlacement:
+  title: Back pocket horizontal placement
+  description: Controls the horizontal placement of the back pocket
+backPocketVerticalPlacement:
+  title: Back pocket vertical placement
+  description: Controls the vertical placement of the back pocket
+backPocketWidth:
+  title: Back pocket width
+  description: Controls the width of the back pocket
+backPocketDepth:
+  title: Back pocket depth
+  description: Controls the depth of the back pocket
+frontPocketSlantDepth:
+  title: Front pocket slant depth
+  description: Controls the depth of the (front) pocket slant
+frontPocketSlantWidth:
+  title: Front pocket slant width
+  description: Controls the width of the (front) pocket slant
+frontPocketSlantRound:
+  title: Front pocket slant round
+  description: Controls how far from the end of the slant we start rounding into the outseam
+frontPocketSlantBend:
+  title: Front pocket slant bend
+  description: Controls the radius by which we round the pocket slant into the outseam
+frontPocketWidth:
+  title: Front pocket width
+  description: Controls the width of the front pocket bag
+frontPocketDepth:
+  title: Front pocket depth
+  description: Controls the depth of the front pocket bag
+frontPocketFacing:
+  title: Front pocket facing
+  description: Controls how far the pocket facing extends into the pocket bag
+beltLoops:
+  title: Belt loops
+  description: Controls the amount of belt loops
+flyCurve:
+  title: Fly curve
+  description: Controls the curvature of the fly J-seam
+flyLength:
+  title: Fly length
+  description: Controls the length of the fly
+flyWidth:
+  title: Fly width
+  description: Controls how far the J-seam of offset from the fly edge
+waistbandCurve:
+  title: Waistband Curve
+  description: Controls how curved the waistband is.

packages/i18n/src/locales/es/options/paco.yml

@@ -11,9 +11,6 @@ backPockets:
 elasticatedHem:
   title: Elasticated hem
   description: Whether or not you want an elasticated hem
-waistElastic:
-  title: Waist elastic width
-  description: Width of the elastic at the waist
 ankleElastic:
   title: Ankle/Hem elastic width
   description: Width of the (optional) elastic at the ankle/hem

packages/i18n/src/locales/es/options/titan.yml

@@ -23,15 +23,24 @@ crossSeamCurveStart:
 crossSeamCurveBend:
   title: Cross seam bend
   description: Controls the curvature of the cross seam
+crossSeamCurveAngle:
+  title: Cross seam angle
+  description: Controls the angle of the cross seam
 crotchSeamCurveStart:
   title: Start of the crotch seam curve
   description: Controls how far into the crotch seam we start to curve
 crotchSeamCurveBend:
   title: Crotch seam bend
   description: Controls the curvature of the crotch seam
+crotchSeamCurveAngle:
+  title: Crotch seam angle
+  description: Controls the angle of the crotch seam
 waistBalance:
   title: Waist balance
   description: Controls the horizontal position of the waist relative to the seat
+waistbandWidth:
+  title: Waistband width
+  description: The width of the waistband
 grainlinePosition:
   title: Grainline position
   description: Controls the horizontal position of the leg relative to the seat

packages/i18n/src/locales/es/patterns.yml

@@ -32,6 +32,9 @@ carlton:
 cathrin:
   description: Cathrin es un corsé bajo pecho o reductor de la cintura.
   title: Cathrin corset
+charlie:
+  description: Charlie is a chino trouser pattern.
+  title: Charlie chinos
 cornelius:
   description: Cornelius are cycling breeches based on the Keystone drafting method.
   title: Cornelius cycling breeches

packages/i18n/src/locales/fr/optiongroups.yaml

@@ -13,3 +13,7 @@ preferences: Préférences
 sleevecap: Tête de manche
 sleeves: Manches
 style: Style
+backPockets: Back pockets
+frontPockets: Front pockets
+waistband: Waistband
+fly: Fly

packages/i18n/src/locales/fr/options/charlie.yml

@@ -0,0 +1,49 @@
+---
+backPocketHorizontalPlacement:
+  title: Back pocket horizontal placement
+  description: Controls the horizontal placement of the back pocket
+backPocketVerticalPlacement:
+  title: Back pocket vertical placement
+  description: Controls the vertical placement of the back pocket
+backPocketWidth:
+  title: Back pocket width
+  description: Controls the width of the back pocket
+backPocketDepth:
+  title: Back pocket depth
+  description: Controls the depth of the back pocket
+frontPocketSlantDepth:
+  title: Front pocket slant depth
+  description: Controls the depth of the (front) pocket slant
+frontPocketSlantWidth:
+  title: Front pocket slant width
+  description: Controls the width of the (front) pocket slant
+frontPocketSlantRound:
+  title: Front pocket slant round
+  description: Controls how far from the end of the slant we start rounding into the outseam
+frontPocketSlantBend:
+  title: Front pocket slant bend
+  description: Controls the radius by which we round the pocket slant into the outseam
+frontPocketWidth:
+  title: Front pocket width
+  description: Controls the width of the front pocket bag
+frontPocketDepth:
+  title: Front pocket depth
+  description: Controls the depth of the front pocket bag
+frontPocketFacing:
+  title: Front pocket facing
+  description: Controls how far the pocket facing extends into the pocket bag
+beltLoops:
+  title: Belt loops
+  description: Controls the amount of belt loops
+flyCurve:
+  title: Fly curve
+  description: Controls the curvature of the fly J-seam
+flyLength:
+  title: Fly length
+  description: Controls the length of the fly
+flyWidth:
+  title: Fly width
+  description: Controls how far the J-seam of offset from the fly edge
+waistbandCurve:
+  title: Waistband Curve
+  description: Controls how curved the waistband is.

packages/i18n/src/locales/fr/options/paco.yml

@@ -11,9 +11,6 @@ backPockets:
 elasticatedHem:
   title: Ourlet élastiqué
   description: Si vous voulez ou non un ourlet élastiqué
-waistElastic:
-  title: Largeur élastique de la taille
-  description: Largeur de l'élastique à la taille
 ankleElastic:
   title: Largeur élastique de cheville/ourlet
   description: Largeur de l'élastique (optionnel) à la cheville/ourlet

packages/i18n/src/locales/fr/options/titan.yml

@@ -23,15 +23,24 @@ crossSeamCurveStart:
 crossSeamCurveBend:
   title: Courbure de l'enfourchure dos
   description: Contrôle la courbure de la couture de fourche dos
+crossSeamCurveAngle:
+  title: Cross seam angle
+  description: Controls the angle of the cross seam
 crotchSeamCurveStart:
   title: Début de la courbe de l'enfourchure avant
   description: Contrôle la distance à partir de laquelle la courbe démarre pour l'enfourchure avant
 crotchSeamCurveBend:
   title: Courbure de la fourche avant
   description: Contrôle la courbure de la couture de fourche avant
+crotchSeamCurveAngle:
+  title: Crotch seam angle
+  description: Controls the angle of the crotch seam
 waistBalance:
   title: Équilibre de la taille
   description: Contrôle la position horizontale de la taille par rapport au bassin
+waistbandWidth:
+  title: Waistband width
+  description: The width of the waistband
 grainlinePosition:
   title: Position de la ligne de droit fil
   description: Contrôle la position horizontale de la jambe par rapport au bassin

packages/i18n/src/locales/fr/patterns.yml

@@ -32,6 +32,9 @@ carlton:
 cathrin:
   description: Cathrin est un corset sous-poitrine ou un serre-taille.
   title: Corset Cathrin
+charlie:
+  description: Charlie is a chino trouser pattern.
+  title: Charlie chinos
 cornelius:
   description: Cornelius est une culotte de cyclisme basé sur la méthode Keystone.
   title: Culotte de cyclisme Cornelius

packages/i18n/src/locales/nl/optiongroups.yaml

@@ -13,3 +13,7 @@ preferences: Voorkeuren
 sleevecap: Mouwkop
 sleeves: Mouwen
 style: Stijl
+backPockets: Back pockets
+frontPockets: Front pockets
+waistband: Waistband
+fly: Fly

packages/i18n/src/locales/nl/options/charlie.yml

@@ -0,0 +1,49 @@
+---
+backPocketHorizontalPlacement:
+  title: Back pocket horizontal placement
+  description: Controls the horizontal placement of the back pocket
+backPocketVerticalPlacement:
+  title: Back pocket vertical placement
+  description: Controls the vertical placement of the back pocket
+backPocketWidth:
+  title: Back pocket width
+  description: Controls the width of the back pocket
+backPocketDepth:
+  title: Back pocket depth
+  description: Controls the depth of the back pocket
+frontPocketSlantDepth:
+  title: Front pocket slant depth
+  description: Controls the depth of the (front) pocket slant
+frontPocketSlantWidth:
+  title: Front pocket slant width
+  description: Controls the width of the (front) pocket slant
+frontPocketSlantRound:
+  title: Front pocket slant round
+  description: Controls how far from the end of the slant we start rounding into the outseam
+frontPocketSlantBend:
+  title: Front pocket slant bend
+  description: Controls the radius by which we round the pocket slant into the outseam
+frontPocketWidth:
+  title: Front pocket width
+  description: Controls the width of the front pocket bag
+frontPocketDepth:
+  title: Front pocket depth
+  description: Controls the depth of the front pocket bag
+frontPocketFacing:
+  title: Front pocket facing
+  description: Controls how far the pocket facing extends into the pocket bag
+beltLoops:
+  title: Belt loops
+  description: Controls the amount of belt loops
+flyCurve:
+  title: Fly curve
+  description: Controls the curvature of the fly J-seam
+flyLength:
+  title: Fly length
+  description: Controls the length of the fly
+flyWidth:
+  title: Fly width
+  description: Controls how far the J-seam of offset from the fly edge
+waistbandCurve:
+  title: Waistband Curve
+  description: Controls how curved the waistband is.

packages/i18n/src/locales/nl/options/paco.yml

@@ -11,9 +11,6 @@ backPockets:
 elasticatedHem:
   title: Elastische zoom
   description: Of je wel of niet elastiek aan de zoom wil
-waistElastic:
-  title: Breedte taille elastiek
-  description: Breedte van de elastiek aan de taille
 ankleElastic:
   title: Breedte enkel/zoom elastiek
   description: Breedte van de (optionele) elastiek aan de enkel/zoom

packages/i18n/src/locales/nl/options/titan.yml

@@ -23,15 +23,24 @@ crossSeamCurveStart:
 crossSeamCurveBend:
   title: Buiging binnenbeennaad
   description: Bepaalt de curve van de binnenbeennaad
+crossSeamCurveAngle:
+  title: Cross seam angle
+  description: Controls the angle of the cross seam
 crotchSeamCurveStart:
   title: Begin van de curve van de kruisnaad
   description: Bepaalt hoe ver in de kruisnaad de curve start
 crotchSeamCurveBend:
   title: Buiging kruisnaad
   description: Bepaalt de curve van de kruisnaad
+crotchSeamCurveAngle:
+  title: Crotch seam angle
+  description: Controls the angle of the crotch seam
 waistBalance:
   title: Balans taille
   description: Bepaalt de horizontale positie van de taille in relatie tot het zitvlak
+waistbandWidth:
+  title: Waistband width
+  description: The width of the waistband
 grainlinePosition:
   title: Positie draadrichting
   description: Bepaalt de horizontale positie van het been in relatie tot het zitvlak

packages/i18n/src/locales/nl/patterns.yml

@@ -32,6 +32,9 @@ carlton:
 cathrin:
   description: Cathrin is een underbust korset of waist trainer.
   title: Cathrin korset
+charlie:
+  description: Charlie is a chino trouser pattern.
+  title: Charlie chinos
 cornelius:
   description: Cornelius are cycling breeches based on the Keystone drafting method.
   title: Cornelius cycling breeches

yarn.lock

@@ -5352,15 +5352,15 @@ chai-string@^1.5.0:
   integrity sha512-sydDC3S3pNAQMYwJrs6dQX0oBQ6KfIPuOZ78n7rocW0eJJlsHPh2t3kwW7xfwYA/1Bf6/arGtSUo16rxR2JFlw==
 
 chai@^4.2.0:
-  version "4.2.0"
+  version "4.3.4"
-  resolved "https://registry.yarnpkg.com/chai/-/chai-4.2.0.tgz#760aa72cf20e3795e84b12877ce0e83737aa29e5"
+  resolved "https://registry.yarnpkg.com/chai/-/chai-4.3.4.tgz#b55e655b31e1eac7099be4c08c21964fce2e6c49"
-  integrity sha512-XQU3bhBukrOsQCuwZndwGcCVQHyZi53fQ6Ys1Fym7E4olpIqqZZhhoFJoaKVvV17lWQoXYwgWN2nF5crA8J2jw==
+  integrity sha512-yS5H68VYOCtN1cjfwumDSuzn/9c+yza4f3reKXlE5rUg7SFcCEy90gJvydNgOYtblyf4Zi6jIWRnXOgErta0KA==
   dependencies:
     assertion-error "^1.1.0"
     check-error "^1.0.2"
     deep-eql "^3.0.1"
     get-func-name "^2.0.0"
-    pathval "^1.1.0"
+    pathval "^1.1.1"
     type-detect "^4.0.5"
 
 chalk@2.4.2, chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.1, chalk@^2.4.1, chalk@^2.4.2:
@@ -8521,6 +8521,11 @@ fsevents@^2.1.2, fsevents@~2.1.2:
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.3.tgz#fb738703ae8d2f9fe900c33836ddebee8b97f23e"
   integrity sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==
 
+fsevents@~2.3.1:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"
+  integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==
+
 function-bind@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
@@ -13684,10 +13689,10 @@ path-type@^4.0.0:
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
   integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
 
-pathval@^1.1.0:
+pathval@^1.1.1:
-  version "1.1.0"
+  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/pathval/-/pathval-1.1.0.tgz#b942e6d4bde653005ef6b71361def8727d0645e0"
+  resolved "https://registry.yarnpkg.com/pathval/-/pathval-1.1.1.tgz#8534e77a77ce7ac5a2512ea21e0fdb8fcf6c3d8d"
-  integrity sha1-uULm1L3mUwBe9rcTYd74cn0GReA=
+  integrity sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==
 
 pbkdf2@^3.0.3:
   version "3.1.1"
@@ -15767,11 +15772,11 @@ rollup-plugin-yaml@^2.0.0:
     estree-walker "^0.6.1"
 
 rollup@^2.23.0:
-  version "2.33.3"
+  version "2.45.2"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.33.3.tgz#ae72ce31f992b09a580072951bfea76e9df17342"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.45.2.tgz#8fb85917c9f35605720e92328f3ccbfba6f78b48"
-  integrity sha512-RpayhPTe4Gu/uFGCmk7Gp5Z9Qic2VsqZ040G+KZZvsZYdcuWaJg678JeDJJvJeEQXminu24a2au+y92CUWVd+w==
+  integrity sha512-kRRU7wXzFHUzBIv0GfoFFIN3m9oteY4uAsKllIpQDId5cfnkWF2J130l+27dzDju0E6MScKiV0ZM5Bw8m4blYQ==
   optionalDependencies:
-    fsevents "~2.1.2"
+    fsevents "~2.3.1"
 
 rsvp@^4.8.4:
   version "4.8.5"
@@ -16449,9 +16454,9 @@ sshpk@^1.7.0:
     tweetnacl "~0.14.0"
 
 ssri@^6.0.0, ssri@^6.0.1:
-  version "6.0.1"
+  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.1.tgz#2a3c41b28dd45b62b63676ecb74001265ae9edd8"
+  resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.2.tgz#157939134f20464e7301ddba3e90ffa8f7728ac5"
-  integrity sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==
+  integrity sha512-cepbSq/neFK7xB6A50KHN0xHDotYzq58wWCa5LeWqnPrHG8GzfEjO/4O8kpmcGW+oaxkvhEJCWgbgNk4/ZV93Q==
   dependencies:
     figgy-pudding "^3.5.1"
 
@@ -18574,9 +18579,9 @@ xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.1:
   integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
 
 y18n@^4.0.0:
-  version "4.0.0"
+  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf"
-  integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==
+  integrity sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==
 
 y18n@^5.0.5:
   version "5.0.5"