Aidan Brady
aa69ba4bdf
Fix cast
2013-08-03 23:59:24 -04:00
Aidan Brady
ffd2588a63
Merge branch 'master' of https://github.com/aidancbrady/Mekanism
2013-08-03 23:02:31 -04:00
Aidan Brady
3fd76dcacc
Began work on Logistical Transporter - item transport :)
2013-08-03 23:02:06 -04:00
Ben Spiers
befd4ad4e2
I need to stop leaving those in.
2013-08-04 02:07:57 +01:00
Ben Spiers
472050e296
So apparently kilojoules are the base unit now. OK.
2013-08-04 01:58:56 +01:00
Ben Spiers
49fc056c8c
My approach to Universal Cables rendering power. They render with
...
transparency proportional to the base 10 log of power, to compensate
for the wide range of power that can be transmitted, and minimise client
update packets.
2013-08-04 01:58:56 +01:00
Ben Spiers
8ee17b2a03
Bring other network types up to speed with EnergyNetwork
2013-08-04 01:58:56 +01:00
Ben Spiers
837689a061
Transmitter Network Interface
2013-08-04 01:58:56 +01:00
Aidan Brady
503c4eb0b5
Merge branch 'master' of https://github.com/aidancbrady/Mekanism
2013-08-02 03:16:56 -04:00
Aidan Brady
47c36f1f38
Added redstone control to machines, generators, Energy Cubes and Gas Tanks; fixed Heat Generator NBT bug
...
Also - cleanup! Closes #214 .
2013-08-02 03:16:38 -04:00
Ben Spiers
534234abb2
Should fix robit crash when placed on non-chargepad tileEntities
2013-08-01 23:49:38 +01:00
Ben Spiers
f48997a793
Merge branch 'master' of github.com:aidancbrady/Mekanism
...
Conflicts:
common/mekanism/client/ModelRendererSelectiveFace.java
2013-08-01 23:30:59 +01:00
Ben Spiers
0d99b90922
Add a nullcheck that was crashing someone.
2013-08-01 23:15:02 +01:00
Ben Spiers
04e7fdcf23
Make the transmitters' internal renders look a bit nicer (hopefully also a bit
...
faster). Framework is in place to change transparency of energy in cables
but the client-side ones don't know what they're doing yet.
2013-08-01 23:14:26 +01:00
Ben Spiers
c642792cb6
Use DisplayInteger to abstract away some GL11 calls
2013-08-01 23:03:43 +01:00
Aidan Brady
55bde8a4b9
There is now a configurable delay between state updates, closes #177
2013-08-01 12:07:03 -04:00
Aidan Brady
9e51cdd4bc
Fixed Energy Cube/Generator UE energy outputting
2013-08-01 11:23:07 -04:00
Aidan Brady
773f40717c
Minor Robit AI enhancements
2013-08-01 01:28:27 -04:00
Aidan Brady
768f76e364
Fixed Robit crashing, added EnergyMeter recipe to master
2013-08-01 01:01:39 -04:00
Aidan Brady
ec42d430df
Fixed Forestry integration
2013-08-01 00:50:18 -04:00
Aidan Brady
333896bcac
Merge branch 'master' of https://github.com/aidancbrady/Mekanism
...
Conflicts:
common/mekanism/client/ModelBoxSelectiveFace.java
common/mekanism/client/ModelRendererSelectiveFace.java
2013-08-01 00:08:45 -04:00
Aidan Brady
d56eed2204
Cleanups!
2013-07-31 23:54:08 -04:00
Ben Spiers
260b9ed62f
Stop the new renderer from just creating infinite new displaylists.
2013-08-01 03:14:57 +01:00
Aidan Brady
7bbcc1c178
Merge branch 'master' of https://github.com/aidancbrady/Mekanism
2013-07-31 21:20:50 -04:00
Aidan Brady
4c50c442d1
Better BC item integration, javadocs, cleanup
2013-07-31 21:20:12 -04:00
Ben Spiers
415360a293
Fix factory guis
2013-08-01 00:04:00 +01:00
Ben Spiers
1b64d077e4
@Aidancbrady, why did osmium armour think it's made of diamond? I've
...
changed it because it was messing with the textures.
2013-07-31 23:34:39 +01:00
Ben Spiers
7c71adc9d2
Well, I don't know why the old way was broken but it's fixed now.
2013-07-31 23:34:39 +01:00
Ben Spiers
423db88959
Transmitter rendering improvements.
...
Now uses a new, slightly modified ModelRenderer and ModelBox I adapted
to be able to selectively render faces. Also we can now turn off back-face
culling without any xyz-fighting.
2013-07-31 23:34:38 +01:00
Aidan Brady
0b5d188cd7
More ratio fixes, Electric Chest GUI now has energy tooltip
2013-07-31 17:00:30 -04:00
Aidan Brady
fc964ad8db
Cleanups, fixed UE ratios
2013-07-31 16:44:53 -04:00
Aidan Brady
1953e16b5a
Merge branch 'master' of https://github.com/aidancbrady/Mekanism
...
Conflicts:
common/mekanism/common/TileEntityUniversalCable.java
2013-07-31 11:59:49 -04:00
Aidan Brady
c389f5bd34
Updated to new BuildCraft API, Universal Cable BuildCraft support temporarily broken.
2013-07-31 11:54:58 -04:00
Ben Spiers
248a976593
Possible hotfix for optifine crash
2013-07-31 03:31:37 +01:00
Calclavia
5f27a06983
Merge pull request #203 from ruifung/patch-1
...
Update README.md
2013-07-30 05:19:37 -07:00
ruifung
04a3d0f505
Update README.md
...
You forgot to update README.md to say Minecraft 1.6.2
2013-07-30 13:06:45 +08:00
Ben Spiers
60d9ac6d01
Oops.
2013-07-29 23:17:52 +01:00
Ben Spiers
b3909b7e6e
Add debug info to EnergyMeter
2013-07-29 22:52:31 +01:00
Ben Spiers
30ca7d82d6
Add ability to manually force-fix a network using a configurator
2013-07-29 22:48:12 +01:00
Ben Spiers
b01cf3b8f7
Make it so that /mk is always available in SSP
2013-07-29 21:38:10 +01:00
Ben Spiers
18519b5fa6
Fix the EnergyNetwork memory leak.
2013-07-29 21:30:43 +01:00
Ben Spiers
c2c031ef2a
Clean up a bit of unnecessary logic
2013-07-29 21:06:01 +01:00
Ben Spiers
735b281341
Fix a little derp in getPower()
2013-07-29 21:03:31 +01:00
Ben Spiers
6a562117b6
Fix ArrayIndexOutOfBoundsException in Electric Chest when attached to AE import buses and presumably other things.
2013-07-29 21:02:36 +01:00
Ben Spiers
0188882688
Fix the Electric Pump's render texture
2013-07-29 21:00:51 +01:00
Aidan
3cd0106c6f
Welcome to the team, @unpairedbracket!
2013-07-27 21:58:40 -04:00
Aidan Brady
db5588ddb9
Fixed StackOverflowException with MFR, fixed incorrect UE charging values
2013-07-27 19:32:46 -04:00
Aidan Brady
aa3dcd0262
Merge branch 'master' of https://github.com/aidancbrady/Mekanism
2013-07-27 12:01:16 -04:00
Aidan Brady
dedb2ebdcf
Fixed ControlCircuit recipe bug
2013-07-27 12:01:08 -04:00
Calclavia
0ea223fbcb
Update build.xml
2013-07-27 11:40:16 -04:00
