aba0c44916
Removes unnecessary returns
2014-09-29 23:27:25 +02:00
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
7ff54c6831
Fixed typo in SyncData
2014-09-29 15:25:48 +02:00
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
d08ce4a2b4
Deleted some parens and fixed indentation
2014-09-29 00:29:55 -07:00
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
62fcf26fcc
Merge pull request #175 from thatsIch/TypeSafety
...
Type safety
2014-09-28 19:51:31 -07:00
fd18393a8b
Merge remote-tracking branch 'upstream/rv2' into rv2
2014-09-28 14:33:43 -07:00
56757bd828
Fixed crafting watchers not having the right type
2014-09-28 22:45:57 +02:00
f1ffbf08a2
Resolved some unchecked Types
2014-09-28 22:20:14 +02:00
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
0f6d49fbef
Removed missed ones
2014-09-28 21:19:29 +02:00
da63aca95c
Deleted unnecessary casts with Eclipse
2014-09-28 11:56:16 -07:00
94d5319038
Fixed some warnings about unnecessary code
2014-09-28 11:55:09 -07:00
d75a60cbaa
Deleted unused imports
2014-09-28 11:36:14 -07:00
8514e32f5f
Added missing @Override annotations with Eclipse
2014-09-28 11:34:00 -07:00
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
53694bdd3a
Removed methods only forwarding their call to the corresponding super class
2014-09-28 20:15:26 +02:00
a745e00115
Fixed typos in MatterCannon
2014-09-28 19:46:10 +02:00
0042176f29
Deleted redundant null checks
2014-09-28 10:41:51 -07:00
f9b9729fb5
Merge pull request #157 from thatsIch/Spelling
...
Spelling
2014-09-28 10:09:39 -07:00
fd0ea8b903
Merge pull request #156 from thatsIch/Semicolon
...
Semicolon
2014-09-28 10:09:21 -07:00
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
76a515db4e
Re-added perdition class
2014-09-28 14:06:07 +02:00
743d946496
Removed perdition class
2014-09-28 14:05:41 +02:00
55bb3e1fa6
Renamed BaseMJPerdition file
2014-09-28 13:56:08 +02:00
3d7f847da4
Re-added typo change
2014-09-28 12:22:24 +02:00
76b147fd5b
Improved readability of variables
...
Hopefully improved semantics of variables
Fixed typos
Added hyphenations
2014-09-28 12:21:34 +02:00
207758f895
resolved conflict
2014-09-28 12:11:18 +02:00
1e71e86acc
Removes unnecessary semicolons
2014-09-28 12:08:47 +02:00
b1bc51158f
Merge pull request #8 from Ongy/Ticket1133
...
Fix for item #1133
Fixes #133
2014-09-27 17:12:00 -07:00
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
1aafe22ea9
Merge pull request #144 from thatsIch/PerformanceImprovements
...
Use collections methods to add stuff
2014-09-27 16:41:25 -07:00
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
876d7408be
Merge pull request #145 from AlgorithmX2/FixAddStat
...
Removed Chat Spam, replaced with Achievement.
2014-09-27 16:18:39 -07:00
c68a4232ab
Removed Chat Spam, replaced with Achievement.
2014-09-27 17:58:48 -05:00
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
8b4501c89d
Removes unnecessary semicolons
2014-09-28 00:50:06 +02:00
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
d37638f4ee
Use collections methods to add stuff
...
Remove redundant new String initialization
2014-09-27 23:54:17 +02:00
4088cca5ad
Fixing internal javadoc
2014-09-27 23:17:47 +02:00
fed4109129
Fix a memory leak with GridStorage
2014-09-27 12:25:52 -05:00
7508644103
Merge pull request #10 from AlgorithmX2/CellRemovalFix
...
Close GUI when Monitor Returns a new Handler, closes Chest GUI when cell is removed
2014-09-27 12:23:21 +02:00
6c9201d32b
Changed the way the problem is fixed.
...
Now anyone can open ME chests, but if there is a security terminal on the
network, you must have withdraw or deposit permissions in order to extract or inject
items, respectively.
2014-09-26 22:16:25 -05:00
90d59db34e
Close GUI when Monitor Returns a new Handler, closes Chest GUI when cell is removed.
2014-09-26 22:08:58 -05:00
25b09a975e
Prevent calling client only localization method on server.
2014-09-26 20:48:32 -05:00
5d57e9dff8
Remove pointless ore dictionary registration.
2014-09-26 18:12:03 -05:00
4586c0b0d2
Fix for item #1133
2014-09-27 01:09:40 +02:00
15f9a64ba3
Feature: #0856 - Crafting Terminal requires Crafting Permissions to open.
...
Whenever a player without "craft"-ing permissions attempts to open a crafting or pattern terminal, they will open the normal terminal GUI instead
2014-09-26 16:26:41 -05:00
a0a4f8f58d
Fixed Bug: #0880 - ME Chest can't be protected by ME Security Terminal.
2014-09-26 16:07:39 -05:00
thatsIch