Update forge, fix item overriding

Been waiting a month on forge to merge FML to do this