Fixed conflicts with Tinkers Construct