Modified Notes tab to have an automatic scrollbar and removed the expand widget since it did nothing.
Added matrix_overclock attribute which can be put in the Modifications box for a program which will cause the Matrix Rolls on the Rolls tab automatically add 2 dice, one of which is the wild die to rolls. If added via the Matrix->Programs->Modifications when the Program is toggled off/on it will turn the effect off/on. Valid values 1|0. This will also indicate in the header of the rolls-computed roll template the +2 dicepool bonus.
Removed Firing Modes from Arms->Ranged because it did nothing in that section.
Moved "Primary" selector outside the settings area so it's easier to select a primary weapon.
Added Ranged and Melee weapons (PC->Arms and Grunt) to pastable raw data
Added Matrix Action buttons to the bottom of Grunt sheets IF "Has Matrix Device" is checked.
Grunt Group checkbox and count are no longer hidden when settings mode is not active.
Found some Soak rollbuttons were including wound modifiers, that was incorrect, fixed now.
Grunt/Spirit sheet Added Magic AR beside Drain roll button
Grunt sheet added Direct Magic and Indirect Magic defense roll buttons and rearranged things a little.
Added mouseovers for Composure, Judge Intentions, Memory and Lift & Carry buttons detailing where the values come from for those of us that forget.
Added the ability to add Spells, NPC Spells, Qualities and Augmentations by pasting raw data into the Notes textarea for a new repeating row.
Changed Rolls->Jack Out from text to a roll button so unfortunate deckers can escape link-lock.
Added Core->Direct Magic Defense button and Core->Indirect Magic Defense buttons
Added Birth Name to Social Tab
Bugfix - NPC->Vehicle sheet was resetting Body to 1 when the sheet was closed
Added New Roll Template {template:multirow} with available fields header, base, desc, desc2,...desc6, bigdesc, bigdesc2...bigdesc6 for your macro display joy
Added chat bubble button to share contact information in chat and provide a Connections roll button for the GM (works for player and GM but whispers to GM)
Added "Summon Spirit" button to Magic->Conjuring. Using this button prompts for Type and Force of the spirit, does the roll then offers a "Spirit Resist" button in the output that the player or GM can click to roll the spirit's restist roll (Force x 2) which then outputs the hits from that so the player can roll drain.
Magic->Conjuring tab is now a bit out of sorts but I feel this Summon Spirit button functionality is worth pushing out regardless of whether I get the rest of the tab sorted before the merge.