Code

Indian cookbook#37930

Code

Merged

ZhilkinSerg merged 17 commits intoCleverRaven:devCleverRaven/Cataclysm-DDA:devfrom ashGlaw:Indian-CookbookashGlaw/Cataclysm-DDA:Indian-CookbookCopy head branch name to clipboardMar 10, 2020

+31-3

Commits

Commits on Feb 11, 2020

• Added recipe for ghee

  Show description for adf47d7
  

  ashGlaw

  committed
  adf47d7

• Now you need a strainer of some sort. added a variety

  

  ashGlaw

  committed
  724616e

• Make craft time realistic

  Show description for a532861
  

  ashGlaw

  and

  I-am-Erk

  authored
  a532861

• Added an indian cookbook, moved curry and ghee recipes to that

  Show description for d32a4c2
  

  ashGlaw

  committed
  d32a4c2

• Merge branch 'Ghee-Recipe' of https://github.com/ashGlaw/Cataclysm-DDA into Ghee-Recipe

  

  ashGlaw

  committed
  3f36a26

• Itemgroups added

  Show description for 3d37711
  

  ashGlaw

  committed
  3d37711

• Set ghee recipe to be in cookbook

  

  ashGlaw

  committed
  d71fdec

• Update dairy_products.json

  

  ashGlaw

  committed
  c3a8b7b

• Put the Ghee recipe in more than just the Indian Cookbook

  Show description for 37e3249
  

  ashGlaw

  and

  I-am-Erk

  authored
  37e3249

• Merge remote-tracking branch 'upstream/master' into Indian-Cookbook

  

  ashGlaw

  committed
  a8f30a4

Commits on Mar 10, 2020

• Rename data/json/itemgroups/mansion.json to data/json/itemgroups/Locations_MapExtras/mansion.json

  ZhilkinSerg

  authored
  3fe1cf3

• Rename data/json/recipes/food/dairy_products.json to data/json/recipes/Food/dairy_products.json

  ZhilkinSerg

  authored
  5a3089e

• Rename data/json/recipes/Food/dairy_products.json to data/json/recipes/food/dairy_products.json

  ZhilkinSerg

  authored
  604fe7f

• Update item_groups.json

  ZhilkinSerg

  authored
  878986c

• Merge branch 'dev' into Indian-Cookbook

  ZhilkinSerg

  authored
  5b59db9

• Update mansion.json

  ZhilkinSerg

  authored
  7ace667

• Update collections_domestic.json

  ZhilkinSerg

  authored
  d929554