Merge branch 'next' into 'next'

32x textures removal of redundant textures, the start of 32x textures, closer together control scheme with no combinations See merge request !41
2016-02-14 12:43:31 +00:00 · 2016-02-14 12:43:31 +00:00 · 2cde6c6077
parent a419661cdf 7b2df4578f
commit 2cde6c6077
112 changed files with 124 additions and 100 deletions
--- a/README.txt
+++ b/README.txt
@ -60,6 +60,7 @@ Action controls:
    I - Enter inventory.
    Q - Examine pointed block.
    H - Use item in hand.
+=======
    T - Talk / commands.
    K - Toggle fly mode.
    F1 - Hide / show hud.
--- a/data/textures/apple_blossom.png
+++ b/data/textures/apple_blossom.png
--- a/data/textures/apple_leaves.png
+++ b/data/textures/apple_leaves.png
--- a/data/textures/bed_bottom.png
+++ b/data/textures/bed_bottom.png
--- a/data/textures/bucket_lava.png
+++ b/data/textures/bucket_lava.png
--- a/data/textures/bucket_water.png
+++ b/data/textures/bucket_water.png
--- a/data/textures/clay_black.png
+++ b/data/textures/clay_black.png
--- a/data/textures/clay_blue.png
+++ b/data/textures/clay_blue.png
--- a/data/textures/clay_green.png
+++ b/data/textures/clay_green.png
--- a/data/textures/clay_orange.png
+++ b/data/textures/clay_orange.png
--- a/data/textures/clay_purple.png
+++ b/data/textures/clay_purple.png
--- a/data/textures/clay_red.png
+++ b/data/textures/clay_red.png
--- a/data/textures/clay_yellow.png
+++ b/data/textures/clay_yellow.png
--- a/data/textures/clothes_player_boots_fur.png
+++ b/data/textures/clothes_player_boots_fur.png
--- a/data/textures/clothes_player_boots_fur_black.png
+++ b/data/textures/clothes_player_boots_fur_black.png
--- a/data/textures/clothes_player_boots_fur_blue.png
+++ b/data/textures/clothes_player_boots_fur_blue.png
--- a/data/textures/clothes_player_boots_fur_brown.png
+++ b/data/textures/clothes_player_boots_fur_brown.png
--- a/data/textures/clothes_player_boots_fur_green.png
+++ b/data/textures/clothes_player_boots_fur_green.png
--- a/data/textures/clothes_player_boots_fur_orange.png
+++ b/data/textures/clothes_player_boots_fur_orange.png
--- a/data/textures/clothes_player_boots_fur_purple.png
+++ b/data/textures/clothes_player_boots_fur_purple.png
--- a/data/textures/clothes_player_boots_fur_red.png
+++ b/data/textures/clothes_player_boots_fur_red.png
--- a/data/textures/clothes_player_boots_fur_white.png
+++ b/data/textures/clothes_player_boots_fur_white.png
--- a/data/textures/clothes_player_boots_fur_yellow.png
+++ b/data/textures/clothes_player_boots_fur_yellow.png
--- a/data/textures/clothes_player_boots_space.png
+++ b/data/textures/clothes_player_boots_space.png
--- a/data/textures/clothes_player_helmet_space.png
+++ b/data/textures/clothes_player_helmet_space.png
--- a/data/textures/clothes_player_pants_space.png
+++ b/data/textures/clothes_player_pants_space.png
--- a/data/textures/clothes_player_shirt_space.png
+++ b/data/textures/clothes_player_shirt_space.png
--- a/data/textures/clothes_player_spaceshirt.png
+++ b/data/textures/clothes_player_spaceshirt.png
--- a/data/textures/cobble.png
+++ b/data/textures/cobble.png
--- a/data/textures/cotton.png
+++ b/data/textures/cotton.png
--- a/data/textures/cotton_black.png
+++ b/data/textures/cotton_black.png
--- a/data/textures/cotton_blue.png
+++ b/data/textures/cotton_blue.png
--- a/data/textures/cotton_green.png
+++ b/data/textures/cotton_green.png
--- a/data/textures/cotton_orange.png
+++ b/data/textures/cotton_orange.png
--- a/data/textures/cotton_purple.png
+++ b/data/textures/cotton_purple.png
--- a/data/textures/cotton_red.png
+++ b/data/textures/cotton_red.png
--- a/data/textures/cotton_yellow.png
+++ b/data/textures/cotton_yellow.png
--- a/data/textures/door_glass_b.png
+++ b/data/textures/door_glass_b.png
--- a/data/textures/door_glass_inv.png
+++ b/data/textures/door_glass_inv.png
--- a/data/textures/door_glass_t.png
+++ b/data/textures/door_glass_t.png
--- a/data/textures/flag.png
+++ b/data/textures/flag.png
--- a/data/textures/flag_black.png
+++ b/data/textures/flag_black.png
--- a/data/textures/flag_blue.png
+++ b/data/textures/flag_blue.png
--- a/data/textures/flag_green.png
+++ b/data/textures/flag_green.png
--- a/data/textures/flag_orange.png
+++ b/data/textures/flag_orange.png
--- a/data/textures/flag_purple.png
+++ b/data/textures/flag_purple.png
--- a/data/textures/flag_red.png
+++ b/data/textures/flag_red.png
--- a/data/textures/flag_yellow.png
+++ b/data/textures/flag_yellow.png
--- a/data/textures/footsteps.png
+++ b/data/textures/footsteps.png
--- a/data/textures/gate_steel.png
+++ b/data/textures/gate_steel.png
--- a/data/textures/gate_wood.png
+++ b/data/textures/gate_wood.png
--- a/data/textures/glass.png
+++ b/data/textures/glass.png
--- a/data/textures/glass_black.png
+++ b/data/textures/glass_black.png
--- a/data/textures/glass_blue.png
+++ b/data/textures/glass_blue.png
--- a/data/textures/glass_green.png
+++ b/data/textures/glass_green.png
--- a/data/textures/glass_orange.png
+++ b/data/textures/glass_orange.png
--- a/data/textures/glass_pane_black_side.png
+++ b/data/textures/glass_pane_black_side.png
--- a/data/textures/glass_pane_blue_side.png
+++ b/data/textures/glass_pane_blue_side.png
--- a/data/textures/glass_pane_green_side.png
+++ b/data/textures/glass_pane_green_side.png
--- a/data/textures/glass_pane_orange_side.png
+++ b/data/textures/glass_pane_orange_side.png
--- a/data/textures/glass_pane_purple_side.png
+++ b/data/textures/glass_pane_purple_side.png
--- a/data/textures/glass_pane_red_side.png
+++ b/data/textures/glass_pane_red_side.png
--- a/data/textures/glass_pane_side.png
+++ b/data/textures/glass_pane_side.png
--- a/data/textures/glass_pane_yellow_side.png
+++ b/data/textures/glass_pane_yellow_side.png
--- a/data/textures/glass_purple.png
+++ b/data/textures/glass_purple.png
--- a/data/textures/glass_red.png
+++ b/data/textures/glass_red.png
--- a/data/textures/glass_slab.png
+++ b/data/textures/glass_slab.png
--- a/data/textures/glass_slab_black.png
+++ b/data/textures/glass_slab_black.png
--- a/data/textures/glass_slab_blue.png
+++ b/data/textures/glass_slab_blue.png
--- a/data/textures/glass_slab_green.png
+++ b/data/textures/glass_slab_green.png
--- a/data/textures/glass_slab_orange.png
+++ b/data/textures/glass_slab_orange.png
--- a/data/textures/glass_slab_purple.png
+++ b/data/textures/glass_slab_purple.png
--- a/data/textures/glass_slab_red.png
+++ b/data/textures/glass_slab_red.png
--- a/data/textures/glass_slab_yellow.png
+++ b/data/textures/glass_slab_yellow.png
--- a/data/textures/glass_yellow.png
+++ b/data/textures/glass_yellow.png
--- a/data/textures/grass.png
+++ b/data/textures/grass.png
--- a/data/textures/grass_autumn.png
+++ b/data/textures/grass_autumn.png
--- a/data/textures/grass_corner.png
+++ b/data/textures/grass_corner.png
--- a/data/textures/grass_corner_autumn.png
+++ b/data/textures/grass_corner_autumn.png
--- a/data/textures/grass_corner_jungle.png
+++ b/data/textures/grass_corner_jungle.png
--- a/data/textures/grass_corner_spring.png
+++ b/data/textures/grass_corner_spring.png
--- a/data/textures/grass_growing.png
+++ b/data/textures/grass_growing.png
--- a/data/textures/grass_growing_autumn.png
+++ b/data/textures/grass_growing_autumn.png
--- a/data/textures/grass_growing_jungle.png
+++ b/data/textures/grass_growing_jungle.png
--- a/data/textures/grass_jungle.png
+++ b/data/textures/grass_jungle.png
--- a/data/textures/grass_side.png
+++ b/data/textures/grass_side.png
--- a/data/textures/grass_side_autumn.png
+++ b/data/textures/grass_side_autumn.png
--- a/data/textures/grass_side_jungle.png
+++ b/data/textures/grass_side_jungle.png
--- a/data/textures/jungleleaves.png
+++ b/data/textures/jungleleaves.png
--- a/data/textures/jungletree.png
+++ b/data/textures/jungletree.png
--- a/data/textures/jungletree_top.png
+++ b/data/textures/jungletree_top.png
--- a/data/textures/lava.png
+++ b/data/textures/lava.png
--- a/data/textures/leaves.png
+++ b/data/textures/leaves.png
--- a/data/textures/limestone.png
+++ b/data/textures/limestone.png
--- a/data/textures/mob_fish.png
+++ b/data/textures/mob_fish.png
--- a/data/textures/mossycobble.png
+++ b/data/textures/mossycobble.png
--- a/data/textures/mud.png
+++ b/data/textures/mud.png
--- a/data/textures/snow.png
+++ b/data/textures/snow.png
--- a/data/textures/snow_side.png
+++ b/data/textures/snow_side.png
--- a/data/textures/stone.png
+++ b/data/textures/stone.png
--- a/Show More
+++ b/Show More