Code

Lots more books#37377

Code

Merged

ZhilkinSerg merged 86 commits intoCleverRaven:masterCleverRaven/Cataclysm-DDA:masterfrom Jerimee:more-paperbacksJerimee/Cataclysm-DDA:more-paperbacksCopy head branch name to clipboardMay 7, 2020

+1,651-642

Commits

Commits on Dec 18, 2019

• Merge pull request #1 from CleverRaven/master

  Show description for 9b47c0f
  Jerimee

  authored
  9b47c0f

  Copy full SHA for 9b47c0f

Commits on Dec 20, 2019

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

  Jerimee

  committed
  7335969

  Copy full SHA for 7335969

Commits on Dec 22, 2019

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

  Jerimee

  committed
  3124e39

  Copy full SHA for 3124e39

Commits on Dec 25, 2019

• M materials sentence json_info

  Jerimee

  authored
  da27b3a

  Copy full SHA for da27b3a

Commits on Jan 6, 2020

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

  Jerimee

  committed
  7657c82

  Copy full SHA for 7657c82

Commits on Jan 18, 2020

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

  Jerimee

  committed
  ab22417

  Copy full SHA for ab22417

Commits on Jan 24, 2020

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

  Jerimee

  committed
  167d6ad

  Copy full SHA for 167d6ad

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

  Jerimee

  committed
  acf09cb

  Copy full SHA for acf09cb

• Update misc.json

  Jerimee

  committed
  85ef31a

  Copy full SHA for 85ef31a

Commits on Jan 25, 2020

• Update misc.json

  Jerimee

  committed
  9043cc6

  Copy full SHA for 9043cc6

• Update misc.json

  Jerimee

  committed
  0027783

  Copy full SHA for 0027783

• Update misc.json

  Jerimee

  committed
  60928d8

  Copy full SHA for 60928d8

• Update misc.json

  Jerimee

  committed
  27edc1f

  Copy full SHA for 27edc1f

• Update JSON_INFO.md

  Show description for 693907a
  Jerimee

  authored
  693907a

  Copy full SHA for 693907a

• Update JSON_INFO.md

  Jerimee

  authored
  b0886a9

  Copy full SHA for b0886a9

Commits on Feb 1, 2020

• Update misc.json

  Show description for 1d2abac
  Jerimee

  authored
  1d2abac

  Copy full SHA for 1d2abac

Commits on Feb 2, 2020

• Update misc.json

  Jerimee

  committed
  5a34757

  Copy full SHA for 5a34757

• Update misc.json

  Jerimee

  committed
  056975a

  Copy full SHA for 056975a

• Update misc.json

  Jerimee

  committed
  f6b0de9

  Copy full SHA for f6b0de9

Commits on Feb 10, 2020

• Update misc.json

  Jerimee

  committed
  cb1a158

  Copy full SHA for cb1a158

Commits on Feb 15, 2020

• Update misc.json

  Jerimee

  committed
  2210e82

  Copy full SHA for 2210e82

Commits on Feb 16, 2020

• westerns

  Jerimee

  committed
  d0d6af3

  Copy full SHA for d0d6af3

• Update misc.json

  Jerimee

  committed
  5dc23d4

  Copy full SHA for 5dc23d4

• spiritual.json

  Jerimee

  committed
  00a6f1e

  Copy full SHA for 00a6f1e

• u

  Jerimee

  committed
  5991612

  Copy full SHA for 5991612

• arghhh

  Jerimee

  committed
  6fd425a

  Copy full SHA for 6fd425a

• wip

  Jerimee

  committed
  b3dad7d

  Copy full SHA for b3dad7d

Commits on Feb 17, 2020

• wip - dodge and ya

  Jerimee

  committed
  07c541e

  Copy full SHA for 07c541e

• ya

  Jerimee

  committed
  252c59a

  Copy full SHA for 252c59a

Commits on Feb 18, 2020

• satire

  Jerimee

  committed
  43fa8b9

  Copy full SHA for 43fa8b9

