Merge branch 'UPS_Mod_Description' of https://github.com/malhawee/Cataclysm-DDA into merge3
Merge branch 'fix-i_stacked' of https://github.com/BevapDin/Cataclysm-DDA into merge3
Merge pull request #9719 from KA101/tanknerf

Nerf tank drones
Makes artifacts visible again
Weaken glass walls
Horizontal vehicle menu set to list greater number of resources than
vertical menu.
In vertical mode, if too many resources, last shown is appended with ...
ie E / F 25% gasoline...
Radiogenic smaller increment change
Fix clothing crash
Merge branch 'car-noise-z' of https://github.com/Coolthulhu/Cataclysm-DDA into merge
Merge branch 'fixVehicleWater' of https://github.com/malhawee/Cataclysm-DDA into merge
Merge branch 'Artifact-appearance' of https://github.com/i2amroy/Cataclysm-DDA into merge
Merge branch 'Glass-walls' of https://github.com/i2amroy/Cataclysm-DDA into merge
Merge branch 'Clothing' of https://github.com/i2amroy/Cataclysm-DDA into merge
Merge branch 'radiation' of https://github.com/i2amroy/Cataclysm-DDA into merge
Gives circsaw_on SAW 2
Merge pull request #9745:

- Gives circsaw_on the quality SAW 2
more recipes

I put the formatting back into the funnel recipe, added a way to make an
antenna out of scrap, and added a recipe for a gallon jug.
leather funnel

Added a leather funnel, with the same stats as a makeshift funnel. It
can be crafted at survival 1.
Hide the live-window without the force parameter.

This prevents the already hidden window from being erased and refreshed, which overlays with the display of the messages.
Fix utf8_wrapper::shorten so it does what it says in the documentation.

Previously it did *not* operate on the display width at all.