Altered difficulty

Changed shallow pontoon bridge to 5
Update construction.json
Update construction.json
Update terrain.json
Merge branch 'bridge' of https://github.com/jokermatt999/Cataclysm-DDA into merge2
Merge branch 'fix-tent-placement' of https://github.com/BevapDin/Cataclysm-DDA into merge2
Merge branch 'fix-crafting-requirements' of https://github.com/BevapDin/Cataclysm-DDA into merge2
Merge branch 'fix-soap' of https://github.com/BevapDin/Cataclysm-DDA into merge2
JSON and other tweaks

Nothing special here.
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA
Merge remote-tracking branch 'dda/pr/9636' into dda-master

* dda/pr/9636:
  Tweaked gas spread some more
  Gas tweak fixes
  Allow gasses to travel through fences, wire gates, bars
Disable autolearn.
Adds flintlock carbine.

This thing exists stats-wise somewhere between the flintlock pistol and
the flintlock rifle.
Spawns in museums, mansions, and rarely in pawnshops, the same places as
the current flintlocks. Includes recipe and 'no old guns' mod support.
Merge remote-tracking branch 'upstream/master'
Merge pull request #9702 from Rivet-the-Zombie/flintlock-carbine

Adds flintlock carbine.
template update
Merge pull request #9703 from VlasovVitaly/pot-update

Translations template update
Keep PLTYPE_MAX at end of character_type enum
Merge branch 'explosive' of https://github.com/Darkyhard/Cataclysm-DDA into kaboom
Nerf pipe bomb crafting time

42 seconds seemed WAY quick given the typical crafting times.  This
should be 5 minutes.