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
5b3cd7e2a4
Merge pull request #1639 from jstockwin/heatGeneratorFix
...
Stop pipes connecting to front of Heat Generator.
2014-08-05 16:22:20 -04: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
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
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
Byron Shelden
0de28777c0
Updated the RP API to hash e853d244
2014-08-02 00:50:32 -07:00
Aidan Brady
7e378dd796
Fixed Atomic Disassembler issue
2014-07-31 18:57:18 -04:00
Aidan Brady
b2e676aabb
Fixed an API issue, fixed Robit nametag not updating, fixed Sorter Mod ID filter bugginess
2014-07-31 18:41:27 -04:00
Aidan Brady
269343f9f0
Revert back to the old method of power distribution to fix BuildCraft issues. We shouldn't try to make up for other mods' bugs.
2014-07-31 18:17:03 -04:00
Aidan Brady
4a70449899
Merge branch 'master' into development
2014-07-31 18:07:58 -04:00
Aidan
56e6cbcb55
Merge pull request #1590 from Tonius/patch-1
...
Various fixes to jetpack-related rendering
2014-07-31 18:04:28 -04:00
Aidan
057c4d0ea8
Merge pull request #1596 from mymagadsl/patch-3
...
Update zh_TW.lang
2014-07-31 18:03:37 -04:00
Ben Spiers
59dab7c848
Move StackUtil to api package for not causing errors.
2014-07-31 15:58:02 +01:00
Ben Spiers
78addc3303
Stop a potential NPE in Gas Gauges.
2014-07-30 15:14:54 +01:00
Ben Spiers
2b7300bfa3
Stop a potential NPE in Gas Gauges.
2014-07-30 15:09:27 +01:00
mymagadsl
cf53322e18
Update zh_TW.lang
2014-07-30 01:24:33 +08:00
Ben Spiers
c339ee7a18
Merge branch 'master' into development
2014-07-28 17:33:09 +01:00
Ben Spiers
c97464649d
Fix trying to use IC2 EnergyNet without IC2 installed. It would never work anyway.
2014-07-28 17:20:31 +01:00
Tonius
fef1fb6fb6
Committed the other files I meant to commit.
2014-07-28 15:01:58 +02:00
Tonius
d6cf9a8e90
Various fixes to rendering
...
Fixed:
- Jetpack particles being too dark
- Jetpack particles flickering towards the world origin
- Jetpack HUD showing in almost every screen
- RenderTickHandler still ticking when the game is paused
2014-07-28 15:01:27 +02:00
Ben Spiers
d0d660b9d4
Merge branch 'master' into development
2014-07-27 20:45:53 +01:00
Ben Spiers
1d61c3d4e8
Tweak energynet logic a bit to safeguard against overly high tiers of IC2 acceptor and things that implement everything but with only one working.
...
Should fix AE2 EU P2P tunnel support.
2014-07-27 20:45:13 +01:00
Aidan C. Brady
31e24ecd1e
Fixed default enchantibilities
2014-07-26 19:17:02 -04:00
Aidan C. Brady
3abd80f1a2
Generators now sustain fluid and gas data
2014-07-26 19:10:17 -04:00
Aidan C. Brady
ab34edc46a
Finished off new system of sustained data
2014-07-26 18:44:24 -04:00
Aidan C. Brady
94c3a6aa60
Started work on a new system of managing sustained data
2014-07-26 18:16:00 -04:00
Aidan C. Brady
7ac7fbc5cc
Sustained gas and fluid support for Chemical Washer, Chemical Crystallizer and Chemical Infuser
2014-07-26 17:59:43 -04:00
Aidan C. Brady
2876eb535d
Merge branch 'master' into development
2014-07-26 17:39:03 -04:00
Aidan C. Brady
ba289ced25
Added sustained fluid and gas tanks to PRC and Electrolytic Separator, fixed Gas Generator losing energy when being picked up
2014-07-26 17:37:25 -04:00
Aidan
3d1b256632
Merge pull request #1576 from fewizz/patch-1
...
Update ru_RU.lang
2014-07-26 15:44:17 -04:00
Aidan
e7bfdefb26
Merge pull request #1578 from jmongeon/master
...
Fix Gas Generator not accepting Buildcraft fuels.
2014-07-26 15:43:22 -04:00
fewizz
f768dabd5f
Update ru_RU.lang
2014-07-25 12:44:54 +04:00
jmongeon
1689031219
Fix Gas Generator not accepting Buildcraft fuels.
2014-07-24 23:07:11 -04:00
Aidan C. Brady
bb8985b6f8
Fixed a few energy transfer issues
2014-07-23 13:49:42 -04:00
Aidan C. Brady
2b5bb53bc6
Fixed a few recipe issues
2014-07-23 13:43:12 -04:00
Aidan C. Brady
cdb1ad2ffe
Attempted a fix for a strange connection error
2014-07-21 19:45:14 -04:00
Aidan C. Brady
b4be235f82
Merge branch 'master' into development
2014-07-21 16:59:18 -04:00
Ben Spiers
5f26402bd9
Minor cleanup and tabs
2014-07-21 21:48:28 +01:00
Aidan C. Brady
0864e1061a
Merge a few more fixes
2014-07-21 16:45:08 -04:00
Aidan C. Brady
27056da3e4
Merge back a few bug fixes
2014-07-21 16:41:27 -04:00
Ben Spiers
fd9fb0713e
Merge pull request #1559 from jstockwin/development
...
Stop energy cube core rendering when cube is empty.
2014-07-21 21:20:38 +01:00
jstockwin
0a9dbec78c
Stop energy cube core rendering when cube is empty.
...
This will stop it from blocking out other rendering when it's not opaque
enough to be visible
2014-07-21 21:14:12 +01:00
Ben Spiers
cc33ad2181
Update Development.md
...
It wasn't really correct any more
2014-07-21 20:13:59 +01:00
