first three

I'm using the same ratio of non-diamond<>diamond as the katana.
last two

I also fixed the colors on some of them.
Boosts fire trail effect of napalm ammunition.

Compared to normal gasoline, the !one_in(3) has been replaced by a
!one_in(4) and the field strength is 2-3 instead of 1-2.
Documenting new flag.
recipes

Added recipes, plus fixed some stuff.
balanced recipes

The times are based on [(volume)*20000]+200000 which seemed to be what
the other three recipes followed.
fixed comma

Thanks Mr. Bot, I found it.
knocked down difficulty
Small mapgen fix
Field limiting.

Guarantees level two fire field.
Web-sleeping, thanks to Zireael on the forums for the reminder.
MShock's  v0.35

egomassive (
knitting_needles
long_knit_scarf
fire_ax
boots_bunker
roller_blades
rollerskates
new t_recycler
new f_dumpster
new f_bed
new f_sofa
new f_bathtub
)

t_dock by Arex

t_tree_blackjack
new fat

bullet_crossbow
h&k416a5
m1014
m14ebr
m2010
new ar15
new arx160
new ashot
new bbgun
new browning_blr
new colt_army
new colt_navy
new cx4
new fn_fal
new fn_p90
new hk_g3
new hk_g36
new hk_mp5
new hk_mp7
new hk_ucp
new hk_ump45
new m107a1
new m14a
Merge branch 'napalm-boost' of https://github.com/Rivet-the-Zombie/Cataclysm-DDA into merge2
Merge branch 'more-diamond-blades' of https://github.com/TheFlame52/Cataclysm-DDA into merge2
Merge branch 'mapgen' of https://github.com/Mshock777/Cataclysm-DDA into merge2
Fix pricing, proofread.
Merge pull request #10282 from KA101/websleep

Web-sleeping
Emends erroneous apostrophe.

They can run, they can hide, but in the end I will locate all incorrect
apostrophes and **slay them**!
Merge pull request #10286 from Rivet-the-Zombie/law-fix

Emends erroneous apostrophe.
Merge branch 'tiles' of https://github.com/Mshock777/Cataclysm-DDA into tiles