Merge 6776348a68 into 0cf4fd4c18

Browse source

...

This commit is contained in:

Rui 2015-07-17 10:50:52 +00:00

parent 0cf4fd4c18 6776348a68

commit 57e3ae391e

174 changed files with 0 additions and 0 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

BIN

menu/header.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 79 KiB After Width:  |  Height:  |  Size: 79 KiB

BIN

mods/beds/textures/beds_bed.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 540 B After Width:  |  Height:  |  Size: 404 B

BIN

mods/beds/textures/beds_bed_fancy.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 537 B After Width:  |  Height:  |  Size: 398 B

BIN

mods/beds/textures/beds_bed_foot.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 390 B After Width:  |  Height:  |  Size: 249 B

BIN

mods/beds/textures/beds_bed_head.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 387 B After Width:  |  Height:  |  Size: 265 B

BIN

mods/beds/textures/beds_bed_side1.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 296 B After Width:  |  Height:  |  Size: 205 B

BIN

mods/beds/textures/beds_bed_side2.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 316 B After Width:  |  Height:  |  Size: 235 B

BIN

mods/beds/textures/beds_bed_side_bottom.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 561 B After Width:  |  Height:  |  Size: 379 B

BIN

mods/beds/textures/beds_bed_side_bottom_r.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 537 B After Width:  |  Height:  |  Size: 355 B

BIN

mods/beds/textures/beds_bed_side_top.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 611 B After Width:  |  Height:  |  Size: 412 B

BIN

mods/beds/textures/beds_bed_side_top_r.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 596 B After Width:  |  Height:  |  Size: 409 B

BIN

mods/beds/textures/beds_bed_top1.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 583 B After Width:  |  Height:  |  Size: 306 B

BIN

mods/beds/textures/beds_bed_top2.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 616 B After Width:  |  Height:  |  Size: 400 B

BIN

mods/beds/textures/beds_bed_top_bottom.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 495 B After Width:  |  Height:  |  Size: 279 B

BIN

mods/beds/textures/beds_bed_top_top.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 556 B After Width:  |  Height:  |  Size: 457 B

BIN

mods/beds/textures/beds_transparent.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 143 B After Width:  |  Height:  |  Size: 96 B

BIN

mods/boats/textures/boat_wield.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 546 B After Width:  |  Height:  |  Size: 538 B

BIN

mods/bones/textures/bones_rear.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 187 B After Width:  |  Height:  |  Size: 186 B

BIN

mods/bones/textures/bones_side.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 188 B After Width:  |  Height:  |  Size: 187 B

BIN

mods/bones/textures/bones_top.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 182 B After Width:  |  Height:  |  Size: 181 B

BIN

mods/bucket/textures/bucket_lava.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 167 B After Width:  |  Height:  |  Size: 166 B

BIN

mods/bucket/textures/bucket_river_water.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 316 B After Width:  |  Height:  |  Size: 188 B

BIN

mods/default/models/character.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 2.7 KiB After Width:  |  Height:  |  Size: 1.5 KiB

BIN

mods/default/textures/bubble.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 459 B After Width:  |  Height:  |  Size: 457 B

BIN

mods/default/textures/crack_anylength.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 348 B After Width:  |  Height:  |  Size: 345 B

BIN

mods/default/textures/default_acacia_leaves.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 444 B After Width:  |  Height:  |  Size: 211 B

BIN

mods/default/textures/default_acacia_sapling.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 359 B After Width:  |  Height:  |  Size: 181 B

BIN

mods/default/textures/default_acacia_tree.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 682 B After Width:  |  Height:  |  Size: 376 B

BIN

mods/default/textures/default_acacia_tree_top.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 731 B After Width:  |  Height:  |  Size: 544 B

BIN

mods/default/textures/default_acacia_wood.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 261 B After Width:  |  Height:  |  Size: 218 B

BIN

mods/default/textures/default_bookshelf.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 471 B After Width:  |  Height:  |  Size: 465 B

BIN

mods/default/textures/default_brick.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 351 B After Width:  |  Height:  |  Size: 346 B

