Tom Elfring
f6c126af44
Add max energy to tooltips
2017-07-17 20:27:05 +02:00
Aidan
b3f1a9fee4
Merge pull request #4529 from thommy101/issue-4508
...
[1.11] Fix missing null itemstack in InventoryPersonal.
2017-07-17 08:54:14 -07:00
Aidan
d00224f7a6
Merge pull request #4530 from thommy101/issue-4510
...
[1.11] Different factory issues.
2017-07-17 08:53:20 -07:00
Aidan
901694bb26
Merge pull request #4534 from thommy101/issue-4527
...
[1.11] Fix logistical sorter handling with less than full stacks.
2017-07-17 08:50:16 -07:00
Aidan
eb37d312aa
Merge pull request #4535 from thiakil/imc-recipes
...
Use FMLInterModComms.IMCEvent to process IMC messages
2017-07-17 08:49:14 -07:00
aidancbrady
672ec6ad2f
Clear comments
2017-07-17 08:48:01 -07:00
Xander
5f877bc2c1
Comment out certus/fluix oredict crusher/enrichment recipes - Applied Llamagistics adds its own via its configurable recipe system.
2017-07-17 21:12:16 +08:00
Xander
664b07ab54
register power transmitter for FE tunnel, which will (almost) always be there. Should still connect to EU tunnel, but makes more sense to attune to FE
2017-07-17 21:10:14 +08:00
Tom Elfring
84271c04d9
Cleanup getMaxEnergy
2017-07-17 14:44:38 +02:00
Xander
402457cf0d
Use FMLInterModComms.IMCEvent to process IMC messages, arrives between Init & PostInit. Allows JEI to display changed recipes.
2017-07-17 20:09:26 +08:00
Tom Elfring
768019c03f
Fix logistical sorter handling with less than full stacks.
...
Fixes #4527
2017-07-16 20:12:48 +02:00
Tom Elfring
f1e273ff5f
Fix getMaxEnergy for factories.
...
Fixes pickBlock and dropped block max energy from being limited to 0.
2017-07-16 19:42:06 +02:00
Tom Elfring
cc1320c71f
Fix smelting factories default max energy value.
...
Adresses #4510
2017-07-14 20:02:46 +02:00
Tom Elfring
36da1bc1d0
Fix missing null itemstack in InventoryPersonal.
...
Fixes #4508
2017-07-14 19:12:24 +02:00
Tom Elfring
3cfe0ee0d6
Add missing null structure check.
...
Fixes #4522
2017-07-10 18:27:41 +02:00
Tom Elfring
a044f826ba
Process Fluidic Plenisher nodes from closest to furthest.
...
Fixes #4490
2017-06-27 19:55:22 +02:00
aidancbrady
471563e083
Better ItemStack packet management
2017-06-17 13:31:46 -07:00
aidancbrady
aa04e34702
ItemStack fix
2017-06-17 12:27:29 -07:00
aidancbrady
a39571d837
Bump version to 9.3.3
2017-06-17 11:31:16 -07:00
Tom Elfring
ef28e70585
Fix unsave cast RecipeList
...
Fixes #4473
2017-06-17 12:48:48 +02:00
aidancbrady
673eaaeefa
Add cactus to biofuel recipes
2017-06-15 19:58:08 -07:00
aidancbrady
c12059e1b1
Null ItemStack cleanup
2017-06-15 19:56:53 -07:00
Aidan
355aa2db2d
Merge pull request #4468 from thiakil/null-itemstacks
...
More Null ItemStack / Null Comparison
2017-06-15 19:42:05 -07:00
Xander Victory
a7c8423e9f
more !isEmpty checks to validate ItemStacks
2017-06-14 14:29:06 +08:00
Xander Victory
f3cd020a31
more !isEmpty checks to validate ItemStacks
2017-06-14 14:16:37 +08:00
Xander Victory
785cb2c683
add @Nullable to internal ItemStack fields and also make sure they're not IS.isEmpty()
2017-06-14 14:14:02 +08:00
Tom Elfring
c67fe227d9
Fix oredict registration, moved to preinit
2017-06-13 19:01:44 +02:00
Xander Victory
8599224fca
Fix some more null ItemStacks found with Idea
2017-06-13 14:38:49 +08:00
aidancbrady
2c1532b293
Version bump
2017-06-10 10:58:33 -07:00
aidancbrady
41a1e375b7
Fix some null ItemStack issues
2017-06-10 10:56:02 -07:00
Xander Victory
fe9a0e6600
Prevent crashing during getQuads by 1. only calling OpenGL stuff if we have a context, 2. also checking that the Tesselator isDrawing.
2017-06-08 13:03:21 +08:00
Aidan
33a2b3a6a0
Merge pull request #4429 from thommy101/fix-integer-overflow
...
Fix integer overflows
2017-06-03 16:09:18 -07:00
aidancbrady
f2f96ce8f1
Added configurable Fusion Reactor energy generation, don't know why that didn't exist before
2017-06-03 16:07:18 -07:00
Tom Elfring
47d1640459
Fix integer overflows
2017-06-03 13:27:15 +02:00
Aidan
16b6860f94
Merge pull request #4422 from PlayerWithoutName/reactorFix
...
Fixed reactor blocks dropping wrong items
2017-06-02 11:36:22 -07:00
Tom Elfring
b6b57aab1c
Allow all items to be filtered on modid
...
Fixes #3856
2017-06-02 19:10:05 +02:00
PlayerWithoutName
0da157767d
Fixed reactor blocks dropping wrong items
2017-06-02 19:07:20 +02:00
aidancbrady
50bca73857
Merge branch '1.11' of https://github.com/aidancbrady/Mekanism into 1.11
...
# By Kitten (1) and PlayerWithoutName (1)
# Via GitHub (2) and PlayerWithoutName (1)
* '1.11' of https://github.com/aidancbrady/Mekanism :
Fixed IllegalArgumentException in OreDictCache class
Remove unused variable causing ClassCastException
2017-06-02 09:38:30 -07:00
aidancbrady
d5d9a345e9
Untested MCMP occlusion
2017-06-02 09:38:25 -07:00
Aidan
dd53a75b91
Merge pull request #4415 from InsomniaKitten/patch-1
...
Remove unused variable causing ClassCastException
2017-06-02 09:23:08 -07:00
PlayerWithoutName
dfea471bff
Fixed IllegalArgumentException in OreDictCache class
2017-06-02 15:17:56 +02:00
Kitten
ca21a34c3b
Remove unused variable causing ClassCastException
...
Resolves https://github.com/aidancbrady/Mekanism/issues/4414
2017-06-01 22:26:28 +01:00
Aidan
4335f4d2ab
Merge pull request #4412 from marcin212/separatorFix
...
fixed separator taking two upgrades instead of one
2017-06-01 10:26:27 -07:00
aidancbrady
f1b93f8f78
Fixed chargepad bounds
2017-06-01 10:25:49 -07:00
marcin212
c6d6f0ed51
fixed separator taking two upgrades instead of one
2017-06-01 18:15:39 +02:00
Aidan
b532c27d97
Merge pull request #4410 from marcin212/LithiumFix
...
Lithium fix #4406
2017-05-31 18:25:56 -07:00
aidancbrady
83fae924b8
Add sanity check for transmitter bounds
2017-05-31 18:25:38 -07:00
marcin212
bfa05b6280
fix #4406
2017-06-01 00:26:55 +02:00
aidancbrady
348aad9a93
Fix infinite water issue
2017-05-31 08:54:47 -07:00
aidancbrady
4bef6e7e52
Cleanup
2017-05-29 16:32:07 -07:00