Not books, but two notes for snippets.json!
Merge reinforced solar panels, chocolate covered coffee beans, hip flask, and typo fixes.
Merge remote branch 'origin/master' into ter-furn_enum_independence
Initial move of item jsons from raw/items to json/items
Addition of "GENERIC" and "INSTRUMENT" tags, instrument is unused other than to make sure it doesn't freak out when trying to load.
Added "colordef" as an ignored tag, and set up init to use file_finder to get json paths.
Added load_X(JsonObject &jo) functions to item_factory and alternative functions to those that would otherwise use catajson objects.
Removed section where Item factory tries to load stuff
Reverted addition of file_finder call and manually added the additional filepaths that are needed to be loaded. Using file_finder messes with recipes a bit by making them load before skills that they need.
Cleaned up Item_factory, removing unused functions:
fixed missing type tag
Merge json type checking
fix build warning
Moved names.json from data/raw to data/json. Moved and renamed parrot.json from data/raw/parrot.json to data/json/migo_speech.json
Added "type" members
Added JsonObject loading functions for migo_speech and names to the appropriate locations. Removed now unused functions and references to those functions. Added files and function calls to init.cpp
recipe load: Add debugmsg whining for missing books
Merge remote branch 'origin/pr/3460' into frackingjsonbooks
move name "type" member to end of definition to see if that makes the diff not freak out as much...
Load recipes -after- items
Cleanup style of nosuchbook carping
Merge 'we'll take items.json from here and put it into there'