fix various merge issues

- fix material and material name decode changes from faf103f
- fix squad uniform changes from 40c44fa
- check material in items now that a default material is no longer
returned