Updated to 1.6.1, still requires a few tweaks here and there to be fully compatible with the new resource packs.