Experimental merge of new weapons branch
Add the actual changes
Remove most monster config items (this branch now relies on a recent Git build)
Begin making it work outside the weapons branch
Merge branch 'master' into weapon_testing
Remove menu code accidentally pushed during merge
Merge branch 'master' into weapon_testing
Merge branch 'master' into weapon_testing
Use shotguncannon for shockwave
Merge branch 'master' into weapon_testing
Merge latest Xonotic Git from branch Mario/weapons
Add a config file to handle balance changes
Merge branch 'master' into weapon_testing
Allow slapping yourself through warpzones
Auto set plasma cvar so clients aren't missing ammo bar in HUD
Merge branch 'master' into weapon_testing
Fix nex beam on arc
Remove some old models
Merge branch 'master' into weapon_testing
Some new stuff from git