Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into StargateTech2

Browse Source

...

This commit is contained in:

Florian Nücke 2014-01-09 17:35:10 +01:00

parent 72751b1acb 4c116987e2

commit 0add1e3601

36 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

assets/opencomputers/textures/items/alu.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 289 B After Width:  |  Height:  |  Size: 289 B

BIN

assets/opencomputers/textures/items/card.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 300 B After Width:  |  Height:  |  Size: 281 B

BIN

assets/opencomputers/textures/items/card_graphics0.png

Binary file not shown.

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

BIN

assets/opencomputers/textures/items/card_graphics1.png

Binary file not shown.

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

BIN

assets/opencomputers/textures/items/card_graphics2.png

Binary file not shown.

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

BIN

assets/opencomputers/textures/items/card_lan.png

Binary file not shown.

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

BIN

assets/opencomputers/textures/items/card_redstone.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 395 B After Width:  |  Height:  |  Size: 394 B

BIN

assets/opencomputers/textures/items/card_wlan.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 472 B After Width:  |  Height:  |  Size: 472 B

BIN

assets/opencomputers/textures/items/circuit_board.png

Binary file not shown.

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

BIN

assets/opencomputers/textures/items/circuit_board_printed.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 330 B After Width:  |  Height:  |  Size: 331 B

BIN

assets/opencomputers/textures/items/circuit_board_raw.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 520 B After Width:  |  Height:  |  Size: 519 B

BIN

assets/opencomputers/textures/items/cpu.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 320 B After Width:  |  Height:  |  Size: 320 B

BIN

assets/opencomputers/textures/items/cu.png

Binary file not shown.

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

BIN

assets/opencomputers/textures/items/cutting_wire.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 294 B After Width:  |  Height:  |  Size: 294 B

BIN

assets/opencomputers/textures/items/disk_floppy.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 508 B After Width:  |  Height:  |  Size: 507 B

BIN

assets/opencomputers/textures/items/disk_harddrive0.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 425 B After Width:  |  Height:  |  Size: 425 B

BIN

assets/opencomputers/textures/items/disk_harddrive1.png

Binary file not shown.

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

BIN

assets/opencomputers/textures/items/disk_harddrive2.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 429 B After Width:  |  Height:  |  Size: 429 B

BIN

assets/opencomputers/textures/items/grog.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 309 B After Width:  |  Height:  |  Size: 309 B

BIN

assets/opencomputers/textures/items/icon_card.png

Binary file not shown.

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

BIN

assets/opencomputers/textures/items/icon_ram.png

Binary file not shown.

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

BIN

assets/opencomputers/textures/items/keys_arrow.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 287 B After Width:  |  Height:  |  Size: 287 B

BIN

assets/opencomputers/textures/items/keys_group.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 292 B After Width:  |  Height:  |  Size: 292 B

BIN

assets/opencomputers/textures/items/keys_numpad.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 294 B After Width:  |  Height:  |  Size: 293 B

BIN

assets/opencomputers/textures/items/memory0.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 308 B After Width:  |  Height:  |  Size: 308 B

BIN

assets/opencomputers/textures/items/memory1.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 322 B After Width:  |  Height:  |  Size: 322 B

BIN

assets/opencomputers/textures/items/memory2.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 323 B After Width:  |  Height:  |  Size: 323 B

BIN

assets/opencomputers/textures/items/microchip0.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 215 B After Width:  |  Height:  |  Size: 215 B

BIN

assets/opencomputers/textures/items/microchip1.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 236 B After Width:  |  Height:  |  Size: 236 B

BIN

assets/opencomputers/textures/items/microchip2.png

Binary file not shown.

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

BIN

assets/opencomputers/textures/items/transistor.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 220 B After Width:  |  Height:  |  Size: 221 B

BIN

assets/opencomputers/textures/items/upgrade_crafting.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 372 B After Width:  |  Height:  |  Size: 373 B

BIN

assets/opencomputers/textures/items/upgrade_generator.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 313 B After Width:  |  Height:  |  Size: 406 B

BIN

assets/opencomputers/textures/items/upgrade_navigation.png

Binary file not shown.

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

BIN

assets/opencomputers/textures/items/upgrade_sign.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.2 KiB After Width:  |  Height:  |  Size: 723 B

BIN

assets/opencomputers/textures/items/upgrade_solar_generator.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.2 KiB After Width:  |  Height:  |  Size: 882 B