more work on 1.6 + texture pack support