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
Ben Spiers
4faa733106
Merge branch 'development' into 1.8
2014-07-31 15:59:30 +01:00
Ben Spiers
59dab7c848
Move StackUtil to api package for not causing errors.
2014-07-31 15:58:02 +01:00
Ben Spiers
1b54cfbb50
More laser amplifier changes
2014-07-31 15:56:07 +01:00
Ben Spiers
d4f05c8b99
Some cleanup of MekanismUtils and more EnergyDisplay changes to use our energy units.
...
Because who the hell ever uses siemens, anyway?
2014-07-31 15:55:03 +01:00
Ben Spiers
26bc15ac3b
Adding Lit Redstone Ore to OreDict is well and truly broken.
2014-07-31 15:53:24 +01:00
Ben Spiers
b62c5c8a3a
Get basic functionality working for the Laser Amplifier. No mode changing yet, and using the laser model in lieu of the actual one.
2014-07-30 22:26:03 +01:00
Ben Spiers
bfe3b545d2
Merge branch 'development' into 1.8
2014-07-30 15:15:42 +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
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
