Code

Patch for seltzer drink #2#52870

Code

Merged

ZhilkinSerg merged 32 commits intoCleverRaven:masterCleverRaven/Cataclysm-DDA:masterfrom AHolmen:A.H_DEVCopy head branch name to clipboardNov 21, 2021

+104

Commits

Commits on Nov 14, 2021

• hard seltzer added in distribution

  AHolmen

  authored
  c79ff41

  Copy full SHA for c79ff41

• Merge branch 'CleverRaven:master' into master

  AHolmen

  authored
  db98179

  Copy full SHA for db98179

• Merge branch 'CleverRaven:master' into master

  AHolmen

  authored
  ced82b4

  Copy full SHA for ced82b4

• added hard seltzer to mixed alcohol weak

  AHolmen

  authored
  cd2f359

  Copy full SHA for cd2f359

• Added hard seltzer

  AHolmen

  authored
  9f66d25

  Copy full SHA for 9f66d25

• removed last comma for fix of seltzer

  AHolmen

  authored
  6f960cf

  Copy full SHA for 6f960cf

• Minor fix for seltzer

  AHolmen

  authored
  30964de

  Copy full SHA for 30964de

• Add homebrewed seltzer recipe and product

  AHolmen

  committed
  b09aa8b

  Copy full SHA for b09aa8b

• add hb seltzer to weak alcohol mixed recipe

  AHolmen

  committed
  fa1e60d

  Copy full SHA for fa1e60d

• HB seltzer grammar fix

  AHolmen

  authored
  0227857

  Copy full SHA for 0227857

• Update recipe_food.json

  AHolmen

  authored
  24404df

  Copy full SHA for 24404df

• linting

  AHolmen

  authored
  ee59765

  Copy full SHA for ee59765

• Delete brewing.json

  AHolmen

  authored
  3fbbf4d

  Copy full SHA for 3fbbf4d

• Update brewing.json

  AHolmen

  committed
  08068b3

  Copy full SHA for 08068b3

• Merge branch 'A.H_DEV' of https://github.com/AHolmen/Cataclysm-DDA into A.H_DEV

  AHolmen

  committed
  a0cb0c8

  Copy full SHA for a0cb0c8

• Update brewing.json

  AHolmen

  authored
  77ce339

  Copy full SHA for 77ce339

• Update brewing.json

  AHolmen

  committed
  af661f5

  Copy full SHA for af661f5

• Merge branch 'A.H_DEV' of https://github.com/AHolmen/Cataclysm-DDA into A.H_DEV

  AHolmen

  committed
  5673612

  Copy full SHA for 5673612

• linting

  AHolmen

  committed
  1ee9571

  Copy full SHA for 1ee9571

• Used linting tool

  AHolmen

  authored
  ac7583e

  Copy full SHA for ac7583e

• linting json

  AHolmen

  committed
  6554899

  Copy full SHA for 6554899

• Merge branch 'A.H_DEV' of https://github.com/AHolmen/Cataclysm-DDA into A.H_DEV

  AHolmen

  committed
  cb966cb

  Copy full SHA for cb966cb

• Update alcohol.json

  AHolmen

  authored
  6a57b54

  Copy full SHA for 6a57b54

Commits on Nov 15, 2021

• Update alcohol.json

  AHolmen

  committed
  7b519f6

  Copy full SHA for 7b519f6

• Update alcohol.json

  AHolmen

  committed
  86c6b69

  Copy full SHA for 86c6b69

Commits on Nov 16, 2021

• Update alcohol.json

  AHolmen

  authored
  be52243

  Copy full SHA for be52243

Commits on Nov 17, 2021

• Misc fixes for seltzer

  Show description for 5fb540c
  AHolmen

  committed
  5fb540c

  Copy full SHA for 5fb540c

• Update cooking_components.json

  AHolmen

  authored
  0e6e40b

  Copy full SHA for 0e6e40b

• Update food.json

  AHolmen

  authored
  4d033a3

  Copy full SHA for 4d033a3

• Update mansion.json

  AHolmen

  authored
  44a5180

  Copy full SHA for 44a5180

Commits on Nov 18, 2021

• Update mansion.json

  Show description for faa04f8
  AHolmen

  authored
  faa04f8

  Copy full SHA for faa04f8

• Update items_generic.json

  AHolmen

  authored
  caf31d0

  Copy full SHA for caf31d0