Merge branch 'master-MC1.8' of github.com:MightyPirates/OpenComputers into OC1.5-MC1.8

Browse Source

...

This commit is contained in:

Florian Nücke 2015-08-30 18:08:16 +02:00

parent fa720be2a4 78330ae428

commit 7b4cf66209

1 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

0

src/main/resources/assets/opencomputers/textures/blocks/Transposer_top.png → src/main/resources/assets/opencomputers/textures/blocks/transposer_top.png

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