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
|
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
|
9413950842
|
Merge branch 'development' into 1.8
|
2014-07-28 17:33:38 +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
|
cf4df0941b
|
Fix a crash casting null to float
|
2014-07-28 15:05:53 +01: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
|
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
|
fc878661d5
|
Implemented new container edit modes in Portable Tank and Dynamic Tank, still need to set up IFluidContainerItem integration with the Dynamic Tank
|
2014-07-10 18:08:53 -04:00 |
|
Aidan C. Brady
|
12f3ef8665
|
Lay out the foundation for container edit modes. Also changed the way Dynamic Tank caches work - they are now much more modular and will remember their multiblock inventories on world reload.
|
2014-07-10 17:51:26 -04:00 |
|
Aidan C. Brady
|
1f9782d1c7
|
Added logic to allow fluid-accepting machines to use IFluidContainerItem fluids
|
2014-07-10 16:24:55 -04:00 |
|
Ben Spiers
|
cd10bc88c8
|
Updates for changed IC2 API. Not sure if I'll be able to use @Optional with the new non-legacy BC MJ API as it uses Annotations instead of interfaces.
|
2014-07-10 16:53:01 +01:00 |
|
Aidan C. Brady
|
83ff761ec4
|
Fix a bug with takeTopItem() inventory management. This fixed it, @ErogenousBeef!
|
2014-07-07 18:21:22 -04:00 |
|
Ben Spiers
|
ac223c8df5
|
Fix ic2 pulling and IConfigurable passthrough (leaving the OreDict fix for the Pull Request). getConnectedOutputters was broken.
|
2014-06-26 23:47:33 +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
|
cf1469c7da
|
Fix weird blending issue with Dynamic Glass, gave Seismic Vibrator an on texture
|
2014-06-19 15:44:08 +02:00 |
|
Aidan C. Brady
|
fba83a3634
|
Fluidic Plenisher work - just about done!
|
2014-06-19 13:57:30 +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
|
90c1c690a9
|
Updated Cofh API
|
2014-06-15 13:35:51 +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
|
70abe40b1f
|
Mod ID filters :)
|
2014-06-13 20:58:50 +02:00 |
|
Aidan C. Brady
|
c8fb800c1a
|
Updated localization yet again, fixed a small bug
|
2014-06-13 00:16:02 +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
|
d7fdc3a243
|
Greatly improved localization
|
2014-06-10 11:35:54 +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
|
295efab7b2
|
More error fixes, down to 11!
|
2014-06-02 20:04:10 +02:00 |
|
Aidan C. Brady
|
ec2040cccc
|
Work on networking update
|
2014-06-01 17:42:23 +02:00 |
|
Aidan C. Brady
|
8be5ecf140
|
Down to 215 errors, pretty much everything is packets now
|
2014-05-30 23:49:24 +02:00 |
|
Aidan C. Brady
|
d1c193d0dd
|
Loads more work. 275 errors.
|
2014-05-29 19:01:43 +01: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
|
7496ac7648
|
Some 1.7 work. Just about 800 errors!
|
2014-05-07 16:37:58 -04:00 |
|
Ben Spiers
|
3d8c5c8696
|
More fixes. Around 1000 errors now, going to have to leave it to you from here on in @aidancbrady.
|
2014-04-20 22:34:45 +01: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 |
|