Code

Tailoring recipe audit#54256

Code

Merged

kevingranade merged 125 commits intoCleverRaven:masterCleverRaven/Cataclysm-DDA:masterfrom a-chancey:TailoringRecipeOverhaul-Cottona-chancey/Cataclysm-DDA:TailoringRecipeOverhaul-CottonCopy head branch name to clipboardJun 17, 2022

+2,016-1,358

Commits

Commits on Jan 4, 2022

• First pass on the cotton update. These adjustements are to the cotton fabric weights and volumes, the materials, as well as any recipe using cotton_tailoring or cotton_patchwork_tailoring requireme…

  Show description for 1bb7b16
  a-chancey

  committed
  1bb7b16

• Merge branch 'CleverRaven:master' into TailoringRecipeOverhaul-Cotton

  a-chancey

  authored
  785def5

Commits on Jan 5, 2022

• Merge branch 'CleverRaven:master' into TailoringRecipeOverhaul-Cotton

  a-chancey

  authored
  923fdc0

Commits on Jan 8, 2022

• Merge branch 'CleverRaven:master' into TailoringRecipeOverhaul-Cotton

  a-chancey

  authored
  52d35df

Commits on Jan 10, 2022

• Merge branch 'CleverRaven:master' into TailoringRecipeOverhaul-Cotton

  a-chancey

  authored
  a9d5414

• Tailoring Recipe Audit - Cotton

  Show description for 41d1d1a
  a-chancey

  committed
  41d1d1a

• Merge branch 'CleverRaven:master' into TailoringRecipeOverhaul-Cotton

  a-chancey

  authored
  789ca6c

Commits on Jan 11, 2022

• Merge branch 'CleverRaven:master' into TailoringRecipeOverhaul-Cotton

  a-chancey

  authored
  2bc9460

Commits on Feb 1, 2022

• Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into CleverRaven-master

  a-chancey

  committed
  a126643

• Merge branch 'CleverRaven-master' into TailoringRecipeOverhaul-Cotton

  a-chancey

  committed
  88eeb2e

Commits on Feb 3, 2022

• Merge branch 'CleverRaven:master' into TailoringRecipeOverhaul-Cotton

  a-chancey

  authored
  311f2ca

Commits on Feb 5, 2022

• Merge conflicts

  a-chancey

  committed
  4837392

• Merge pull request #3 from CleverRaven/master

  Show description for a23bc0b
  a-chancey

  authored
  a23bc0b

Commits on Feb 6, 2022

• Quick commit with all the weight and volume changes. starting work on recipes next.

  Show description for 2f1c032
  a-chancey

  committed
  2f1c032

• Merge branch 'CleverRaven:master' into TailoringRecipeOverhaul-Cotton

  a-chancey

  authored
  d563450

• linting json

  Show description for 18c6c15
  a-chancey

  committed
  18c6c15

• Merge branch 'CleverRaven:master' into TailoringRecipeOverhaul-Cotton

  a-chancey

  authored
  8df3c3d

• Merge branch 'TailoringRecipeOverhaul-Cotton' of https://github.com/a-chancey/Cataclysm-DDA into TailoringRecipeOverhaul-Cotton

  a-chancey

  committed
  534a7a2

• More updates

  Show description for 68db6eb
  a-chancey

  committed
  68db6eb

Commits on Feb 9, 2022

• Adjustments and requirement updates

  Show description for aee796a
  a-chancey

  committed
  aee796a

• Merge branch 'CleverRaven:master' into TailoringRecipeOverhaul-Cotton

  a-chancey

  authored
  959fdb3

Commits on Feb 10, 2022

• Fixing linting errors and requirements

  Show description for 7d574d8
  a-chancey

  committed
  7d574d8

• Merge branch 'CleverRaven:master' into TailoringRecipeOverhaul-Cotton

  a-chancey

  authored
  7079dc5

• More linting issues/minor adjustments

  Show description for 9c702ef
  a-chancey

  committed
  9c702ef

Commits on Feb 14, 2022

• Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into CleverRaven-master

  a-chancey

  committed
  96e2e73

• Merge branch 'CleverRaven-master' into TailoringRecipeOverhaul-Cotton

  a-chancey

  committed
  e353e33

