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
thatsIch
0ee0a70f1a
Removes unnecessary returns
2014-09-29 09:47:17 +02:00
thatsIch
3ce47a167f
Removes not needed casts
2014-09-29 09:42:50 +02:00
thatsIch
640d888d13
Merge pull request #171 from iloveportalz0r/rv2
...
Fixed lots of warnings (mostly redundant code)
2014-09-29 09:34:07 +02:00
thatsIch
3ae892137d
Removes redundant final modifiers of private methods
2014-09-29 09:31:45 +02:00
Andrew
d08ce4a2b4
Deleted some parens and fixed indentation
2014-09-29 00:29:55 -07:00
thatsIch
1d1ea7a03e
Replaces String == comparison with .equals()
2014-09-29 09:28:58 +02:00
thatsIch
b6ec21c70a
Replaces while iterators with foreach call
2014-09-29 09:26:35 +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
caffaef835
Replaced normal for loops with foreach loops which is less error prone when just iterating over collection/array
2014-09-29 09:23:02 +02:00
thatsIch
f95d221859
Removes not needed Boxing
2014-09-29 09:17:33 +02:00
thatsIch
7f52394511
Self assignment
2014-09-29 09:14:58 +02:00
thatsIch
f49407de2c
Removed redundant array creations just to match varargs operations
2014-09-29 09:12:06 +02:00
Cisien
72106c877d
Adding
2014-09-28 21:26:11 -07:00
Chris
37ab4f2961
fix formatting
2014-09-28 20:18:55 -07:00
Chris
a5393640ac
Added some guidelines around how we will accept PRs.
2014-09-28 20:11:59 -07:00
Chris
62fcf26fcc
Merge pull request #175 from thatsIch/TypeSafety
...
Type safety
2014-09-28 19:51:31 -07:00
Andrew
fd18393a8b
Merge remote-tracking branch 'upstream/rv2' into rv2
2014-09-28 14:33:43 -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
thatsIch
f63aa6d17e
Merge pull request #172 from yueh/cleanup-forwarding-super
...
Removed methods with only call to super
2014-09-28 21:38:55 +02:00
yueh
0f6d49fbef
Removed missed ones
2014-09-28 21:19:29 +02:00
FireBall1725
bb3214160e
Merge pull request #169 from FireBall1725/rv2
...
added fix for main branch being built with the pull requests
2014-09-28 15:04:18 -04:00
FireBall1725
383de1f894
removed if statement that wasn't needed
2014-09-28 14:58:20 -04:00
Andrew
da63aca95c
Deleted unnecessary casts with Eclipse
2014-09-28 11:56:16 -07:00
FireBall1725
31434c1382
fixed bug in call to teamcity
2014-09-28 14:55:55 -04:00
Andrew
94d5319038
Fixed some warnings about unnecessary code
2014-09-28 11:55:09 -07:00
FireBall1725
fed20a97fa
added fix for main branch being built with the pull requests
2014-09-28 14:53:36 -04:00
Andrew
da90b07194
Merge remote-tracking branch 'upstream/rv2' into rv2
2014-09-28 11:47:59 -07:00
FireBall1725
a89b9befae
Merge pull request #168 from FireBall1725/rv2
...
removed buildcraft lib folder, handled by maven
2014-09-28 14:42:11 -04:00
FireBall1725
12cc73a2ab
removed buildcraft lib folder, handled by maven
2014-09-28 14:38:56 -04: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
thatsIch
b6273d9c0c
Merge pull request #167 from yueh/cleanup-forwarding-super
...
Removed methods only forwarding their call to the corresponding super class
2014-09-28 20:20:32 +02:00
thatsIch
f8c7a62ce8
Merge pull request #166 from iloveportalz0r/rv2
...
Deleted redundant null checks in various scenarios where it either would have crashed before by calling it already or because it was already checked before without modifying the current state of that variable.
2014-09-28 20:16:21 +02:00
yueh
53694bdd3a
Removed methods only forwarding their call to the corresponding super class
2014-09-28 20:15:26 +02:00
thatsIch
a745e00115
Fixed typos in MatterCannon
2014-09-28 19:46:10 +02:00
Andrew
0042176f29
Deleted redundant null checks
2014-09-28 10:41:51 -07:00
thatsIch
8f5f3f1ed7
Merge branch 'rv2' of https://github.com/AppliedEnergistics/Applied-Energistics-2 into rv2
2014-09-28 19:30:34 +02:00
FireBall1725
6103376536
Merge pull request #165 from FireBall1725/rv2
...
Added some comments
2014-09-28 13:25:52 -04:00
FireBall1725
75361e5f5d
Added some comments
2014-09-28 13:18:52 -04:00
thatsIch
b3e6c89775
Merge branch 'rv2' of https://github.com/AppliedEnergistics/Applied-Energistics-2 into rv2
2014-09-28 19:16:27 +02:00
Chris
f9b9729fb5
Merge pull request #157 from thatsIch/Spelling
...
Spelling
2014-09-28 10:09:39 -07:00
Chris
fd0ea8b903
Merge pull request #156 from thatsIch/Semicolon
...
Semicolon
2014-09-28 10:09:21 -07:00
thatsIch
459682bd11
Merge pull request #162 from thepaperpilot/patch-2
...
Removed duplicate code of fuzzy button sending double to server because of super call
2014-09-28 19:02:08 +02:00
The Paper Pilot
1cf54c515e
Removed duplicate code
...
This also prevents the storage bus from sending 2 packets instead of 1 when the fuzzy button is pressed
2014-09-28 11:58:21 -05:00
thatsIch
d3699f00e5
Merge pull request #161 from FireBall1725/rv2
...
Added support for TeamCity adding version data
2014-09-28 18:57:21 +02:00
FireBall1725
62a60469e0
Removed null teamcity code
2014-09-28 12:55:59 -04:00
FireBall1725
3257140b5a
Oops, had a bad import at the top
2014-09-28 12:51:13 -04:00
FireBall1725
a089438843
Added support for TeamCity adding version data
...
Moved stub api version numbers to build.properties
2014-09-28 12:45:55 -04:00
