Add CBM: Uncanny Dodge
fix logic error
Fix uncanny_dodge() comment in player.h
Lowered maximum weight carried

100lbs for an avg person (8 STR). Based on military rucksack run data.
Replace duplicate code
Update overburdened function

Also removed unneeded int->int->double->int conversion
Add strain harm
Change player weight limits

Also adds a new option "Dangerous pickups", which when enabled will
cause players to automatically retain items (unloaded, casings, etc.)
that would cause them to go over the strain weight limit.
Fix merge conflicts

Conflicts:
	options.cpp
	options.h
Create Metric Speeds option

Also enabled the mouse cursor option which had been broken at some
point.
Conversion part 1

Converted artifacts, bionic code, FAQ, and some of Player + game code.
Added conversion function to convert for display.
ignore benign traps when dodging
Skill book focus drain rebalance

Reduce focus loss from skill books from -100 to -50.  Had this fix as
part of my studious nature perk but my total inability to get gettext to
work has essentially cut me out of development :(   I'm not going to be
able to finish studious nature, so I thought I'd just submit this by
itself.  Talked with Funnyman about this when I was still able to work
on my perk mod, and we seemed to think this value was pretty balanced
(Even Funnyman agreed the original value was WAY to high).  It worked
fine before with all my other changes, so I don't see any reason it
shouldn't work on its own.  Although for obvious reasons I can't test
it.  Well this'll probably be my last pull request so I wish you all the
best with working on this awesome game.  I'll probably still play the
experimental builds occasionally but I can't see myself trying to code
anything new since I can't test it.  So see ya chummers, G'luck in your
struggles!  (Hope someone gets this reference)
Revert "Skill book focus drain rebalance"

This reverts commit 8656f8f76dc42bc7b2640ac816dacfe3f14e67c9.
Skill Book Focus Drain Rebalance

Reduce focus loss from skill books from -100 to -50.  Had this fix as
part of my studious nature perk but my total inability to get gettext to
work has essentially cut me out of development :(   I'm not going to be
able to finish studious nature, so I thought I'd just submit this by
itself.  Talked with Funnyman about this when I was still able to work
on my perk mod, and we seemed to think this value was pretty balanced
(Even Funnyman agreed the original value was WAY to high).  It worked
fine before with all my other changes, so I don't see any reason it
shouldn't work on its own.  Although for obvious reasons I can't test
it.  Well this'll probably be my last pull request so I wish you all the
best with working on this awesome game.  I'll probably still play the
experimental builds occasionally but I can't see myself trying to code
anything new since I can't test it.  So see ya chummers, G'luck in your
struggles!  (Hope someone gets this reference)
Merge remote-tracking branch 'upstream/master'
Rework the inventory letter(invlet) assignment system.

Instead of relying on item.invlet to store the preferred letter for an item, we now cache the preferred letter in the inventory.

This commit also fixes several locations in the code where inventory:additem should have been called with keep_invlet = true. This caused a bug where items would appear to have a different letter than they actually had, which only didn't happen often because items tended to keep their assigned invlet.
Convert instruments.json to new weight system
Convert ranged.json to new weight system
Merge remote-tracking branch 'upstream/master'