10 Commits
Author SHA1 Message Date
Andrew 7f225a5ec1 Deleted useless things 2014-10-03 23:08:28 -07:00
Andrew d08ce4a2b4 Deleted some parens and fixed indentation 2014-09-29 00:29:55 -07:00
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
Andrew fd18393a8b Merge remote-tracking branch 'upstream/rv2' into rv2 2014-09-28 14:33:43 -07:00
Andrew da63aca95c Deleted unnecessary casts with Eclipse 2014-09-28 11:56:16 -07:00
Andrew 94d5319038 Fixed some warnings about unnecessary code 2014-09-28 11:55:09 -07:00
Andrew da90b07194 Merge remote-tracking branch 'upstream/rv2' into rv2 2014-09-28 11:47:59 -07:00
Andrew d75a60cbaa Deleted unused imports 2014-09-28 11:36:14 -07:00
Andrew 8514e32f5f Added missing @Override annotations with Eclipse 2014-09-28 11:34:00 -07:00
Andrew 0042176f29 Deleted redundant null checks 2014-09-28 10:41:51 -07:00