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
|
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 C. Brady
|
22b3097d15
|
Laser model! Also added some new Reactor Block assets.
|
2014-07-24 23:02:30 -04:00 |
|
Aidan C. Brady
|
52efdac614
|
Eliminated the deprecated "getSpeedMultiplier()" and "getEnergyMultiplier()" methods
|
2014-07-23 10:17:03 -04:00 |
|
Aidan C. Brady
|
076c5f7377
|
More work!
|
2014-07-21 21:21:53 -04:00 |
|
Aidan C. Brady
|
fe177d20c7
|
Filter-based replacing works! Now to get the require system to work and the warning system set up.
|
2014-07-20 16:06:47 -04:00 |
|
Aidan C. Brady
|
7ddb8e9727
|
Merge branch 'development' into 1.8
Conflicts:
src/main/java/mekanism/client/ClientTickHandler.java
src/main/java/mekanism/common/CommonProxy.java
src/main/java/mekanism/common/Mekanism.java
|
2014-07-16 23:59:07 -04:00 |
|
Aidan C. Brady
|
cfeb08a8ee
|
Fixed Gas Mask OP-ness, added config option to let creative mode override the Electric Chest, fixed Gas Generator crash
|
2014-07-16 23:53:00 -04:00 |
|
Ben Spiers
|
bdde617489
|
More work on Fusion Reactor
|
2014-07-16 02:54:13 +01:00 |
|
Ben Spiers
|
cb2188580e
|
More Laser and Reactor work. Lasers work now, and Heat Generators generate energy from incident lasers, in order to test lasers. This is probably only temporary.
|
2014-07-16 02:54:13 +01:00 |
|
Ben Spiers
|
0638cdb61c
|
More work on Fusion Reactor and Lasers
|
2014-07-13 02:46:47 +01:00 |
|
Aidan C. Brady
|
ee00c5a22b
|
Chemical Dissolution Chamber now can accept upgrades
|
2014-07-11 00:42:06 -04:00 |
|
Aidan C. Brady
|
65a8633441
|
Gave Chemical Oxidizer and PRC upgrade systems, fixed Chemical Oxidizer and Electrolytic Separator NEI modules
|
2014-07-10 22:28:04 -04:00 |
|
Aidan C. Brady
|
f67be01658
|
Tank-based fluid container interaction fixes. Can't figure out the data request issue.
|
2014-07-07 15:54:26 -04:00 |
|
Ben Spiers
|
3a027d0ef4
|
Aaaaaaand ComputerCraft.
|
2014-06-26 21:07:46 +01:00 |
|
Ben Spiers
|
611d4c8f52
|
Got some IC2 stuff working now. Turns out I was being stupid.
|
2014-06-26 18:18:18 +01:00 |
|
Ben Spiers
|
9c58ed549f
|
Start of work on Doing It Right™. Appears to work for cofh's API, not yet for IC2 or BC. Not sure why. Might have to ask @cpw.
|
2014-06-26 01:10:53 +01:00 |
|
Aidan C. Brady
|
90da466ca1
|
Started work on Fluidic Plenisher
|
2014-06-19 12:42:59 +02:00 |
|
Aidan C. Brady
|
7924531a4e
|
Dispensers can now latch balloons onto nearby entities, also working Portable Tank GUI
|
2014-06-19 01:13:23 +02:00 |
|
Aidan C. Brady
|
adc8a9bc23
|
Portable Buckets...a lot more work than I thought
|
2014-06-18 19:42:57 +02:00 |
|
Aidan C. Brady
|
fd74ee5c92
|
Started work on Portable Tank
|
2014-06-18 03:01:23 +02:00 |
|
Aidan C. Brady
|
0528f1aace
|
Fix NEI offset for PRC, gave PRC a model, added specific sides for machines
|
2014-06-17 01:52:59 +02:00 |
|
Aidan C. Brady
|
75f09adba2
|
Seismic Vibrator model
|
2014-06-16 01:50:40 +02:00 |
|
Aidan C. Brady
|
1a0821c727
|
Found work-around for javac issue - need to remember to submit an issue to oracle tomorrow
|
2014-06-14 01:35:25 +02:00 |
|
Aidan C. Brady
|
e5f76907ce
|
Rewrite networking code for the 100th time to fix memory leak
|
2014-06-11 11:57:49 +02:00 |
|
Aidan C. Brady
|
d1c3b3b8ef
|
Manually merged riches' PR
|
2014-06-04 11:05:29 +02:00 |
|
Aidan C. Brady
|
815944c49a
|
A major load of fixes - things should be about back to normal now.
|
2014-06-03 19:54:45 +02:00 |
|
Aidan C. Brady
|
b365494f2e
|
Fixed up logger, added needed overlays
|
2014-06-03 08:46:03 +02:00 |
|
Aidan C. Brady
|
4446e14ba3
|
Sound system work
|
2014-06-02 23:57:40 +02:00 |
|
Aidan C. Brady
|
659b963af6
|
Alright, almost done with network changes (63 errors!)
|
2014-06-02 16:52:13 +02:00 |
|
Aidan C. Brady
|
84055986d0
|
About halfway through netty conversion
|
2014-06-02 16:01:21 +02:00 |
|
Aidan C. Brady
|
6f69c6d7b4
|
Major 1.7 work, down to a little more than 500 errors
|
2014-05-29 17:55:47 +01:00 |
|
Aidan Brady
|
6025572f15
|
Merge branch '1.7' into development (We're back to two branches)
Conflicts:
build.properties
|
2014-05-08 17:40:27 -04:00 |
|
Ben Spiers
|
31938e8b68
|
Under 1300 errors left now, started on packet/network stuffs.
|
2014-04-20 21:15:44 +01:00 |
|
Ben Spiers
|
db7121454a
|
Re-add an updated ic2, alter CC and update DepLoader. Fix more of the things.
1792 errors. A good night's work, I think.
|
2014-04-20 04:34:19 +01:00 |
|
Ben Spiers
|
ab47724473
|
Move the directory structure around to a more conventional one and start out on the 1.7 update.
3797 errors. We have a long way to go.
|
2014-04-20 03:44:06 +01:00 |
|