cb_types, defines, event_modifiers
Merge branch 'dbz-1.7' of https://github.com/ShinWalks/concert-of-europe into dbz-1.7
Catching up with remote version