• Goofed a merge on Arms

  Show description for 163bf8c
  a-chancey

  committed
  163bf8c

• Adding last of new requirements

  Show description for e141d56
  a-chancey

  committed
  e141d56

• Merge branch 'CleverRaven:master' into TailoringRecipeOverhaul-Cotton

  a-chancey

  authored
  795ad5c

• few recipe changes, updating then testing

  Show description for 8c72c2b
  a-chancey

  committed
  8c72c2b

• Recipe changes

  Show description for b8eedb7
  a-chancey

  committed
  b8eedb7

Commits on Feb 15, 2022

• Linting and json error fixing

  Show description for 429ae09
  a-chancey

  committed
  429ae09

• Merge branch 'CleverRaven:master' into TailoringRecipeOverhaul-Cotton

  a-chancey

  authored
  fb86421

Commits on Feb 16, 2022

• Working through arms

  Show description for 1962e4f
  a-chancey

  committed
  1962e4f

• Merge branch 'CleverRaven:master' into TailoringRecipeOverhaul-Cotton

  a-chancey

  authored
  57fffb5

• oops. lint them arms.

  a-chancey

  committed
  0895b57

Commits on Feb 17, 2022

• Merge branch 'CleverRaven:master' into TailoringRecipeOverhaul-Cotton

  a-chancey

  authored
  5878851

Commits on Feb 18, 2022

• Merge branch 'CleverRaven:master' into TailoringRecipeOverhaul-Cotton

  a-chancey

  authored
  55c5dc7

• Arms first pass complete

  Show description for c3b89a0
  a-chancey

  committed
  c3b89a0

Commits on Feb 19, 2022

• lint baby lint

  a-chancey

  committed
  cca7315

• Updating tests that failed

  Show description for c83cc96
  a-chancey

  committed
  c83cc96

• Merge branch 'CleverRaven:master' into TailoringRecipeOverhaul-Cotton

  a-chancey

  authored
  87a7b1c

Commits on Feb 23, 2022

• working on boots

  Show description for fe92694
  a-chancey

  committed
  fe92694

• Update feet.json

  a-chancey

  committed
  cd1bfe0

• Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into CleverRaven-master

  a-chancey

  committed
  388f416

• Merge branch 'CleverRaven-master' into TailoringRecipeOverhaul-Cotton

  a-chancey

  committed
  c9c5559

Commits on Feb 24, 2022

• Merge branch 'CleverRaven:master' into TailoringRecipeOverhaul-Cotton

  a-chancey

  authored
  23459d5

• Done with feet first pass

  Show description for 5a85aa5
  a-chancey

  committed
  5a85aa5

Commits on Feb 25, 2022

• Linting

  Show description for fd707dc
  a-chancey

  committed
  fd707dc

• Merge branch 'CleverRaven:master' into TailoringRecipeOverhaul-Cotton

  a-chancey

  authored
  a6fbea2

• Working through head.json

  Show description for 1f50174
  a-chancey

  committed
  1f50174

• Merge branch 'TailoringRecipeOverhaul-Cotton' of https://github.com/a-chancey/Cataclysm-DDA into TailoringRecipeOverhaul-Cotton

  a-chancey

  committed
  eb816de

• ope had more linting to do

  Show description for 7dc013a
  a-chancey

  committed
  7dc013a

Commits on Feb 27, 2022

• sorting items for astyle

  Show description for d356f40
  a-chancey

  committed
  d356f40

• Merge branch 'CleverRaven:master' into TailoringRecipeOverhaul-Cotton

  a-chancey

  authored
  dbe7d93

• removing scissors from crafting test

  Show description for b400fb5
  a-chancey

  committed
  b400fb5

Commits on Mar 1, 2022

• Quick fixes for head.json

  Show description for 4e22db0
  a-chancey

  committed
  4e22db0

Commits on Mar 2, 2022

• Head.json first pass complete

  Show description for c412257
  a-chancey

  committed
  c412257

• Merge branch 'CleverRaven:master' into TailoringRecipeOverhaul-Cotton

  a-chancey

  authored
  228d101

Commits on Mar 4, 2022