• oops

  Jerimee

  committed
  0e748ab

  Copy full SHA for 0e748ab

• spy

  Jerimee

  committed
  b0bf926

  Copy full SHA for b0bf926

• m

  Jerimee

  committed
  ee6bf13

  Copy full SHA for ee6bf13

• magazines

  Jerimee

  committed
  d00af1e

  Copy full SHA for d00af1e

• sports magazines

  Jerimee

  committed
  4a446e8

  Copy full SHA for 4a446e8

Commits on Feb 23, 2020

• m

  Jerimee

  committed
  191035d

  Copy full SHA for 191035d

• archery

  Jerimee

  committed
  ce54c67

  Copy full SHA for ce54c67

• hard_arch

  Jerimee

  committed
  8e2e2be

  Copy full SHA for 8e2e2be

Commits on Feb 25, 2020

• change paperback_novel to book_fict_soft_tpl

  Jerimee

  committed
  56e6d5b

  Copy full SHA for 56e6d5b

Commits on Feb 26, 2020

• add homemaking nonfict

  Jerimee

  committed
  1d312e5

  Copy full SHA for 1d312e5

• m

  Jerimee

  committed
  dd88822

  Copy full SHA for dd88822

Commits on Mar 17, 2020

• Update misc.json

  Jerimee

  committed
  fa7f0d2

  Copy full SHA for fa7f0d2

Commits on Mar 28, 2020

• Update library.json

  Jerimee

  committed
  5f29272

  Copy full SHA for 5f29272

• Update misc.json

  Jerimee

  committed
  0d1cd49

  Copy full SHA for 0d1cd49

• Update misc.json

  Jerimee

  committed
  afcbef6

  Copy full SHA for afcbef6

• Merge branch 'master' into more-paperbacks

  Jerimee

  authored
  0e0bd6e

  Copy full SHA for 0e0bd6e

• Update library.json

  Jerimee

  committed
  73e44ee

  Copy full SHA for 73e44ee

• Merge branch 'more-paperbacks' of https://github.com/Jerimee/Cataclysm-DDA into more-paperbacks

  Jerimee

  committed
  eaa4d08

  Copy full SHA for eaa4d08

• Update nonfiction.json

  Jerimee

  committed
  f14cb43

  Copy full SHA for f14cb43

• Update nonfiction.json

  Jerimee

  committed
  c9ab69b

  Copy full SHA for c9ab69b

• Update nonfiction.json

  Jerimee

  committed
  3b22ef8

  Copy full SHA for 3b22ef8

• Update dodge.json

  Jerimee

  committed
  6d4f9d4

  Copy full SHA for 6d4f9d4

Commits on Mar 29, 2020

• add books to book loot tables

  Jerimee

  committed
  e782f69

  Copy full SHA for e782f69

• more nonfiction paperbacks

  Jerimee

  committed
  b64e010

  Copy full SHA for b64e010

Commits on Apr 3, 2020

• Merge branch 'master' into more-paperbacks

  Jerimee

  authored
  df39c5b

  Copy full SHA for df39c5b

Commits on Apr 7, 2020

• add a law book

  Show description for 4cd0c09
  Jerimee

  committed
  4cd0c09

  Copy full SHA for 4cd0c09

• new mechanics book

  Jerimee

  committed
  5ab2981

  Copy full SHA for 5ab2981

• Merge branch 'more-paperbacks' of https://github.com/Jerimee/Cataclysm-DDA into more-paperbacks

  Jerimee

  committed
  e31e481

  Copy full SHA for e31e481

• Apply suggestions from code review

  ZhilkinSerg

  authored
  45a4f4f

  Copy full SHA for 45a4f4f

• Apply suggestions from code review

  ZhilkinSerg

  authored
  7581a20

  Copy full SHA for 7581a20

Commits on Apr 9, 2020

• fix a number of glaring errors

  Jerimee

  committed
  efdcc12

  Copy full SHA for efdcc12

