Code

Add poultry meat#70934

Code

Merged

Maleclypse merged 39 commits intoCleverRaven:masterCleverRaven/Cataclysm-DDA:masterfrom XygenSS:chimkenXygenSS/Cataclysm-DDA:chimkenCopy head branch name to clipboardApr 27, 2024

+592-10

Commits

Commits on Mar 16, 2024

• I have no idea what I am doing

  XygenSS

  committed
  4c6720d

  Copy full SHA for 4c6720d

• scraps, harvest

  XygenSS

  committed
  3b0af54

  Copy full SHA for 3b0af54

• lots of bugs

  XygenSS

  committed
  279560b

  Copy full SHA for 279560b

• seperate reg and fatty smoked

  XygenSS

  committed
  d257656

  Copy full SHA for d257656

• edit requirements and barebones new recipes

  XygenSS

  committed
  f60ea92

  Copy full SHA for f60ea92

Commits on Mar 18, 2024

• calorie fix

  XygenSS

  committed
  e13c1cf

  Copy full SHA for e13c1cf

• chicken dishes

  XygenSS

  committed
  89432db

  Copy full SHA for 89432db

Commits on Mar 21, 2024

• recipes, 5 of 7

  XygenSS

  committed
  3f85e69

  Copy full SHA for 3f85e69

Commits on Mar 24, 2024

• Merge branch 'CleverRaven:master' into chimken

  XygenSS

  authored
  b98495f

  Copy full SHA for b98495f

• reconfigure item id for easy searching and autofill

  XygenSS

  committed
  61b68c5

  Copy full SHA for 61b68c5

• recipes, 8 of 7

  XygenSS

  committed
  509efc0

  Copy full SHA for 509efc0

• lint

  XygenSS

  committed
  f07ca13

  Copy full SHA for f07ca13

• lint

  XygenSS

  committed
  7e2e9c3

  Copy full SHA for 7e2e9c3

• migrate sandwich to sandwich.json, and remove the possibility of egg

  XygenSS

  committed
  432e861

  Copy full SHA for 432e861

Commits on Mar 26, 2024

• revert mystery reverts

  XygenSS

  committed
  d2cd983

  Copy full SHA for d2cd983

• calorie is a number not a string

  XygenSS

  committed
  6af9f91

  Copy full SHA for 6af9f91

• fix load errors

  XygenSS

  committed
  b834ec2

  Copy full SHA for b834ec2

Commits on Mar 31, 2024

• Merge branch 'CleverRaven:master' into chimken

  XygenSS

  authored
  ec8514c

  Copy full SHA for ec8514c

Commits on Apr 11, 2024

• Merge branch 'CleverRaven:master' into chimken

  XygenSS

  authored
  0d05536

  Copy full SHA for 0d05536

• attempt fix density and cal

  XygenSS

  committed
  06ebfd5

  Copy full SHA for 06ebfd5

• attempt cal fix 2

  XygenSS

  committed
  59b4b88

  Copy full SHA for 59b4b88

• attempt cal fix 3

  XygenSS

  committed
  25ab661

  Copy full SHA for 25ab661

• just work already ya bastard

  XygenSS

  committed
  39570e2

  Copy full SHA for 39570e2

Commits on Apr 20, 2024

• apply suggestions from review

  XygenSS

  committed
  9315258

  Copy full SHA for 9315258

• lint

  Show description for b969659
  

  XygenSS

  and

  github-actions[bot]

  authored
  b969659

  Copy full SHA for b969659

Commits on Apr 24, 2024

• Merge branch 'CleverRaven:master' into chimken

  XygenSS

  authored
  f4d737d

  Copy full SHA for f4d737d

• redo nutrition, remove fatty poultry, shuffle json

  XygenSS

  committed
  d57068c

  Copy full SHA for d57068c

• Update data/json/recipes/recipe_food.json

  Show description for ce56cfa
  

  XygenSS

  and

  github-actions[bot]

  authored
  ce56cfa

  Copy full SHA for ce56cfa

• Update data/json/recipes/food/meat_dishes.json

  Show description for b0d2339
  

  XygenSS

  and

  github-actions[bot]

  authored
  b0d2339

  Copy full SHA for b0d2339

Commits on Apr 25, 2024

• lint

  XygenSS

  committed
  5702462

  Copy full SHA for 5702462

• lint

  XygenSS

  committed
  b4ff541

  Copy full SHA for b4ff541

• fix typo

  XygenSS

  committed
  cdea07c

  Copy full SHA for cdea07c

• revert all changes to bird.json

  XygenSS

  committed
  eb54574

  Copy full SHA for eb54574

• add missing scrap cooking recipe, recalculate cooking heat

  XygenSS

  committed
  5433939

  Copy full SHA for 5433939

• missing rename

  XygenSS

  committed
  379f0cc

  Copy full SHA for 379f0cc

• Merge branch 'CleverRaven:master' into chimken

  XygenSS

  authored
  0f20461

  Copy full SHA for 0f20461

Commits on Apr 26, 2024

• add missing prices

  XygenSS

  committed
  cd672d1

  Copy full SHA for cd672d1

• cleanup remainder of waterfowl group

  XygenSS

  committed
  4d7bbea

  Copy full SHA for 4d7bbea

Commits on Apr 27, 2024

• rectify mystery reverts

  XygenSS

  committed
  c82cfd5

  Copy full SHA for c82cfd5