Chris
|
d163b2f6dd
|
Merge pull request #179 from thatsIch/Self
Self assignment
|
2014-09-29 14:06:43 -07:00 |
|
Chris
|
b48d35bf78
|
Merge pull request #178 from thatsIch/Redundant
Removed redundant array creations just to match varargs operations
|
2014-09-29 14:06:27 -07:00 |
|
thatsIch
|
2688548479
|
Merge pull request #190 from yueh/feature-progress-provider
Moving the handling of progress to GuiProgressBar
|
2014-09-29 21:57:20 +02:00 |
|
thatsIch
|
9e97c51746
|
Merge pull request #180 from thatsIch/Boxing
Removes not needed Boxing
|
2014-09-29 21:55:28 +02:00 |
|
yueh
|
21a7d815ae
|
Moving the handling of progress to GuiProgressBar
Adds an interface providing data for GuiProgressBar
Changed all containers simulating progress to implement the interface
|
2014-09-29 20:00:18 +02:00 |
|
yueh
|
a3705c54cd
|
Removed unused and likely buggy class SortedList
|
2014-09-29 17:19:51 +02:00 |
|
thatsIch
|
35c00873c1
|
Merge pull request #188 from yueh/cleanup-code
Added checks for null and equal class to .equals()
|
2014-09-29 15:41:42 +02:00 |
|
yueh
|
7ff54c6831
|
Fixed typo in SyncData
|
2014-09-29 15:25:48 +02:00 |
|
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
|
d08ce4a2b4
|
Deleted some parens and fixed indentation
|
2014-09-29 00:29:55 -07: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
|
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 |
|
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 |
|
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
|
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 |
|
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 |
|
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
|
76a515db4e
|
Re-added perdition class
|
2014-09-28 14:06:07 +02:00 |
|
thatsIch
|
743d946496
|
Removed perdition class
|
2014-09-28 14:05:41 +02:00 |
|
thatsIch
|
55bb3e1fa6
|
Renamed BaseMJPerdition file
|
2014-09-28 13:56:08 +02:00 |
|
thatsIch
|
3d7f847da4
|
Re-added typo change
|
2014-09-28 12:22:24 +02: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
|
207758f895
|
resolved conflict
|
2014-09-28 12:11:18 +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 |
|
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 |
|
Chris
|
1aafe22ea9
|
Merge pull request #144 from thatsIch/PerformanceImprovements
Use collections methods to add stuff
|
2014-09-27 16:41:25 -07:00 |
|
Chris
|
b2b4ef9ce6
|
Merge pull request #7 from thepaperpilot/0856
Feature: #0856 - Crafting Terminal requires Crafting Permissions to open
Closes #76
|
2014-09-27 16:19:30 -07:00 |
|
Chris
|
876d7408be
|
Merge pull request #145 from AlgorithmX2/FixAddStat
Removed Chat Spam, replaced with Achievement.
|
2014-09-27 16:18:39 -07:00 |
|
AlgorithmX2
|
c68a4232ab
|
Removed Chat Spam, replaced with Achievement.
|
2014-09-27 17:58:48 -05:00 |
|
Chris
|
e159298b1a
|
Merge pull request #6 from thepaperpilot/0880
Fixed Bug: #79 - ME Chest can't be protected by ME Security Terminal.
|
2014-09-27 15:57:51 -07:00 |
|
thatsIch
|
8b4501c89d
|
Removes unnecessary semicolons
|
2014-09-28 00:50:06 +02: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
|
fed4109129
|
Fix a memory leak with GridStorage
|
2014-09-27 12:25:52 -05:00 |
|