Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Fabrication Skill Recipe adjustments
Broke skill system into trained skills and required skills. Fabrication introduced as test case.
Merge remote-tracking branch 'origin/pr/1' into fabrication_skill

Conflicts:
	data/raw/recipes.json
Fixed indentation and missing braces.
Changed the name from trains_skill to skill_used
Merge remote-tracking branch 'upstream/master'
Simple Scrolling Combat Text animation
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA
Change 'increase all skills' to something more selective
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Shishkebab (New Melee Weapon)

With all the fancy new bows and exotic firearms being added lately, I
thought we needed something new and exciting in the way of melee
weapons.  So we give you the "Shishkebab"!  Essentially the same as the
weapon of the same name in Fallout 3, this is a makeshift machete that
has been combined with a crude flamethrower to make a primitive flaming
sword.  It's not incredibly powerful, but it's fairly simple to make.
It also functions as a torch and a lighter when it's turned on, and can
be used as a knife like any other edged weapon when off.  I'm thinking
of making some more powerful and difficult to build versions based on
the stronger melee weapons (machete, broadsword, and katana), but first
I'd like to see if there would be any interest in adding this to the
game.

Tested and works

Note: This isn't my idea; I saw it in a post on the forums by Inquisitor
Dust and thought I'd see how hard it would be to do the hard-coded
actions for it.  It came out so well I thought I'd post it and see what
other people thought of it, and it includes too many files to easily
post on the forums.
plastic bowl, plastic mold + crafting
Revert "plastic bowl, plastic mold + crafting"

This reverts commit ebdf07d684bd9c46c414a5513e3a1b295b1bd0f9.
plastic bowl and mold + crafting