Andrew 5c5aaa21ee Merge remote-tracking branch 'upstream/rv2' into rv2 ...

Conflicts:
	src/main/java/appeng/items/tools/powered/ToolMassCannon.java

2014-09-29 00:26:15 -07:00

..

powersink

Merge pull request #157 from thatsIch/Spelling

2014-09-28 10:09:39 -07:00

ToolChargedStaff.java

Improved readability of variables

2014-09-28 12:21:34 +02:00

ToolColorApplicator.java

Merge remote-tracking branch 'upstream/rv2' into rv2

2014-09-29 00:26:15 -07:00

ToolEntropyManipulator.java

Merge remote-tracking branch 'upstream/rv2' into rv2

2014-09-29 00:26:15 -07:00

ToolMassCannon.java

Merge remote-tracking branch 'upstream/rv2' into rv2

2014-09-29 00:26:15 -07:00

ToolPortableCell.java

Improved readability of variables

2014-09-28 12:21:34 +02:00

ToolWirelessTerminal.java

Improved readability of variables

2014-09-28 12:21:34 +02:00