Aidan Brady
321411ee3a
Fixed incorrect Advanced Solar Generator generation rate display
2014-08-06 13:56:01 -04:00
Aidan Brady
08914da371
Fixed Electric Pump lag - was able to completely eliminate system of node cleaning while boosting performance immensely
2014-08-06 13:44:59 -04:00
Aidan Brady
faad9762df
Merge branch 'development' into 1.8
...
Conflicts:
build.properties
src/main/java/mekanism/common/Mekanism.java
src/main/java/mekanism/common/tile/TileEntityBin.java
src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java
src/main/java/mekanism/generators/common/MekanismGenerators.java
src/main/java/mekanism/generators/common/tile/TileEntityWindTurbine.java
src/main/java/mekanism/tools/common/MekanismTools.java
2014-08-06 12:56:37 -04:00
Aidan Brady
20dc1ae28a
Bump version to 7.1.0.
2014-08-06 12:51:48 -04:00
Aidan Brady
7c8208026b
Merge branch 'master' into development
2014-08-06 12:34:46 -04:00
Aidan Brady
1896a42afa
Cleaned up that fix
2014-08-05 22:31:57 -04:00
Ben Spiers
a865a19340
Implement canConnectEnergy so RF cables don't connect when they shouldn't
2014-08-06 02:51:25 +01:00
Aidan C. Brady
7a67fbf7ca
Fluidic Plenisher now detects block updates directly below it, and will replace the block if necessary. Will also no longer replace other source blocks.
2014-08-05 21:27:10 -04:00
Aidan C. Brady
12215490f0
Fixed a Digital Miner oversight, fixed Bins losing NBT data and allow Bins to accept items with varying item damage
2014-08-05 20:58:22 -04:00
Aidan C. Brady
06c66d5fbe
Tiny cleanup
2014-08-05 17:07:09 -04:00
Aidan C. Brady
69874de9d2
Merge branch 'development' into 1.8
...
Conflicts:
src/main/java/mekanism/generators/client/gui/GuiWindTurbine.java
src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java
src/main/java/mekanism/generators/common/MekanismGenerators.java
src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java
src/main/java/mekanism/generators/common/tile/TileEntityWindTurbine.java
2014-08-05 17:06:29 -04:00
Aidan C. Brady
87c7d888f5
Merge branch 'master' into development
2014-08-05 16:56:02 -04:00
Aidan C. Brady
873af4be2e
Cleanup
2014-08-05 16:55:55 -04:00
Aidan C. Brady
ed9db80245
Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development
2014-08-05 16:53:48 -04:00
Aidan C. Brady
27b61e288a
Fixed a few bugs
2014-08-05 16:53:40 -04:00
Aidan
aee18c0181
Merge pull request #1622 from bshelden/1614-powergen-config
...
Added additional power generation configuration (#1164 )
2014-08-05 16:52:59 -04:00
Aidan
92cfc31223
Merge pull request #1625 from jstockwin/development
...
Fixed some Electric Chest bugs
2014-08-05 16:52:28 -04:00
Aidan C. Brady
afd3b52123
Merge branch '1.8' of https://github.com/aidancbrady/Mekanism into 1.8
2014-08-05 16:23:24 -04:00
Aidan C. Brady
dd2eb3a0fd
Fixed an electric chest crash
2014-08-05 16:22:59 -04:00
Aidan
5b3cd7e2a4
Merge pull request #1639 from jstockwin/heatGeneratorFix
...
Stop pipes connecting to front of Heat Generator.
2014-08-05 16:22:20 -04:00
Ben Spiers
6f9e13a798
Add passive and steam generation Stats to reactor.
2014-08-05 02:43:03 +01:00
Ben Spiers
e6957c1561
Update Forge
2014-08-05 01:49:25 +01:00
Ben Spiers
dffee5a8e3
Add Statistics tab to Reactor
...
Some more stats could be displayed here, regarding energy generation.
2014-08-05 01:39:17 +01:00
Ben Spiers
12f9753ac5
Move Laser range and usage to config
2014-08-04 20:42:04 +01:00
jstockwin
8509ebab18
Stop pipes connecting to front of Heat Generator.
...
Prevents Mechanical Pipes connecting to the front (energy output) side of the Heat Generator.
Currently they physically connect, leading you to assume they are
transferring the lava, however they are not as this is the energy output
side and it does not accept lava.
2014-08-04 20:35:39 +01:00
Ben Spiers
9652b7adf6
Allow top/bottom to interact with charging slot
...
Might add side configuration and ejectors and stuff later, but fixes #1281 . (Sorry it took so long.)
2014-08-04 20:15:10 +01:00
Ben Spiers
432eab1bcf
Move LaserManager out of api to fix some import errors.
2014-08-04 14:10:40 +01:00
Ben Spiers
03a7252d7a
Fix controller texture on items
2014-08-04 02:05:23 +01:00
Ben Spiers
fad0da2c15
Fix a deprecated method
2014-08-04 01:09:44 +01:00
Ben Spiers
2d3dda245a
Get all registered fluids to show up in Portable tanks in NEI.
2014-08-04 01:08:49 +01:00
Ben Spiers
1c71614c4a
Properly localise fluid names on machine blocks
2014-08-04 01:01:15 +01:00
Ben Spiers
14852b0b5d
Move some more code into the Blocks and Items classes, and fix the ObjectHolder annotations. Don't think it's going to be possible to make the Tools items work with ObjectHolder (they'd need to be final fields I think) because the material enums need to be initialised first.
2014-08-03 20:27:20 +01:00
Ben Spiers
2048083e11
Fix energy cubes not coming from NEI charged
2014-08-03 20:27:20 +01:00
Ben Spiers
7c123a9fa1
Fix Factory container slot ids
2014-08-03 20:27:20 +01:00
Aidan C. Brady
943cd1e45b
Merge branch 'development' into 1.8
...
Conflicts:
src/main/java/mekanism/common/tile/TileEntityElectricBlock.java
2014-08-03 02:54:46 -04:00
Aidan C. Brady
04987a5626
Merge branch 'master' into development
2014-08-03 02:52:40 -04:00
Ben Spiers
32a52c5f03
Fix the BuildCraft leak quickly
...
This is already solved in development branches but that commit would pull in a bunch of other stuff as well.
2014-08-03 03:14:17 +01:00
Ben Spiers
9f0e564013
Fix some Server-side packets being sent by the client
...
Conflicts:
src/main/java/mekanism/common/tile/TileEntityEnergyCube.java
2014-08-03 02:48:59 +01:00
jstockwin
79ce886df2
Fixed some Electric Chest bugs
...
Electric Chest was not updating when it was (un)locked, meaning that
mechanical pipes would not (dis)connect and reconnect.
Also noticed that Electric Chest won't accept transporters connecting to
the bottom, which I thought was odd, however it looked intentional so I
left it alone. (..?)
Also made it so electric chests will not open if there is a solid block
above them.
2014-08-03 01:00:16 +01:00
Byron Shelden
020d347ee3
Added additional power generation configuration ( #1164 )
...
* Can now configure heat generator power from adjacent lava
* Can now configure heat generator power from the nether
* Wind power is now configured by specifying minimal and maximal Y levels and generation values.
* Defaults to 60J/t at Y 24 and 480J/t at Y 255
2014-08-02 12:56:41 -07:00
Aidan Brady
233f538d75
Merge branch 'development' into 1.8
2014-08-02 14:00:33 -04:00
Aidan Brady
8e10c4fbf7
Fixed panel harvest levels
2014-08-02 14:00:19 -04:00
Aidan
26ffda6a1a
Merge pull request #1617 from bshelden/rf-api-update
...
Updated the RP API to hash e853d244
2014-08-02 13:43:19 -04:00
Aidan Brady
33970b6bf7
Updated Multiblock Controller textures, added multi-meta capability to Connected Texture Renderer
2014-08-02 11:16:14 -04:00
Byron Shelden
0de28777c0
Updated the RP API to hash e853d244
2014-08-02 00:50:32 -07:00
Aidan Brady
19cfb7b8d6
Generalized the actual manager, and the data manager (by means of reflection)
2014-08-02 00:10:29 -04:00
Aidan Brady
c97f617692
Generalized some of the multiblock code into a stricter format
2014-08-01 23:44:28 -04:00
Aidan Brady
8f6cf7e1c9
Merge branch '1.8' of https://github.com/aidancbrady/Mekanism into 1.8
2014-08-01 22:28:18 -04:00
Aidan Brady
d1bef0b7e3
Fixes! The new system just about works, I just need to work on Dynamic Tank inventory merging.
2014-08-01 22:28:13 -04:00
Ben Spiers
e0e54523fb
Remove some bad imports
2014-08-02 00:49:46 +01:00
