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

Browse Source

...

This commit is contained in:

Florian Nücke 2014-01-27 22:11:50 +01:00

parent d9208461bb 5ddbfb33af

commit 54652f4e02

2 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/blocks/capacitor.png

Binary file not shown.

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

BIN

assets/opencomputers/textures/blocks/capacitor_top.png

Binary file not shown.

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