tilera/Applied-Energistics-2-tilera-Edition
1
1
Fork 0
Code Issues 7 Pull requests Releases 1 Wiki Activity
2320 commits 7 branches 98 tags 24 MiB
Commit graph

2320 commits

This branch
This branch
All branches
Author SHA1 Message Date
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 8917a331eb Merge pull request #1373 from yueh/fix-1360 
Added missing check to detect missing cell workbenches
 2015-05-01 17:39:39 +02:00
thatsIch 8fbb317f6e Adds several badges 2015-05-01 17:34:06 +02:00
yueh f15561c4dc Added missing check to detect missing cell workbenches 
Fixes #1360
 2015-05-01 12:48:08 +02:00
thatsIch ee431b3269 Merge pull request #1359 from thatsIch/e-use-gradle-properties 
Do not use the slurper anymore
 2015-04-30 18:52:49 +02:00
thatsIch ba97dacfdd Merge pull request #1356 from thatsIch/e-brackets-everywhere 
Puts everywhere brackets
 2015-04-30 18:52:34 +02:00
thatsIch ce6a2e8487 Do not use the slurper anymore 
The proper way to use gradle is to actually use the gradle.properties. It will be automatically read without using a self defined config slurper.

The gradle.properties adds additional convenient options e.g. regarding the VM options and parallel calculation or daemons
 2015-04-29 21:03:49 +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
yueh 106003ebf9 Merge pull request #1349 from yueh/fix-1348 
Removed MJ as icon
 2015-04-28 19:11:21 +02:00
thatsIch 8271597394 Merge pull request #1341 from thatsIch/b-1339-server-crash 
Fixes #1339: Was not able to retrieve the name of an unregistered part
 2015-04-28 18:42:42 +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
yueh f364359905 Removed MJ as icon 
Fixes #1348
 2015-04-28 18:28:54 +02:00
thatsIch fb618b939f Merge pull request #1342 from Mazdallier/patch-1 
Update fr_FR.lang
 2015-04-27 15:48:33 +02:00
Yves 43a47f8971 Update fr_FR.lang 
Minor correction and group organisation
 2015-04-27 13:23:28 +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 bbde2443e1 Merge pull request #1335 from TheVikingWarrior/patch-3 
Update it_IT.lang
 2015-04-26 16:54:21 +02:00
thatsIch ad2f63ba0d Merge pull request #1328 from thatsIch/b-1327-wrong-container 
Fixes #1327: Prevents crash when configuring a GUI
 2015-04-26 16:46:06 +02:00
TheVikingWarrior ee977720ca Update it_IT.lang 2015-04-26 15:48:53 +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 399934ac2b Merge pull request #1319 from Adaptivity/patch-1 
Update ru_RU.lang
 2015-04-24 19:11:51 +02:00
Anton 9451106c81 Update ru_RU.lang 2015-04-24 07:51:44 +03:00
thatsIch 8e75de8fb9 Merge pull request #1278 from thatsIch/b-1277-no-mj-config 
Fixes #1277: Removed config option for MJ-P2P Tunnel
 2015-04-23 23:48:55 +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 1ac2ab0c10 Merge pull request #1272 from thatsIch/b-1271-missing-pack-mcmeta 
Fixes #1271: Added missing pack.mcmeta
 2015-04-23 23:42:58 +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 9af6b50347 Merge pull request #1308 from yueh/fix-329 
Replaced static field with with a unique BaseActionSource
 2015-04-23 23:32:41 +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
yueh 1396dbf600 Merge pull request #1312 from yueh/fix-456 
Fixed interface dropping items into itself
 2015-04-23 23:17:05 +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 36c72d641f Merge pull request #1282 from theelixzammuto/rv2 
Update it_IT.lang
 2015-04-14 18:38:06 +02:00
theelixzammuto f878a7598d Update it_IT.lang 2015-04-14 18:07:07 +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 800c30e91c Fixes #1271: Added missing pack.mcmeta 
Was missing in the resource management of the build script to be handled
 2015-04-13 12:25:54 +02:00
thatsIch 817163dbf6 Merge pull request #1240 from bakaxyf/rv2 
Update zh_CN.lang
 2015-04-08 21:03:31 +02:00