Refractor of Materials

Signed-off-by: Waterpicker <Waterpicker@rocketmail.com>
Rafractor of Materials

Signed-off-by: Waterpicker <Waterpicker@rocketmail.com>
Merge branch 'master' of https://github.com/Waterpicker/Vanilla