Merge branch 'glyphs' of git://github.com/tasetase/DDAtase
Merge branch 'master' of git://github.com/TheDarklingWolf/Cataclysm-DDA
Merge github.com:TheDarklingWolf/Cataclysm-DDA
Merge github.com:TheDarklingWolf/Cataclysm-DDA
Merge branch 'hotfix/highway_spawn' of github.com:benjamg/Cataclysm-DDA
Merge github.com:TheDarklingWolf/Cataclysm-DDA
indentation without changes
added a search function to crafting
fix a bug that was accidentally introduced
Merge github.com:TheDarklingWolf/Cataclysm-DDA
Pull more static data out of inner loop and const more things in map::draw().
Move outside cache data and construction to map class.
Remove lightmap-specific caching of vehicle data and access vehicles directly for transparency and lighting info.
Remove monster caching in lightmap and just retrieve light data from monsters directly.
Pull transparency cache into map class.
Remove cache built flag.
Expand lightmap to cover entire map and make it's coodrinates match the map.
Const some calendar accessors.
Pull last of lightmap class into map class.
Fix dumb merge error that breaks the build.