1
0
Fork 0

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

This commit is contained in:
joostdecock 2022-08-25 13:56:10 +02:00
commit 12e2a5319a
1818 changed files with 4379 additions and 5904 deletions

View file

@ -98,7 +98,7 @@ labelPRBasedOnFilePath:
":shirt: titan": [ designs/titan/* ]
":shirt: trayvon": [ designs/trayvon/* ]
":shirt: tutorial": [ designs/tutorial/* ]
":shirt: unice": [ designs/unice/* ] // New
":shirt: unice": [ designs/unice/* ]
":shirt: ursula": [ designs/ursula/* ]
":shirt: wahid": [ designs/wahid/* ]
":shirt: walburga": [ designs/walburga/* ]

2
.nvmrc
View file

@ -1 +1 @@
lts/fermium
lts/gallium

View file

@ -6,14 +6,10 @@ order: 20
Now we will use nvm to install Node JS. Run the following command:
```bash
nvm install lts/fermium
nvm install lts/gallium
```
This will install the so-called LTS version of Node 14 on your system.
This will install the so-called LTS version of Node 16 on your system.
LTS versions -- short for Long Term Support -- are good node versions
to use because they are stable and supported for a long time.
<Note compact>
Node 14 is required to use our monorepo [until we upgrade Strapi](https://github.com/freesewing/freesewing/issues/2351).
</Note>

View file

@ -52,7 +52,3 @@ nvm use v10.22.1
If you picked a version that is not installed, `nvm` will simply tell you
and even suggest the command you should type to install it. Handy!
<Note compact>
Node 14 is required to use our monorepo [until we upgrade Strapi](https://github.com/freesewing/freesewing/issues/2351).
</Note>

View file

@ -6,14 +6,10 @@ order: 20
Now we will use nvm to install Node JS. Run the following command:
```bash
nvm install lts/fermium
nvm install lts/gallium
```
This will install the so-called LTS version of Node 14 on your system.
This will install the so-called LTS version of Node 16 on your system.
LTS versions -- short for Long Term Support -- are good node versions
to use because they are stable and supported for a long time.
<Note compact>
Node 14 is required to use our monorepo [until we upgrade Strapi](https://github.com/freesewing/freesewing/issues/2351).
</Note>

View file

@ -57,7 +57,7 @@ the screen or opening a new terminal.
Now that you have NVM installed, you can install node. The latest version can be
installed using `nvm install default`. You can also install a specific version
using `nvm install v12.16.1`. For the purposes of debugging it can be useful to
using `nvm install v16.17.0`. For the purposes of debugging it can be useful to
have the same version of node installed as the main project uses, which you can
then activate using `nvm use <version>`. You can determine what version the
FreeSewing project uses by checking
@ -65,7 +65,7 @@ FreeSewing project uses by checking
<Warning> At the time this guide was written the latest version of node/npm has
a bug in the dependency resolution process which causes the freesewing project
to fail to build. Use the latest LTS version (currently 14.15.4) or the specific
to fail to build. Use the latest LTS version (currently 16.17.0) or the specific
version used by the main project to avoid this issue. </Warning>
Node comes with the Node Package Manager (npm) by default which can be used to
@ -139,7 +139,7 @@ rest of this process.
Open a Powershell terminal or command prompt. Run `nvm ls available` to show
versions that can be installed. Choose the appropriate version (you should use
the same version as the freesewing project or latest LTS version) then run `nvm
install 14.15.4` and `nvm use 14.15.4` (where `14.15.4` is the full version
install 16.17.0` and `nvm use 16.17.0` (where `16.17.0` is the full version
string of the version you wish to use) to activate the newly installed version.
You will receive a prompt for elevated permissions and will need to accept it in
order to activate the new version of node.
@ -147,7 +147,7 @@ order to activate the new version of node.
<Warning>
At the time this guide was written the latest version of node/npm has
a bug in the dependency resolution process which causes the freesewing project
to fail to build. Use the latest LTS version (currently 14.15.4) or the specific
to fail to build. Use the latest LTS version (currently 16.17.0) or the specific
version used by the main project to avoid this issue.
</Warning>

View file

@ -15,7 +15,6 @@ The value they represent shows how far the measurement deviates from the proport
<th>
Description
</th>
</tr>
<tr>
@ -26,7 +25,6 @@ The value they represent shows how far the measurement deviates from the proport
<td>
The value is <strong x-id="1">significantly lower</strong>
</td>
</tr>
<tr>
@ -37,7 +35,6 @@ The value they represent shows how far the measurement deviates from the proport
<td>
The value is <strong x-id="1">a good bit lower</strong>
</td>
</tr>
<tr>
@ -48,7 +45,6 @@ The value they represent shows how far the measurement deviates from the proport
<td>
The value is <strong x-id="1">a bit lower</strong>
</td>
</tr>
<tr>
@ -59,7 +55,6 @@ The value they represent shows how far the measurement deviates from the proport
<td>
The value is <strong x-id="1">very close</strong>
</td>
</tr>
<tr>
@ -70,7 +65,6 @@ The value they represent shows how far the measurement deviates from the proport
<td>
The value is <strong x-id="1">very close</strong>
</td>
</tr>
<tr>
@ -81,7 +75,6 @@ The value they represent shows how far the measurement deviates from the proport
<td>
The value is <strong x-id="1">a bit higher</strong>
</td>
</tr>
<tr>
@ -92,7 +85,6 @@ The value they represent shows how far the measurement deviates from the proport
<td>
The value is <strong x-id="1">a good bit higher</strong>
</td>
</tr>
<tr>
@ -103,7 +95,6 @@ The value they represent shows how far the measurement deviates from the proport
<td>
The value is <strong x-id="1">significantly higher</strong>
</td>
</tr>
</table>

View file

@ -15,7 +15,7 @@ Without a way to store your measurements, generating made-to-measure patterns wo
This question often hints at an underlying distrust towards
creating an account. As such, the following links may also be relevant:
- Read \[our privacy notice]\[1]
- Learn more about \[your rights]\[2]
- Read [our privacy notice][1]
- Learn more about [your rights][2]
</Note>

View file

@ -8,7 +8,7 @@ Reading this guide will take about 10 minutes of your time now, to save you a bu
##### What we'll explain
- We'll tell you \[what FreeSewing is]\[1] and [what freesewing.org is][2]
- We'll tell you [what FreeSewing is][1] and [what freesewing.org is][2]
- We'll tell you about our [made-to-measure sewing patterns][3] and what we mean by [_with breasts_ vs _without breasts_][4]
- We'll cover [why you need an account][5] what we mean by [your people][6] or [your patterns][7], and we talk about [measurements][8]
- We'll go over [how you can configure your patterns][9] with design and pattern options

View file

@ -1,8 +1,6 @@
***
- - -
title: "Aaron A-Shirt: Cutting Instructions"
***
- - -
- Cut **1 back** on the fold
- Cut **1 front** on the fold

View file

@ -1,8 +1,6 @@
***
- - -
title: "Aaron A-Shirt: Fabric Options"
***
- - -
An A-shirt is essentially underwear. And in that capacity, you want something that is comfortable, feels nice on your skin and breaths.

View file

@ -1,8 +1,6 @@
***
- - -
title: "Aaron A-Shirt: Sewing Instructions"
***
- - -
## Step 1: Close seams

View file

@ -1,7 +1,5 @@
***
- - -
title: "Aaron A-Shirt: Required Measurements"
***
- - -
<PatternMeasurements pattern='aaron' />

View file

@ -1,8 +1,6 @@
***
- - -
title: "Aaron A-Shirt: What You Need"
***
- - -
To make Aaron, you will need the following:

View file

@ -1,8 +1,6 @@
***
- - -
title: "Armhole drop"
***
- - -
![The armhole drop option on Aaron](./armholedrop.svg)

View file

@ -1,8 +1,6 @@
***
- - -
title: "Back armhole shape"
***
- - -
![The back armhole shape option on Aaron](./backlinebend.svg)

View file

@ -1,8 +1,6 @@
***
- - -
title: "Chest ease"
***
- - -
![The chest ease option on Aaron](./chestease.svg)

View file

@ -1,8 +1,6 @@
***
- - -
title: "Hips ease"
***
- - -
![The hips ease option on Aaron](./hipsease.svg)

View file

@ -1,8 +1,6 @@
***
- - -
title: "Length bonus"
***
- - -
![The length bonus option on Aaron](./lengthbonus.svg)

View file

@ -1,8 +1,6 @@
***
- - -
title: "Neckline shape"
***
- - -
![The neckline shape option on Aaron](./necklinebend.svg)

View file

@ -1,8 +1,6 @@
***
- - -
title: "Neckline drop"
***
- - -
![The neckline drop option on Aaron](./necklinedrop.svg)

View file

@ -1,8 +1,6 @@
***
- - -
title: "Shoulderstrap placement"
***
- - -
![The shoulder strap placement option on Aaron](./shoulderstrapplacement.svg)

View file

@ -1,8 +1,6 @@
***
- - -
title: "Shoulderstrap width"
***
- - -
![The shoulder strap width option on Aaron](./shoulderstrapwidth.svg)

View file

@ -1,8 +1,6 @@
***
- - -
title: "Stretch"
***
- - -
![The stretch factor option on Aaron](./stretchfactor.svg)

View file

@ -1,7 +1,5 @@
***
- - -
title: "Aaron A-Shirt: Design Options"
***
- - -
<PatternOptions pattern='aaron' />

View file

@ -1,7 +1,5 @@
***
- - -
title: "Aaron A-Shirt"
***
- - -
<PatternDocs pattern='aaron' />

View file

@ -1,8 +1,6 @@
***
- - -
title: "Albert apron: Cutting Instructions"
***
- - -
- Cut **1 front** on the fold
- Cut **1 pocket** on the fold

View file

@ -1,8 +1,6 @@
***
- - -
title: "Albert apron: Fabric Options"
***
- - -
An apron works best with a fabric that is sturdy, tightly woven, and easy to clean. In addition, make sure to go for a natural fibre and in any case something that is heat-resistant.

View file

@ -1,8 +1,6 @@
***
- - -
title: "Albert apron: Sewing Instructions"
***
- - -
### Step 1: The Pocket

View file

@ -1,7 +1,5 @@
***
- - -
title: "Albert apron: Required Measurements"
***
- - -
<PatternMeasurements pattern='albert' />

View file

@ -1,8 +1,6 @@
***
- - -
title: "Albert apron: What You Need"
***
- - -
To make Albert, you will need the following:

View file

@ -1,8 +1,6 @@
***
- - -
title: "Back opening"
***
- - -
Controls the amount of opening at the back of your apron.

View file

@ -1,8 +1,6 @@
***
- - -
title: "Bib length"
***
- - -
Controls the length of the _bib_ part of your apron.

View file

@ -1,8 +1,6 @@
***
- - -
title: "Bib width"
***
- - -
Controls the width of the _bib_ part of your apron.

View file

@ -1,8 +1,6 @@
***
- - -
title: "Strap length"
***
- - -
Controls the length of the straps on your apron.

View file

@ -1,8 +1,6 @@
***
- - -
title: "Length bonus"
***
- - -
How much longer than the default length to make your apron.

View file

@ -1,8 +1,6 @@
***
- - -
title: "Strap width"
***
- - -
Controls the width of the straps on your apron.

View file

@ -1,7 +1,5 @@
***
- - -
title: "Albert apron: Design Options"
***
- - -
<PatternOptions pattern='albert' />

View file

@ -1,7 +1,5 @@
***
- - -
title: "Albert apron"
***
- - -
<PatternDocs pattern='albert' />

View file

@ -1,7 +1,5 @@
***
- - -
title: "Bee bikini top: Required Measurements"
***
- - -
<PatternMeasurements pattern='bee' />

View file

@ -1,6 +1,8 @@
---
- - -
title: "Armhole depth (Bella)"
---
- - -
***
Controls the armhole depth in the underlying Bella block Bee is based on

View file

@ -1,6 +1,8 @@
---
- - -
title: "Back dart height (Bella)"
---
- - -
***
Controls the back dart height in the underlying Bella block Bee is based on

View file

@ -1,6 +1,8 @@
---
- - -
title: "Band Length (Cross back ties)"
---
- - -
***
Controls the length of the band around your chest for the cross back ties variation of Bee

View file

@ -1,6 +1,8 @@
---
- - -
title: "Band (chest) tie length colours"
---
- - -
***
Whether you want single color tie around your chest, or dual-coloured ones

View file

@ -1,6 +1,8 @@
---
- - -
title: "Band (chest) tie ends"
---
- - -
***
Whether you like straight or pointy ends on the tie around your chest

View file

@ -1,6 +1,8 @@
---
- - -
title: "Band (chest) tie length"
---
- - -
***
Controls the length of the tie around your chest

View file

@ -1,6 +1,8 @@
---
- - -
title: "Band (chest) tie width"
---
- - -
***
Controls the width of the tie/band around your chest

View file

@ -1,6 +1,8 @@
---
- - -
title: "Show Bella"
---
- - -
***
Shows the outline of the Bella block Bee is based on

View file

@ -1,6 +1,8 @@
---
- - -
title: "Bottom depth"
---
- - -
***
Controls how far the bikini cup extends downwards

View file

@ -1,6 +1,8 @@
---
- - -
title: "Bust span ease"
---
- - -
***
Controls the bust span ease in the underlying Bella block Bee is based on

View file

@ -1,6 +1,8 @@
---
- - -
title: "Chest ease"
---
- - -
***
Controls the chest ease in the underlying Bella block Bee is based on

View file

@ -1,6 +1,8 @@
---
- - -
title: "Cross back ties"
---
- - -
***
A variation of Bee, where the neck ties cross and tie in the back by looping into a band that replaces the band tie

View file

@ -1,6 +1,8 @@
---
- - -
title: "Front armhole pitch depth (Bella)"
---
- - -
***
Controls the front armhole pitch depth in the underlying Bella block Bee is based on

View file

@ -1,6 +1,8 @@
---
- - -
title: "Front curve"
---
- - -
***
Controls the curvature of the front of the bikini cup

View file

@ -1,6 +1,8 @@
---
- - -
title: "Front shoulder width (Bella)"
---
- - -
***
Controls the front shoulder width in the underlying Bella block Bee is based on

View file

@ -1,6 +1,8 @@
---
- - -
title: "High bust width (Bella)"
---
- - -
***
Controls the high bust width in the underlying Bella block Bee is based on

View file

@ -1,6 +1,8 @@
---
- - -
title: "Neck tie colours"
---
- - -
***
Whether you want single color ties around your neck, or dual-coloured ones

View file

@ -1,6 +1,8 @@
---
- - -
title: "Neck tie ends"
---
- - -
***
Whether you like straight or pointy ends on the ties around your neck

View file

@ -1,6 +1,8 @@
---
- - -
title: "Neck tie length"
---
- - -
***
Controls the length of the ties around your neck

View file

@ -1,6 +1,8 @@
---
- - -
title: "Neck tie width"
---
- - -
***
Controls the width of the ties around your neck

View file

@ -1,8 +1,10 @@
---
- - -
title: "Side curve"
---
- - -
Controls the curvature of the side of the bikini cup.
***
Controls the curvature of the side of the bikini cup
## Effect of this option on the pattern

View file

@ -1,6 +1,8 @@
---
- - -
title: "Side depth"
---
- - -
***
Controls how far the bikini cup extends towards the side

View file

@ -1,6 +1,8 @@
---
- - -
title: "Ties"
---
- - -
***
Whether to includes ties, yes or no

View file

@ -1,6 +1,8 @@
---
- - -
title: "Top Depth"
---
- - -
***
Controls how far the bikini cup extends upwards

View file

@ -1,7 +1,5 @@
***
- - -
title: "Bee bikini top: Design Options"
***
- - -
<PatternOptions pattern='bee' />

View file

@ -1,6 +1,8 @@
---
- - -
title: "Waist ease"
---
- - -
***
Controls the waist ease in the underlying Bella block Bee is based on

View file

@ -1,7 +1,5 @@
***
- - -
title: "Bee bikini top"
***
- - -
<PatternDocs pattern='bee' />

View file

@ -1,8 +1,6 @@
***
- - -
title: "Bella body block: Cutting Instructions"
***
- - -
**Main fabric**

View file

@ -1,8 +1,6 @@
***
- - -
title: "Bella body block: Fabric Options"
***
- - -
If you are making a default Bella to see how it fits we recommend a fabric such as **Calico (Muslin)** or a cheaper fabric that matches the drape and stretch of the fabric you intend to make a finalised version of Bella with.

View file

@ -1,8 +1,6 @@
***
- - -
title: "Bella body block: Sewing Instructions"
***
- - -
<Note>

View file

@ -1,7 +1,5 @@
***
- - -
title: "Bella body block: Required Measurements"
***
- - -
<PatternMeasurements pattern='bella' />

View file

@ -1,8 +1,6 @@
***
- - -
title: "Bella body block: What You Need"
***
- - -
To make Bella, you will need the following:

View file

@ -1,7 +1,5 @@
***
- - -
title: "Bella body block: Design Options"
***
- - -
<PatternOptions pattern='bella' />

View file

@ -1,7 +1,5 @@
***
- - -
title: "Bella body block"
***
- - -
<PatternDocs pattern='bella' />

View file

@ -1,8 +1,6 @@
***
- - -
title: "Benjamin bow tie: Cutting Instructions"
***
- - -
Benjamin is a rather simple pattern, but your options will determine what needs to be cut out. Below are two typical layouts.

View file

@ -1,8 +1,6 @@
***
- - -
title: "Benjamin bow tie: Fabric Options"
***
- - -
The bow ties you find in the store are typically make out of silk or some imitation silk poly. So it will come as no surprise that those are good options. Any type of fabric that you like the pattern or looks of can become a candidate for a bow tie. The only real limitation is that the bow tie will have to be turned inside out through a tube that is only 2cm across. With some thicker fabrics, this will be a difficult proposition.

View file

@ -1,8 +1,6 @@
***
- - -
title: "Benjamin bow tie: Sewing Instructions"
***
- - -
## Notes and tips

View file

@ -1,7 +1,5 @@
***
- - -
title: "Benjamin bow tie: Required Measurements"
***
- - -
<PatternMeasurements pattern='benjamin' />

View file

@ -1,8 +1,6 @@
***
- - -
title: "Benjamin bow tie: What You Need"
***
- - -
To make Benjamin, you will need the following:

View file

@ -1,8 +1,6 @@
***
- - -
title: "Adjustment ribbon"
***
- - -
![Traditional or adjustable](adjustmentribbon.svg)

View file

@ -1,8 +1,6 @@
***
- - -
title: "Bow length"
***
- - -
![Bow length](bowlength.svg)

View file

@ -1,8 +1,6 @@
***
- - -
title: "Bow style"
***
- - -
Four different bow tie styles!

View file

@ -1,8 +1,6 @@
***
- - -
title: "Collar ease"
***
- - -
![How much ease do you use for your collar?](collarease.svg)

View file

@ -1,8 +1,6 @@
***
- - -
title: "End style"
***
- - -
![Three different tip shapes](endstyle.svg)

View file

@ -1,8 +1,6 @@
***
- - -
title: "Knot width"
***
- - -
![Knot width](knotwidth.svg)

View file

@ -1,8 +1,6 @@
***
- - -
title: "Tip width"
***
- - -
![Bow ties Wide and Narrow](tipwidth.svg)

View file

@ -1,7 +1,5 @@
***
- - -
title: "Benjamin bow tie: Design Options"
***
- - -
<PatternOptions pattern='benjamin' />

View file

@ -1,7 +1,5 @@
***
- - -
title: "Benjamin bow tie"
***
- - -
<PatternDocs pattern='benjamin' />

View file

@ -1,8 +1,6 @@
***
- - -
title: "Bent body Block: Sewing Instructions"
***
- - -
<Note>

View file

@ -1,7 +1,5 @@
***
- - -
title: "Bent body Block: Required Measurements"
***
- - -
<PatternMeasurements pattern='bent' />

View file

@ -1,8 +1,6 @@
***
- - -
title: "Across back factor"
***
- - -
Controls your across back width as a factor of your shoulder to shoulder measurement

View file

@ -1,8 +1,6 @@
***
- - -
title: "Armhole depth factor"
***
- - -
This controls the depth of the armhole, which in turn influences the sleevecap width.

View file

@ -1,11 +1,11 @@
---
- - -
title: "Back neck cutout"
---
Controls how deep the neck opening is cut out in the back of the garment. In other words, increasing this will shift the neck opening to the back.
- - -
![Back neck cutout](backneckcutout.svg)
Controls how deep the neck opening is cut out in the back of the garment. In other words, increasing this will shift the neck opening to the back.
## Effect of this option on the pattern
![This image shows the effect of this option by superimposing several variants that have a different value for this option](bent_backneckcutout_sample.svg "Effect of this option on the pattern")

View file

@ -1,8 +1,6 @@
***
- - -
title: "Biceps ease"
***
- - -
This option controls the ease at your upper arm/biceps.

View file

@ -1,8 +1,6 @@
***
- - -
title: "Chest ease"
***
- - -
The amount of ease at your chest.

View file

@ -1,8 +1,6 @@
***
- - -
title: "Collar ease"
***
- - -
The amount of ease at your neck/collar.

View file

@ -1,8 +1,6 @@
***
- - -
title: "Cuff ease"
***
- - -
The amount of ease at your cuff/wrist.

View file

@ -1,8 +1,6 @@
***
- - -
title: "Front armhole extra cutout"
***
- - -
How much the armhole is cut out deeper at the front, than the back.

View file

@ -1,8 +1,6 @@
***
- - -
title: "Length bonus"
***
- - -
This option controls how far the block extend below your hips.

View file

@ -1,6 +1,6 @@
---
- - -
title: "Shoulder seam shift: armhole side"
---
- - -
Controls the shoulder seam location on the armhole side.

Some files were not shown because too many files have changed in this diff Show more