Merge branch 'rv2' of https://github.com/AppliedEnergistics/Applied-Energistics-2 into rv2

Browse Source

...

This commit is contained in:

thatsIch

2014-09-30 17:28:55 +02:00

parent 94199154a6 6a8effe2b0

commit 7c2d3c3711

401 changed files with 3165 additions and 2911 deletions

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

Download Patch File Download Diff File Expand all files Collapse all files

src/main/resources/assets/appliedenergistics2/textures/blocks/PartConvMonitor_Bright.png → src/main/resources/assets/appliedenergistics2/textures/blocks/PartConversionMonitor_Bright.png

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

src/main/resources/assets/appliedenergistics2/textures/blocks/PartConvMonitor_Colored.png → src/main/resources/assets/appliedenergistics2/textures/blocks/PartConversionMonitor_Colored.png

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

src/main/resources/assets/appliedenergistics2/textures/blocks/PartConvMonitor_Dark.png → src/main/resources/assets/appliedenergistics2/textures/blocks/PartConversionMonitor_Dark.png

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