• no newline at end of file

  Show description for 9451172
  Jerimee

  committed
  9451172

  Copy full SHA for 9451172

• add three pulps

  Jerimee

  committed
  fddba8a

  Copy full SHA for fddba8a

Commits on Apr 10, 2020

• Update data/json/items/book/nonfiction.json

  Show description for f75f316
  

  Jerimee

  and

  ZhilkinSerg

  authored
  f75f316

  Copy full SHA for f75f316

• Update data/json/items/book/misc.json

  Show description for cb6290f
  

  Jerimee

  and

  ZhilkinSerg

  authored
  cb6290f

  Copy full SHA for cb6290f

• Update data/json/items/book/nonfiction.json

  Show description for d0c572e
  

  Jerimee

  and

  ZhilkinSerg

  authored
  d0c572e

  Copy full SHA for d0c572e

• Update data/json/items/book/misc.json

  Show description for 7f3fa68
  

  Jerimee

  and

  ZhilkinSerg

  authored
  7f3fa68

  Copy full SHA for 7f3fa68

• Update data/json/items/book/nonfiction.json

  Show description for 8911c61
  

  Jerimee

  and

  ZhilkinSerg

  authored
  8911c61

  Copy full SHA for 8911c61

• Update data/json/items/book/nonfiction.json

  Show description for e3061cc
  

  Jerimee

  and

  ZhilkinSerg

  authored
  e3061cc

  Copy full SHA for e3061cc

• Update data/json/items/book/nonfiction.json

  Show description for 4d76b20
  

  Jerimee

  and

  ZhilkinSerg

  authored
  4d76b20

  Copy full SHA for 4d76b20

Commits on Apr 14, 2020

• Create abstract.json

  Jerimee

  committed
  a5fb55e

  Copy full SHA for a5fb55e

• restore bashing.json

  Show description for c4b57d8
  Jerimee

  committed
  c4b57d8

  Copy full SHA for c4b57d8

• move abstracts to abstract.json

  Show description for 80a4759
  Jerimee

  committed
  80a4759

  Copy full SHA for 80a4759

• qa misc.json

  Show description for adc676f
  Jerimee

  committed
  adc676f

  Copy full SHA for adc676f

• Merge branch 'master' into more-paperbacks

  Jerimee

  authored
  5aea4ed

  Copy full SHA for 5aea4ed

Commits on Apr 15, 2020

• Update abstract.json

  Show description for 549d7fe
  Jerimee

  committed
  549d7fe

  Copy full SHA for 549d7fe

• Merge branch 'more-paperbacks' of https://github.com/Jerimee/Cataclysm-DDA into more-paperbacks

  Jerimee

  committed
  9b075ae

  Copy full SHA for 9b075ae

• Update nonfiction.json

  Show description for e9d9c3e
  Jerimee

  committed
  e9d9c3e

  Copy full SHA for e9d9c3e

• Update bashing.json

  Show description for a837f06
  Jerimee

  committed
  a837f06

  Copy full SHA for a837f06

Commits on Apr 17, 2020

• add abstracts to cooking

  Show description for 6783986
  Jerimee

  committed
  6783986

  Copy full SHA for 6783986

Commits on Apr 21, 2020

• Merge branch 'master' into more-paperbacks

  Jerimee

  authored
  c72e659

  Copy full SHA for c72e659

• Update spiritual.json

  Show description for c52443a
  Jerimee

  committed
  c52443a

  Copy full SHA for c52443a

Commits on May 6, 2020

• Update spiritual.json

  Show description for 3cac9be
  Jerimee

  committed
  3cac9be

  Copy full SHA for 3cac9be

Commits on May 7, 2020

• Apply suggestions from code review

  ZhilkinSerg

  authored
  aa6c8eb

  Copy full SHA for aa6c8eb

• Apply suggestions from code review

  ZhilkinSerg

  authored
  dc83f04

  Copy full SHA for dc83f04

• Apply suggestions from code review

  ZhilkinSerg

  authored
  a222b44

  Copy full SHA for a222b44