Add new translations.h header to windows project files.
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA
Move final few ammo definitions to JSON.
Add tags_from_json() method to load a list of strings into a set.
Convert ammo_effects field to a tags set instead of a binary flag field.
Remove game *g parameter from palyer::i_rem().
Cleanup veh_interact::cant_do() and fix tire change requirement checking.
Add vehicle tags field to hold vehicle metadata.
Add folding bicycle and associated logic.
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into autopickup
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA
floor divergence contributed from skills and stats at 0, no negative divergence.
Changed iuse and iexamine to use choose_adjacent
debugging direction changes
finished changing over getting direction inputs to choose_adjacent
Merge remote-tracking branch 'myfork/master' into choose_adjacent
Removed game argument from player::add_disease
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA
Pickles
Try to reduce cursorx_to_position call for map window. Move cursor options after sdl window is created to prevent random segfaults.