BIN

mods/default/textures/default_bronze_block.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 356 B After Width:  |  Height:  |  Size: 353 B

BIN

mods/default/textures/default_bronze_ingot.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 224 B After Width:  |  Height:  |  Size: 223 B

BIN

mods/default/textures/default_cactus_side.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 314 B After Width:  |  Height:  |  Size: 307 B

BIN

mods/default/textures/default_chest_front.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 423 B After Width:  |  Height:  |  Size: 420 B

BIN

mods/default/textures/default_chest_lock.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 469 B After Width:  |  Height:  |  Size: 462 B

BIN

mods/default/textures/default_chest_side.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 375 B After Width:  |  Height:  |  Size: 371 B

BIN

mods/default/textures/default_chest_top.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 422 B After Width:  |  Height:  |  Size: 418 B

BIN

mods/default/textures/default_coal_block.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 240 B After Width:  |  Height:  |  Size: 190 B

BIN

mods/default/textures/default_copper_block.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 359 B After Width:  |  Height:  |  Size: 355 B

BIN

mods/default/textures/default_desert_cobble.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 235 B After Width:  |  Height:  |  Size: 232 B

BIN

mods/default/textures/default_desert_sand.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 350 B After Width:  |  Height:  |  Size: 349 B

BIN

mods/default/textures/default_desert_stone.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 280 B After Width:  |  Height:  |  Size: 279 B

BIN

mods/default/textures/default_desert_stone_brick.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 249 B After Width:  |  Height:  |  Size: 247 B

BIN

mods/default/textures/default_diamond_block.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 344 B After Width:  |  Height:  |  Size: 340 B

BIN

mods/default/textures/default_dirt.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 277 B After Width:  |  Height:  |  Size: 270 B

BIN

mods/default/textures/default_dry_grass.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 303 B After Width:  |  Height:  |  Size: 263 B

BIN

mods/default/textures/default_dry_grass_1.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 219 B After Width:  |  Height:  |  Size: 165 B

BIN

mods/default/textures/default_dry_grass_2.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 265 B After Width:  |  Height:  |  Size: 198 B

BIN

mods/default/textures/default_dry_grass_3.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 295 B After Width:  |  Height:  |  Size: 228 B

BIN

mods/default/textures/default_dry_grass_4.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 316 B After Width:  |  Height:  |  Size: 253 B

BIN

mods/default/textures/default_dry_grass_5.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 339 B After Width:  |  Height:  |  Size: 273 B

BIN

mods/default/textures/default_dry_grass_side.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 285 B After Width:  |  Height:  |  Size: 229 B

BIN

mods/default/textures/default_furnace_bottom.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 274 B After Width:  |  Height:  |  Size: 271 B

BIN

mods/default/textures/default_furnace_fire_fg.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 558 B After Width:  |  Height:  |  Size: 548 B

BIN

mods/default/textures/default_furnace_front.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 307 B After Width:  |  Height:  |  Size: 303 B

BIN

mods/default/textures/default_furnace_front_active.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 1 KiB After Width:  |  Height:  |  Size: 1,010 B

BIN

mods/default/textures/default_furnace_side.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 296 B After Width:  |  Height:  |  Size: 295 B

BIN

mods/default/textures/default_furnace_top.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 274 B After Width:  |  Height:  |  Size: 271 B

BIN

mods/default/textures/default_glass.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 158 B After Width:  |  Height:  |  Size: 155 B

BIN

mods/default/textures/default_gold_ingot.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 225 B After Width:  |  Height:  |  Size: 223 B

BIN

mods/default/textures/default_grass_5.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 260 B After Width:  |  Height:  |  Size: 251 B

BIN

mods/default/textures/default_grass_footsteps.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 722 B After Width:  |  Height:  |  Size: 708 B

BIN

mods/default/textures/default_grass_side.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 347 B After Width:  |  Height:  |  Size: 345 B

BIN

mods/default/textures/default_gravel.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 201 B After Width:  |  Height:  |  Size: 199 B

BIN