• Working through legs

  Show description for e98a26e
  a-chancey

  committed
  e98a26e

• Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into CleverRaven-master

  a-chancey

  committed
  88fa48d

• Merge branch 'CleverRaven-master' into TailoringRecipeOverhaul-Cotton

  a-chancey

  committed
  af1c7f1

Commits on Mar 8, 2022

• Fix byproduct error

  Show description for 2b9dc3f
  a-chancey

  committed
  2b9dc3f

• Fix leather skirt

  Show description for 859852f
  a-chancey

  committed
  859852f

Commits on Mar 15, 2022

• Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into CleverRaven-master

  a-chancey

  committed
  78fe97f

• Merge branch 'CleverRaven-master' into TailoringRecipeOverhaul-Cotton

  a-chancey

  committed
  9505deb

• I finished legs

  Show description for 4d84759
  a-chancey

  committed
  4d84759

• Other is done

  Show description for 4651aa8
  a-chancey

  committed
  4651aa8

• linting

  Show description for 4a5b575
  a-chancey

  committed
  4a5b575

• Finished pet armors

  Show description for 2edfd34
  a-chancey

  committed
  2edfd34

Commits on Mar 16, 2022

• Storage first pass

  Show description for 3b74cbd
  a-chancey

  committed
  3b74cbd

• Linting and obsoleting the recipe for xs leather rifle case

  Show description for ee4dc49
  a-chancey

  committed
  ee4dc49

• Merge branch 'CleverRaven:master' into TailoringRecipeOverhaul-Cotton

  a-chancey

  authored
  2176fd7

• Cleaning up errors

  Show description for a973aed
  a-chancey

  committed
  a973aed

• committing changes to update from master

  Show description for b81ccfc
  a-chancey

  committed
  b81ccfc

Commits on Mar 17, 2022

• Linting before merging

  Show description for 51a5970
  a-chancey

  committed
  51a5970

• Merge branch 'CleverRaven:master' into TailoringRecipeOverhaul-Cotton

  a-chancey

  authored
  19d40ff

Commits on Mar 22, 2022

• Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into CleverRaven-master

  a-chancey

  committed
  7b0b28a

• Merge branch 'CleverRaven-master' into TailoringRecipeOverhaul-Cotton

  a-chancey

  committed
  a0840cc

Commits on Mar 23, 2022

• Updating leather armor

  Show description for 43eda39
  a-chancey

  committed
  43eda39

• Merge branch 'CleverRaven:master' into TailoringRecipeOverhaul-Cotton

  a-chancey

  authored
  0238160

Commits on Mar 27, 2022

• Committing to update

  Show description for 6c76b40
  a-chancey

  committed
  6c76b40

• Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into CleverRaven-master

  a-chancey

  committed
  50037a0

• Merge branch 'CleverRaven-master' into TailoringRecipeOverhaul-Cotton

  a-chancey

  committed
  f7b35e2

• json fix

  a-chancey

  committed
  744e461

Commits on Mar 28, 2022

• Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into CleverRaven-master

  a-chancey

  committed
  935054c

• Merge branch 'CleverRaven-master' into TailoringRecipeOverhaul-Cotton

  a-chancey

  committed
  07f98ff

Commits on Mar 29, 2022

• Got suits up to wetsuit

  Show description for 6b3f721
  a-chancey

  committed
  6b3f721

Commits on Mar 31, 2022

• Merge branch 'CleverRaven:master' into TailoringRecipeOverhaul-Cotton

  a-chancey

  authored
  e3e83e6

• First pass of suits

  Show description for f4b93b2
  a-chancey

  committed
  f4b93b2

• Merge branch 'TailoringRecipeOverhaul-Cotton' of https://github.com/a-chancey/Cataclysm-DDA into TailoringRecipeOverhaul-Cotton

  a-chancey

  committed
  2ab25cb

• json error and linting in suits

  Show description for 2504f7c
  a-chancey

  committed
  2504f7c

• Removed neoprene scrap weight

  Show description for 3075e5b
  a-chancey

  committed
  3075e5b

Commits on Apr 3, 2022

• beginning work through Torso

  Show description for a9c82aa
  a-chancey

  committed
  a9c82aa

