Added handling for LiquidStacks which do not have an icon set. Closes #739
Fixed liquid icon check to actually catch that edge case. (h/t Player)
Merge remote-tracking branch 'remotes/upstream/master' into 1.5