Commit graph

6 commits

Author SHA1 Message Date
thatsIch
7505f9b66a Added copyright to all java files 2014-11-14 12:03:00 +01: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
thatsIch
f1ffbf08a2 Resolved some unchecked Types 2014-09-28 22:20:14 +02:00
Andrew
da63aca95c Deleted unnecessary casts with Eclipse 2014-09-28 11:56:16 -07:00
Andrew
8514e32f5f Added missing @Override annotations with Eclipse 2014-09-28 11:34:00 -07:00
AlgorithmX2
386d18a059 Relocate Source to proper directory. 2014-09-23 19:26:27 -05:00