Commits on Apr 12, 2022

• Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into CleverRaven-master

  a-chancey

  committed
  8b0f64c

• Tons of merges

  Show description for 74696da
  a-chancey

  committed
  74696da

• Merge branch 'CleverRaven-master' into TailoringRecipeOverhaul-Cotton

  a-chancey

  committed
  27b9c61

Commits on Apr 13, 2022

• json errors

  Show description for 3aabaae
  a-chancey

  committed
  3aabaae

Commits on Apr 14, 2022

• Merge branch 'CleverRaven:master' into TailoringRecipeOverhaul-Cotton

  a-chancey

  authored
  4524afd

• updating leather ammo pouch to cover the waist

  Show description for a04c656
  a-chancey

  committed
  a04c656

Commits on May 2, 2022

• Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into CleverRaven-master

  a-chancey

  committed
  d8f061a

• Merge branch 'CleverRaven-master' into TailoringRecipeOverhaul-Cotton

  a-chancey

  committed
  8c57f40

• Ope missed a line in the merge

  Show description for f8d32c7
  a-chancey

  committed
  f8d32c7

Commits on May 3, 2022

• Updating to at least let the tests run

  Show description for 83c5ec0
  a-chancey

  committed
  83c5ec0

Commits on Jun 10, 2022

• Update data/json/requirements/materials.json

  Show description for f1763c3
  

  Maleclypse

  and

  Termineitor244

  authored
  f1763c3

• Merge branch 'master' of github.com:CleverRaven/Cataclysm-DDA into CleverRaven-master

  a-chancey

  committed
  4fe5830

• Merge branch 'CleverRaven-master' into TailoringRecipeOverhaul-Cotton

  a-chancey

  committed
  6563b01

Commits on Jun 11, 2022

• Here we go

  Show description for c47cebe
  a-chancey

  committed
  c47cebe

• OMG

  Show description for 7bac63b
  a-chancey

  committed
  7bac63b

• Merge branch 'CleverRaven:master' into TailoringRecipeOverhaul-Cotton

  a-chancey

  authored
  1d4c6e7

• omg we're done

  Show description for c7df447
  a-chancey

  committed
  c7df447

• Merge branch 'TailoringRecipeOverhaul-Cotton' of https://github.com/a-chancey/Cataclysm-DDA into TailoringRecipeOverhaul-Cotton

  a-chancey

  committed
  15bcd58

• astyle

  Show description for 4c6b8be
  a-chancey

  committed
  4c6b8be

Commits on Jun 12, 2022

• This should fix the errors

  Show description for a22a9d5
  a-chancey

  committed
  a22a9d5

• Merge branch 'CleverRaven:master' into TailoringRecipeOverhaul-Cotton

  a-chancey

  authored
  77c467c

• Oh my god no more rags.

  Show description for 4ec0bd8
  a-chancey

  committed
  4ec0bd8

• Merge branch 'CleverRaven:master' into TailoringRecipeOverhaul-Cotton

  a-chancey

  authored
  51dde22

• Merge branch 'CleverRaven:master' into TailoringRecipeOverhaul-Cotton

  a-chancey

  authored
  2dcf21e

• Ok, NOW rags are gone.

  Show description for 1fcd53f
  a-chancey

  committed
  1fcd53f

• Linting

  Show description for dfbefe3
  a-chancey

  committed
  dfbefe3

Commits on Jun 15, 2022

• Merge branch 'CleverRaven:master' into TailoringRecipeOverhaul-Cotton

  a-chancey

  authored
  22ddfc5

• Merge branch 'CleverRaven:master' into TailoringRecipeOverhaul-Cotton

  a-chancey

  authored
  6641790

• Merge branch 'CleverRaven:master' into TailoringRecipeOverhaul-Cotton

  a-chancey

  authored
  e245f38

Commits on Jun 16, 2022

• Merge branch 'CleverRaven:master' into TailoringRecipeOverhaul-Cotton

  a-chancey

  authored
  766f884

Commits on Jun 17, 2022

• Update data/json/recipes/other/materials.json

  Show description for d204ed5
  

  kevingranade

  and

  Maleclypse

  authored
  d204ed5