Tom Elfring
c67fe227d9
Fix oredict registration, moved to preinit
2017-06-13 19:01:44 +02: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
Aidan
d369963b40
Merge pull request #4390 from thommy101/dependency-updates
...
Dependency updates
2017-05-29 12:48:01 -07:00
Tom Elfring
3f777e98ab
Only allow same fluids in active fluidtank towers.
...
Implements feature #4165
If the current fluidtank is active and contains no fluid, check if the fluidtank underneath has the same fluid.
If it's the same as the one being inserted, accept the fluid. If they aren't the same, do not accept the fluid.
If the fluidtank underneath will execute the same checks if active.
Original behaviour is the same with non active fluidtanks.
2017-05-29 19:37:51 +02:00
aidancbrady
db4fdb8e84
Organize JEI support a bit better
2017-05-28 21:07:34 -07:00
aidancbrady
26061f35f7
Crash fix
2017-05-28 18:59:08 -07:00
aidancbrady
88e73cf1c6
Cleanup
2017-05-28 15:36:05 -07:00
aidancbrady
87e2fc49fd
Add a necessary null check
2017-05-28 15:07:52 -07:00
Tom Elfring
66e885474c
Disable Metallurgy compat
2017-05-28 11:51:00 +02:00
Tom Elfring
d7f8b1c0ab
Disable MineFactoryReloaded compat
2017-05-28 11:48:57 +02:00
Tom Elfring
bdb408972e
Move OpenComputers to Gradle dependency
2017-05-28 11:46:03 +02:00
aidancbrady
986ce14f2e
Bump version, fixed Purification Chamber sounds, fixed empty Configurator mode
2017-05-27 19:39:24 -07:00
aidancbrady
85827362fe
Update IC2 API
2017-05-27 15:24:46 -07:00
aidancbrady
f4570f61d2
Make factories respect machine energy usage, fixed creative gas tanks and fluid tanks integer overflow
2017-05-27 15:12:51 -07:00
aidancbrady
5c956f47de
Added (configurable) Configurator mode sneak-scroll toggle
2017-05-27 14:44:38 -07:00
aidancbrady
4d12018779
Accurately track whether player is on ground
2017-05-27 13:17:31 -07:00
aidancbrady
d07329ba5a
Fixed slow Thermodynamic Conductors, fixed Glow Panel desync (officially), added Config Card support to Energy Cube
2017-05-25 08:16:57 -07:00
aidancbrady
be6d3901bf
Prioritize ISidedInventory
2017-05-24 10:17:59 -07:00
aidancbrady
ba3c37b6c3
Updated Forge
2017-05-24 09:56:21 -07:00
aidancbrady
4c7b7aeae1
Fixed Glow Panel desync
2017-05-24 09:25:05 -07:00
aidancbrady
e657681d27
Fix Plastic Road
2017-05-24 09:16:37 -07:00
aidancbrady
52e21b8c0d
Fixed crash
2017-05-16 14:47:34 -04:00
aidancbrady
9b62713834
Update MCMP
2017-05-16 14:42:31 -04:00
aidancbrady
3f9cd82c5e
Add missing side check
2017-05-09 12:16:49 -04:00
aidancbrady
b30fd8dc62
Merge branch '1.10' into 1.11
...
* 1.10:
Register sounds with the GameRegistry, fixes client sync so they get correct sounds rather than eerie music
2017-05-09 12:14:35 -04:00
Xander
f32361a03c
Register sounds with the GameRegistry, fixes client sync so they get correct sounds rather than eerie music
2017-05-06 14:39:05 +08:00
aidancbrady
4c8e9fcb35
Block bounds for Laser and Logistical Sorter
2017-04-29 15:04:23 -04:00
aidancbrady
c4b4669600
Fixed fluid item handling
2017-04-29 13:32:02 -04:00
aidancbrady
92e1f12cd5
Fixed Resistive Heater computer integration
2017-04-29 12:46:43 -04:00