Commit graph

8 commits

Author SHA1 Message Date
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
thatsIch
f1ffbf08a2 Resolved some unchecked Types 2014-09-28 22:20:14 +02:00
Andrew
94d5319038 Fixed some warnings about unnecessary code 2014-09-28 11:55:09 -07:00
Andrew
8514e32f5f Added missing @Override annotations with Eclipse 2014-09-28 11:34:00 -07:00
thatsIch
76b147fd5b Improved readability of variables
Hopefully improved semantics of variables

Fixed typos

Added hyphenations
2014-09-28 12:21:34 +02:00
thatsIch
d37638f4ee Use collections methods to add stuff
Remove redundant new String initialization
2014-09-27 23:54:17 +02:00
thatsIch
4088cca5ad Fixing internal javadoc 2014-09-27 23:17:47 +02:00
AlgorithmX2
386d18a059 Relocate Source to proper directory. 2014-09-23 19:26:27 -05:00