just need to add specifics
adds vulnerabilities and damage types
removes blade type adds slash/stab
removes blade from nodes
Merge remote-tracking branch 'origin' into specific-weapons

Conflicts:
	src/nodes/enemies/guitarist.lua
	src/nodes/enemies/spider.lua
	src/nodes/enemies/trombonist.lua
	src/nodes/enemies/violinist.lua

merge master
Merge remote-tracking branch 'upstream/master' into specific-weapons

Conflicts:
	src/nodes/projectiles/basketball.lua
	src/nodes/projectiles/computer.lua

projectile merge master
include crimson sword
random duck jump
Platform properly ignores top_bb
crawl stand up after blocked
halfed check frequency
Revert "Add in hacks for CommuniCon"

This reverts commit 071a5a8fb1a877e751db484ce869ea177b514948.
Merge pull request #1799 from DaNiwa/prep_release

Revert "Add in hacks for CommuniCon"
Remove CommuniCon hacks
Move save point away from two enemies
changes juan's options to lowercase
Merge pull request #1803 from CalebJohn/juan-caps

Blacksmith Juan Caps lock
Fix Crimson sword
Add the crimson sword to the cheats
Merge pull request #1795 from CalebJohn/crawl-stuck

Stand up after crawl collision