Reset the filter with 'r' in the advanced inventory.
-make wandering hordes visible on overmap. (Code pulled from Reaper42's abandoned PR #6827)
Update CMakeLists.txt

This probably will still fail on a lot of systems, but it works locally, so hey. I use this to make cataclysm work with qt creator, in the hope that this'll improve my efficiency a little.
Fix mapgen error message
Merge pull request #7086 from belenos-/visible_hordes

Visible wandering hordes
Merge pull request #7118 from ianestrachan/break-torn-off-broken-parts

When tearing off 0 HP parts, break them into pieces.
Removed bar from source and added it to data as fast food restaurant
Merge pull request #6877 from kevingranade/cap-firing-skill-gain

[READY] Cap firing skill gain
Merge bugfixes.
Merge iuse generification.
Update bar to have more detail
Pizza parlor and bar back as overmap terrain instead of fast-food
restaurants
Pizza parlor revealed by restaurant map
Remove bar from overmap_terrain
Fixes prices on some containers.
Merge branch 'reset-adv-inventory' of https://github.com/abstrakct/Cataclysm-DDA into DoubleMerge
Merge branch 'corpse_rot' of https://github.com/MattAmmann/Cataclysm-DDA into DoubleMerge

Conflicts:
	src/item.h

Should work.
More specific bar item spawns
Changed pizza items a bit
Some balancing in regional_map_settings
Merge pull request #7124 from Rivet-the-Zombie/price-fixes

Fixes prices on some containers.
Removed fast food restaurant from source and added it as json
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA
remove map::traps vector and use g->traps instead
remove is_tiny, make mapsize a constructor paramter instead