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
Ben Spiers
34b4742798
Start on framework for energy/fluid/gas/item teleportation
2014-08-02 00:49:00 +01:00
Aidan Brady
548c5b0835
More work, currently broken
2014-08-01 15:49:03 -04:00
Aidan Brady
fc7dd3e65a
Started on a new, more modular approach to controller-less multiblocks, allowing for the creation of the EIM
2014-08-01 13:04:31 -04:00
Aidan Brady
1cfe6fc352
Started work on implementation of Dynamic Tank cache merging, fixed Salination Tank not rendering at height 3, made sure all multiblocks load after partial chunk load
2014-08-01 01:33:54 -04:00
Aidan Brady
4090fcf490
Reactor now auto-forms
2014-08-01 00:55:24 -04:00
Aidan Brady
22db67c895
Spacing cleanup
2014-07-31 22:27:46 -04:00
Aidan Brady
dde9b53447
Fixed the addition of the "creative control circuit"
2014-07-31 21:08:46 -04:00
Aidan Brady
d9bb5845cd
Naming standards :)
2014-07-31 20:55:01 -04:00
Ben Spiers
725b7463f0
Make the mod classes significantly less godlike.
...
Move Config variables into their own class, (in api because other stuff in API references config, may make sense to move it back to common later), and move Blocks and Items into final variables in their own classes. It looks a lot cleaner this way and my OCD can finally rest now.
2014-08-01 01:35:06 +01:00
Aidan Brady
6762f416d3
Glowing lasers and laser amplifier model!
2014-07-31 19:46:31 -04:00
Aidan Brady
6e975ee632
Made them really infinite
2014-07-31 19:29:49 -04:00
Aidan Brady
da35b509fd
Creative Energy Cube now won't be drained of or receive power.
2014-07-31 19:19:03 -04:00
Aidan Brady
ed4aa7671c
Merge branch 'development' into 1.8
...
Conflicts:
src/main/java/mekanism/common/EnergyNetwork.java
2014-07-31 19:00:54 -04: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
285423d4b1
Merge branch 'development' into 1.8
2014-07-31 18:08:12 -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
5f83a42fc8
Make some textures more transparent to get a better look at the fusion plasma.
2014-07-31 22:58:20 +01:00
Ben Spiers
a6ff4750e4
Fusion reactor NBT save/load, and a first attempt at plasma render. Fusion reactor is basically finished at this point.
2014-07-31 22:57:30 +01:00
Ben Spiers
d7c060d6fb
Update BC API and fix up EnergyNet and CableUtils to work with the new MjAPI
2014-07-31 18:41:32 +01:00
Ben Spiers
d8321196d9
Oops
2014-07-31 16:02:55 +01:00
