Finally fixed: Added craftable bolas
Merge pull request #1234 from ComicIronic/Tribe-Bolas

Finally fixed: Added craftable bolas
Merge pull request #1233 from ESwordTheCat/riW3nfAj

electrocute_act
Merge remote-tracking branch 'upstream/Bleeding-Edge' into riW3nfAj