Reworked materials; Readded gold, diamond and bronze; added tin