mods/default/textures/default_ice.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 3 KiB After Width:  |  Height:  |  Size: 212 B

BIN

mods/default/textures/default_junglegrass.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 197 B After Width:  |  Height:  |  Size: 195 B

BIN

mods/default/textures/default_jungleleaves_simple.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 430 B After Width:  |  Height:  |  Size: 185 B

BIN

mods/default/textures/default_jungletree.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 736 B After Width:  |  Height:  |  Size: 732 B

BIN

mods/default/textures/default_jungletree_top.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 811 B After Width:  |  Height:  |  Size: 806 B

BIN

mods/default/textures/default_ladder.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 467 B After Width:  |  Height:  |  Size: 457 B

BIN

mods/default/textures/default_lava.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 685 B After Width:  |  Height:  |  Size: 683 B

BIN

mods/default/textures/default_lava_flowing_animated.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 2.3 KiB After Width:  |  Height:  |  Size: 2.1 KiB

BIN

mods/default/textures/default_lava_source_animated.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 2.1 KiB After Width:  |  Height:  |  Size: 2.1 KiB

BIN

mods/default/textures/default_leaves.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 304 B After Width:  |  Height:  |  Size: 298 B

BIN

mods/default/textures/default_leaves_simple.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 817 B After Width:  |  Height:  |  Size: 305 B

BIN

mods/default/textures/default_meselamp.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 3.3 KiB After Width:  |  Height:  |  Size: 674 B

BIN

mods/default/textures/default_mineral_diamond.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 262 B After Width:  |  Height:  |  Size: 257 B

BIN

mods/default/textures/default_mineral_iron.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 172 B After Width:  |  Height:  |  Size: 169 B

BIN

mods/default/textures/default_mineral_mese.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 358 B After Width:  |  Height:  |  Size: 299 B

BIN

mods/default/textures/default_mossycobble.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 315 B After Width:  |  Height:  |  Size: 311 B

BIN

mods/default/textures/default_obsidian.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 155 B After Width:  |  Height:  |  Size: 152 B

BIN

mods/default/textures/default_obsidian_brick.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 268 B After Width:  |  Height:  |  Size: 227 B

BIN

mods/default/textures/default_papyrus.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 234 B After Width:  |  Height:  |  Size: 230 B

BIN

mods/default/textures/default_pine_needles.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 203 B After Width:  |  Height:  |  Size: 196 B

BIN

mods/default/textures/default_pinetree.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 280 B After Width:  |  Height:  |  Size: 278 B

BIN

mods/default/textures/default_pinetree_top.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 574 B After Width:  |  Height:  |  Size: 565 B

BIN

mods/default/textures/default_pinewood.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 223 B After Width:  |  Height:  |  Size: 222 B

BIN

mods/default/textures/default_rail_t_junction.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 247 B After Width:  |  Height:  |  Size: 241 B

BIN

mods/default/textures/default_river_water.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 716 B After Width:  |  Height:  |  Size: 299 B

BIN

mods/default/textures/default_river_water_flowing_animated.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 5.7 KiB After Width:  |  Height:  |  Size: 2.2 KiB

BIN

mods/default/textures/default_river_water_source_animated.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 4.8 KiB After Width:  |  Height:  |  Size: 1.7 KiB

BIN

mods/default/textures/default_sand.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 253 B After Width:  |  Height:  |  Size: 250 B

BIN

mods/default/textures/default_sandstone_brick.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 439 B After Width:  |  Height:  |  Size: 388 B

BIN

mods/default/textures/default_sign.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 442 B After Width:  |  Height:  |  Size: 436 B

BIN

mods/default/textures/default_sign_wall.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 416 B After Width:  |  Height:  |  Size: 415 B

BIN

mods/default/textures/default_steel_block.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 357 B After Width:  |  Height:  |  Size: 350 B

BIN

mods/default/textures/default_stone.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 233 B After Width:  |  Height:  |  Size: 230 B

BIN

mods/default/textures/default_tool_bronzepick.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 210 B After Width:  |  Height:  |  Size: 208 B

Some files were not shown because too many files have changed in this diff Show more