Ben Spiers
6f4e0da3c5
Fix a small advanced solar placement bug.
2014-07-28 23:11:08 +01:00
Ben Spiers
9413950842
Merge branch 'development' into 1.8
2014-07-28 17:33:38 +01: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
Ben Spiers
1d52a4f5a0
Add a Creative Energy Cube that's always half-full so it can sink or provide arbitrary amounts of energy.
2014-07-28 17:18:33 +01:00
Ben Spiers
38b554266e
Add tabs to Fuel and Heat GUIs to get to the other one.
2014-07-28 17:17:42 +01:00
Ben Spiers
f21568d5f8
Textures for Fusion Fluids
2014-07-28 17:16:56 +01:00
Ben Spiers
cf4df0941b
Fix a crash casting null to float
2014-07-28 15:05:53 +01:00
Ben Spiers
5dcd9abd0f
Add an injection rate text field
2014-07-28 15:04:55 +01:00
Aidan Brady
9696ad246c
Merge branch '1.8' of https://github.com/aidancbrady/Mekanism into 1.8
2014-07-28 09:27:16 -04:00
Aidan Brady
1ad7fe81b9
Salination Plant now auto-forms
2014-07-28 09:27:08 -04: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
e2913e2520
Work on reactor GUI.
...
Three different screens now because there's so much information. Still need an option on the fuel screen to set the injection rate and a proper button to form the multiblock.
2014-07-28 04:24:56 +01:00
Ben Spiers
e004fdca98
Merge branch 'development' into 1.8
...
Conflicts:
src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java
2014-07-27 20:53:00 +01: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
ce5bddbdd1
Merge branch 'development' into 1.8
...
Conflicts:
src/main/java/mekanism/common/block/BlockMachine.java
src/main/java/mekanism/common/item/ItemBlockMachine.java
src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java
src/main/java/mekanism/common/tile/TileEntityPRC.java
2014-07-26 18:57:18 -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 C. Brady
aaffc3e364
Updated some imports and added textures
2014-07-26 16:45:48 -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
22b3097d15
Laser model! Also added some new Reactor Block assets.
2014-07-24 23:02:30 -04:00
Aidan C. Brady
5f268ae0b0
More texture updates
2014-07-24 18:30:46 -04:00
Aidan C. Brady
b992d686e8
Updated some textures, also added textures for Laser and upcoming Neutronic Centrifuge
2014-07-24 18:00:18 -04:00
Aidan C. Brady
5bee3991d8
Merge branch 'development' into 1.8
...
Conflicts:
src/main/java/mekanism/common/tile/TileEntityEnergyCube.java
2014-07-23 13:50:43 -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
d8e94b00d2
Added effect information to upgrade GUI
2014-07-23 11:06:58 -04:00
Aidan C. Brady
52efdac614
Eliminated the deprecated "getSpeedMultiplier()" and "getEnergyMultiplier()" methods
2014-07-23 10:17:03 -04:00
Aidan C. Brady
523ec21467
Added button to remove upgrade, fixed font size. Almost done!
2014-07-22 22:16:20 -04:00
Aidan C. Brady
790cd33f2d
Merge branch '1.8' of https://github.com/aidancbrady/Mekanism into 1.8
2014-07-22 20:37:59 -04:00
Aidan C. Brady
6470f69569
A big load of work on the new upgrade GUI
2014-07-22 20:37:53 -04:00
Ben Spiers
84daf186ca
More Reactor GUI work
2014-07-23 01:25:10 +01:00
Ben Spiers
775ba68482
Tweaking of lasers for packet-efficiency
2014-07-22 22:34:19 +01:00
Ben Spiers
c66676dd55
Fix some Server-side packets being sent by the client
2014-07-22 21:13:01 +01:00
Ben Spiers
327389a88c
Get Lasers kind of working vs. dediservers
2014-07-22 21:11:43 +01:00
Ben Spiers
dd421f7308
This should stop the servercrashing issue
2014-07-22 18:03:34 +01:00
Ben Spiers
a2bb224bf5
Fix transmitter render pass to stop things occluding incorrectly, make lasers get stronger and weaker as they start and stop
2014-07-22 17:41:34 +01:00
Ben Spiers
e35a673c8b
Get lasers rendering. I've yet to proxy it off, so THIS WILL CRASH DEDICATED SERVERS
2014-07-22 03:41:30 +01:00
Ben Spiers
733da7396f
Add LiquidChlorine meta file
2014-07-22 03:41:30 +01:00
Aidan C. Brady
99482d8fd0
Fixed a minor issue
2014-07-21 22:24:27 -04:00
