Code

WIP: Crafting recipes wrap-up#36720

Code

Closed

Soup-de-Loop wants to merge 39 commits intoCleverRaven:masterCleverRaven/Cataclysm-DDA:masterfrom Soup-de-Loop:soupdeloop-crafting-wrap-upCopy head branch name to clipboard

+243-463

Commits

Commits on Dec 20, 2019

• Update clothing.json

  Show description for ca69ed5
  Soup-de-Loop

  authored
  ca69ed5

  Copy full SHA for ca69ed5

Commits on Dec 21, 2019

• Update clothing.json

  Soup-de-Loop

  authored
  95094b3

  Copy full SHA for 95094b3

• Update clothing.json

  Show description for e0105f5
  Soup-de-Loop

  authored
  e0105f5

  Copy full SHA for e0105f5

• Update clothing.json

  Show description for 3a7df24
  Soup-de-Loop

  authored
  3a7df24

  Copy full SHA for 3a7df24

• Update clothing.json

  Show description for 99ce89f
  Soup-de-Loop

  authored
  99ce89f

  Copy full SHA for 99ce89f

Commits on Dec 30, 2019

• Merge branch 'master' of https://github.com/Soup-de-Loop/Cataclysm-DDA

  Soup-de-Loop

  committed
  a08ea0d

  Copy full SHA for a08ea0d

• Update afs_vehicle_groups.json

  Soup-de-Loop

  authored
  a63deda

  Copy full SHA for a63deda

• adds numerous titanium items

  Show description for df84b8b
  Soup-de-Loop

  authored
  df84b8b

  Copy full SHA for df84b8b

• add harvest json for implants

  Show description for 755261d
  Soup-de-Loop

  authored
  755261d

  Copy full SHA for 755261d

• Adds spawning for titanium items

  Show description for 4fbf0d1
  Soup-de-Loop

  authored
  4fbf0d1

  Copy full SHA for 4fbf0d1

• adjust afs_titanium_scrap weight ratio

  Show description for 1add18f
  Soup-de-Loop

  authored
  1add18f

  Copy full SHA for 1add18f

• adds uncrafting recipes for titanium items

  Show description for dd9a2d3
  Soup-de-Loop

  authored
  dd9a2d3

  Copy full SHA for dd9a2d3

• add afs_scrap_titanium recipe

  Show description for bdf10a4
  Soup-de-Loop

  authored
  bdf10a4

  Copy full SHA for bdf10a4

Commits on Dec 31, 2019

• Update data/mods/Aftershock/items/afs_harvest.json

  Show description for c7ee515
  

  Soup-de-Loop

  and

  anothersimulacrum

  authored
  c7ee515

  Copy full SHA for c7ee515

• Remove titanium bat from items

  Show description for bbb0df2
  Soup-de-Loop

  authored
  bbb0df2

  Copy full SHA for bbb0df2

• Add titanium bat to weapons

  Soup-de-Loop

  authored
  827daf3

  Copy full SHA for 827daf3

• Fix excess charges of afs_titanium_small

  Show description for 2f618fe
  Soup-de-Loop

  authored
  2f618fe

  Copy full SHA for 2f618fe

• Remove frame deconstruction

  Show description for 193c1b2
  Soup-de-Loop

  authored
  193c1b2

  Copy full SHA for 193c1b2

• missed ,

  Show description for 2dd37ff
  Soup-de-Loop

  authored
  2dd37ff

  Copy full SHA for 2dd37ff

Commits on Jan 1, 2020

• Fixed astyle issues

  Soup-de-Loop

  authored
  0c241fb

  Copy full SHA for 0c241fb

• re-add titanium frame decon

  Show description for 19a9cd3
  Soup-de-Loop

  authored
  19a9cd3

  Copy full SHA for 19a9cd3

• Fixes to string issues in afs__items.json

  Show description for 24dba4f
  Soup-de-Loop

  authored
  24dba4f

  Copy full SHA for 24dba4f

• Last travis error

  Show description for 71196a6
  Soup-de-Loop

  authored
  71196a6

  Copy full SHA for 71196a6

Commits on Jan 2, 2020

• Add bots that were migrated from mainline

  Show description for 0f3ff46
  Soup-de-Loop

  authored
  0f3ff46

  Copy full SHA for 0f3ff46

Commits on Jan 3, 2020

• bring original titanium colours to parity

  Show description for c9a1d44
  Soup-de-Loop

  authored
  c9a1d44

  Copy full SHA for c9a1d44

Commits on Jan 5, 2020

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

  Soup-de-Loop

  committed
  81be7d0

  Copy full SHA for 81be7d0

• Update recipe_vehicle.json

  Soup-de-Loop

  committed
  cb1309f

  Copy full SHA for cb1309f

• Update recipe_vehicle.json

  Soup-de-Loop

  committed
  4dfdc0e

  Copy full SHA for 4dfdc0e

Commits on Jan 6, 2020

• add fine_metalwork_standard to requirements

  Show description for 2e6072e
  Soup-de-Loop

  authored
  2e6072e

  Copy full SHA for 2e6072e

• Re-wrap recipe_weapon.json using standards

  Show description for 9dd1763
  Soup-de-Loop

  authored
  9dd1763

  Copy full SHA for 9dd1763

• Re-work recipe_ammo.json to use standards

  Show description for fce40e3
  Soup-de-Loop

  authored
  fce40e3

  Copy full SHA for fce40e3

• Add glassblowing_standard to toolsets.json

  Show description for 2eaf10e
  Soup-de-Loop

  authored
  2eaf10e

  Copy full SHA for 2eaf10e

Commits on Jan 7, 2020

• Re-wrap recipes_others.json using requirements

  Show description for 8e572a8
  Soup-de-Loop

  authored
  8e572a8

  Copy full SHA for 8e572a8

Commits on Jan 8, 2020

• Update cutting.json

  Soup-de-Loop

  authored
  1cb870d

  Copy full SHA for 1cb870d

• Update parts.json

  Soup-de-Loop

  authored
  10cf05f

  Copy full SHA for 10cf05f

• Update tool.json

  Soup-de-Loop

  authored
  89e896b

  Copy full SHA for 89e896b

• Update other.json

  Soup-de-Loop

  authored
  16d4a01

  Copy full SHA for 16d4a01

• Update fuel.json

  Show description for 066c750
  Soup-de-Loop

  authored
  066c750

  Copy full SHA for 066c750

• Update piercing.json

  Show description for 447866e
  Soup-de-Loop

  authored
  447866e

  Copy full SHA for 447866e