Commit graph

117 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
Chris
62fcf26fcc Merge pull request #175 from thatsIch/TypeSafety
Type safety
2014-09-28 19:51:31 -07:00
thatsIch
56757bd828 Fixed crafting watchers not having the right type 2014-09-28 22:45:57 +02: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
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
Andrew
0042176f29 Deleted redundant null checks 2014-09-28 10:41:51 -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
Chris
b1bc51158f Merge pull request #8 from Ongy/Ticket1133
Fix for item #1133
Fixes #133
2014-09-27 17:12:00 -07: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
fed4109129 Fix a memory leak with GridStorage 2014-09-27 12:25:52 -05: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