Commit graph

9 commits

Author SHA1 Message Date
yueh
fd7c1ff5f8 Added checks for null and equal class to .equals()
Also switched a check for null in OreHelper#sameOre to prevent null ==
null => true
2014-09-29 12:39:40 +02: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
8514e32f5f Added missing @Override annotations with Eclipse 2014-09-28 11:34:00 -07:00
Chris
f9b9729fb5 Merge pull request #157 from thatsIch/Spelling
Spelling
2014-09-28 10:09:39 -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
1e71e86acc Removes unnecessary semicolons 2014-09-28 12:08:47 +02:00
Ongy
4586c0b0d2 Fix for item #1133 2014-09-27 01:09:40 +02:00
AlgorithmX2
386d18a059 Relocate Source to proper directory. 2014-09-23 19:26:27 -05:00
Renamed from helpers/PatternHelper.java (Browse further)