Fixed knockback machine gun
Added weapon generation
Fixed merge issues