thatsIch
1c0f1ea243
Merge branch 'rv2' of https://github.com/AppliedEnergistics/Applied-Energistics-2 into rv2
2015-05-19 21:11:26 +02:00
Jeremiah Winsley
e8a68cc531
Fixes #1384 - implement AdvancedShaftPowerReceiver for RotaryCraft powersink
2015-05-19 21:08:37 +02:00
TheJulianJES
37aef15a02
Don't add the player inventory two times (rv2)
2015-05-14 12:38:44 +02:00
TheJulianJES
34f78a7ce4
Fix warnings in eclipse
...
Close scanner instead of doing it with a warning
Make the scanner final..
2015-05-10 00:14:56 +02:00
thatsIch
7cb485aa48
Fixed missing Javadoc parameter
...
Reworked the instantiation a bit
Added some additional checks due to the new nonnullability.
2015-05-03 16:45:27 +02:00
thatsIch
1baed48b0a
Merge pull request #1372 from thatsIch/b-1368-vibration-chamber-comparator
...
Fixes #1368 : Vibration Chamber notifies neighbors on inventory change and state change
2015-05-03 16:24:26 +02:00
yueh
da6b31cdb1
Merge pull request #1352 from yueh/fix-1336
...
Fixes part interface inventory model
2015-05-02 20:39:42 +02:00
thatsIch
875214c166
Adds annotations by contract of the interface
2015-05-02 15:39:59 +02:00
thatsIch
a9ec31d72f
Merge pull request #1332 from thatsIch/b-1331-crash-on-disabled-material
...
Fixes #1331 : Happened on deactivating features for intermediate crafting components
2015-05-02 07:24:36 +02:00
thatsIch
e392ecd08d
Fixes #1368 : Vibration Chamber notifies neighbors on inventory change and state change
2015-05-01 17:58:59 +02:00
thatsIch
03f9436ef9
Fixes #1331 : Happened on deactivating features for intermediate crafting components
...
If a feature dependency of ItemMultiMaterial was disabled, the returned value was never assigned with the constructed. Pulling out the construction and setting it before checking it, prevents the NPE and also matches the behaviour in ItemMultiPart, where parts are constructed, but never registered.
2015-05-01 17:52:23 +02:00
yueh
f15561c4dc
Added missing check to detect missing cell workbenches
...
Fixes #1360
2015-05-01 12:48:08 +02:00
thatsIch
64ed05a1b4
Puts everywhere brackets
2015-04-29 18:38:24 +02:00
thatsIch
23aa8fd72d
Merge pull request #1337 from thatsIch/e-1333-recipe-sorter
...
Fixes #1333 : Updated old code parts related to recipes
2015-04-28 19:44:55 +02:00
yueh
332ea089e3
Fixes part interface inventory model
...
Fixes #1336
2015-04-28 19:13:51 +02:00
thatsIch
9210069d9b
Fixes #1333 : Updated old code parts related to recipes
...
Fixed an additional bug, where the disassembling recipes were not working properly. The fail logic was flawed, so that it would never match the recipe
2015-04-28 18:37:46 +02:00
thatsIch
e85acf2bee
Fixes #1339 : Was not able to retrieve the name of an unregistered part
...
Added an additional map to store all parts and be able to access them if needed.
Added public preconditions
Added private asserts
Excluded public overridden methods, since behaviour can be unexpected
2015-04-27 09:51:40 +02:00
thatsIch
ca953f4596
Fixes #1327 : Prevents crash when configuring a GUI
2015-04-25 20:09:53 +02:00
thatsIch
2adc055536
Merge pull request #1276 from thatsIch/b-1186-disassembling-storage-missing-upgrades
...
Fixes #1186 : Storage Cells drop upgrades upon disassembling
2015-04-24 19:12:17 +02:00
thatsIch
eca598516e
Fixes #1277 : Removed config option for MJ-P2P Tunnel
2015-04-23 23:45:32 +02:00
thatsIch
2c5a54c210
Merge pull request #1269 from thatsIch/b-1256-number-converter
...
Fixes #1256 : Using new size logic to determine the abbreviation for a stack size
2015-04-23 23:43:31 +02:00
thatsIch
199b17b9c6
Merge pull request #1274 from thatsIch/e-1273-deprecated
...
Closes #1273 : Replaced deprecated method call
2015-04-23 23:42:42 +02:00
thatsIch
f582c8081b
Merge pull request #1275 from thatsIch/e-1270-nei-grinder-localization
...
Closes #1270 : Improves NEI grinder overlay localization
2015-04-23 23:42:26 +02:00
thatsIch
77d66b1817
Merge pull request #1279 from thatsIch/b-1264-render-crash-missing-rf-api
...
Fixes #1264 : Does not crash on missing RF API
2015-04-23 23:42:01 +02:00
thatsIch
df370396b1
Merge pull request #1299 from thatsIch/e-qol-exception-messages
...
Improved exceptions
2015-04-23 23:41:44 +02:00
thatsIch
ceeb84a439
Merge pull request #1302 from thatsIch/e-qol-parthelper
...
Removes unrequired part helper getter, since it already existed
2015-04-23 23:41:24 +02:00
yueh
d151313253
Replaced static field with with a unique BaseActionSource
...
Fixes #329
2015-04-23 23:22:55 +02:00
yueh
6d935cc8ae
Merge pull request #1311 from yueh/fix-1310
...
Refactored the NEI handling to use an InventoryAdaptor
2015-04-23 23:17:11 +02:00
thatsIch
8087a43df5
Fixes #1186 : Storage Cells drop upgrades upon disassembling
2015-04-23 22:54:10 +02:00
yueh
c2cd395ca1
Fixed interface dropping items into itself
...
Fixes #456
2015-04-23 15:57:12 +02:00
yueh
a6e2975677
Refactored the NEI handling to use an InventoryAdaptor
...
Fixes #1310
2015-04-23 15:00:34 +02:00
thatsIch
3783ae8619
Improved exceptions
...
Many exceptions got an improvement due to changed class or description or details it is providing.
Is not complete, needs to be done in patches in the regions, where it is needed, since some are just
swallowed.
Removed total usage of pure RuntimeExceptions to 0.
2015-04-21 17:43:24 +02:00
thatsIch
be17616836
Removes unrequired part helper getter, since it already existed
2015-04-20 21:12:03 +02:00
thatsIch
071ae6d680
Fixes #1264 : Does not crash on missing RF API
2015-04-13 22:15:39 +02:00
thatsIch
cc29230ce5
Fixes #1256 : Using new size logic to determine the abbreviation for a stack size
...
Removes the usage of the old methods, since they were pretty, but not applicable for our use case. The displayed strings are determined by the size of the to be rendered string. Now the algorithm tries to use as much width as possible before trying to trim it down.
Added tests to reflect the changes and expected behaviour. Also using specific interfaces for the corresponding behaviour to shield from potential calls to the underlying enum singleton implementation.
2015-04-13 14:59:44 +02:00
thatsIch
b282e5d968
Closes #1270 : Improves NEI grinder overlay localization
2015-04-13 12:53:55 +02:00
thatsIch
3410db7b45
Closes #1273 : Replaced deprecated method call
2015-04-13 12:32:53 +02:00
thatsIch
b58c92ebb6
Fixes #1202 : Now 10000x items is the limit before being converted to next bigger unit
...
Added a new method to display a number in a long fashion.
Added respective unit tests for them
2015-04-07 23:46:52 +02:00
yueh
2667b8eac6
Merge pull request #1233 from yueh/fix-1230
...
Changed to LinkedHashSet to maintain insertion order
2015-04-07 12:50:27 +02:00
yueh
fcea444041
Changed to LinkedHashSet to maintain insertion order
...
Fixes #1230
2015-04-07 12:28:45 +02:00
yueh
80f56d4359
Changed the order as WATs are special and needing a position
...
Fixes #1222
2015-04-07 00:17:55 +02:00
yueh
788de6d432
Merge pull request #964 from yueh/fix-889
...
Fixes #889 possible dupe bug
2015-04-06 15:54:23 +02:00
thatsIch
04a6a683bc
Merge pull request #1220 from thatsIch/e-1219-hardcoded-localizations
...
Fixes #1219 : Improved localization options
2015-04-06 15:44:36 +02:00
thatsIch
06bca227d0
Closes #1054 : Adds an Inscriber API for Developers
2015-04-06 13:45:27 +02:00
thatsIch
8321a5fe1c
Fixes #1219 : Improved localization options
2015-04-06 13:37:40 +02:00
yueh
1bb8de3570
Merge pull request #1216 from yueh/cleanup-modifier-order
...
Modifier are now using a consistent order based on the java conventions
2015-04-06 13:31:21 +02:00
thatsIch
8666937117
Merge pull request #1210 from thatsIch/e-1207-channels
...
Fixes #1207 → Enables resource packs more fine tuned information in WAILA channel display
2015-04-06 13:09:54 +02:00
yueh
eaf57bedf6
Modifier are now using a consistent order based on the java conventions
2015-04-06 00:35:42 +02:00
thatsIch
a30ef4679c
Fixes #1207 → Enables resource packs more fine tuned information in WAILA channel display
2015-04-05 23:06:31 +02:00
yueh
0ee2ca72ac
Merge pull request #1206 from yueh/fix-1068
...
Stops AEBaseItemBlock from modifying the metadata before placing.
2015-04-05 20:47:31 +02:00
