Merge pull request #684 from TarzanBuzzyMan/patch-3

Update oil to use 1.5 texturing
Merge remote-tracking branch 'remotes/upstream/mc1.5' into patch-renderTank