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 |
|
Andrew
|
fd18393a8b
|
Merge remote-tracking branch 'upstream/rv2' into rv2
|
2014-09-28 14:33:43 -07: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 |
|
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 |
|
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 |
|
yueh
|
53694bdd3a
|
Removed methods only forwarding their call to the corresponding super class
|
2014-09-28 20:15:26 +02: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 |
|
Chris
|
fd0ea8b903
|
Merge pull request #156 from thatsIch/Semicolon
Semicolon
|
2014-09-28 10:09:21 -07: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
|
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
|
0b87595f9d
|
Merge pull request #2 from yueh/feature-upgradeable-inscriber
Changed Inscriber to be upgradable with Cards
Closes #126
|
2014-09-27 16:50:03 -07:00 |
|
yueh
|
cdcae974e2
|
Changed Inscriber to be upgradable with Cards
Supports up to 3 cards
Currently max 3 Acceleration Cards, each reducing the crafting time by 25%
|
2014-09-28 00:36:43 +02: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
|
386d18a059
|
Relocate Source to proper directory.
|
2014-09-23 19:26:27 -05:00 |
|