Fixed Combiner NEI texture, fixed Cardboard Box not working
Merge branch 'master' into 1.8