Minor changes to imports
Updated to latest forge in attempt to fix material obfuscation