6 and two 3s. Some stuff was pre-announced that I am tres excited about: 6 string Combustions from Dingwall. Am liking the Source Audio pedal stuff, but yeah a lot of other things that were just different colour/hardware combos (Fender), some meh stuff (Gibson), and some 'how much?!' from EBMM.
On the amp side though: the Bergantino Forte HP and the Darkglass new amps look very nice (obvs prohibitively pricey.)