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
|
2f4d545fb5
|
Major Flamethrower work - finished networking and implemented active state management. Active sound effects work, too.
|
2014-07-17 17:18:53 -04:00 |
|
Aidan C. Brady
|
ee789547c6
|
A bit of work on flamethrower sound effect handling
|
2014-07-15 22:59:14 -04:00 |
|
Aidan C. Brady
|
a98bf8bba3
|
Merge branch 'development' into 1.8
|
2014-07-14 17:15:26 -04:00 |
|
Aidan C. Brady
|
146d974479
|
Fixed Teleporter localization, fixed balloons placing on non-solid sides, added AE processing recipes, improve tele porter efficiency
|
2014-07-14 17:14:32 -04:00 |
|
Aidan C. Brady
|
6fbfd22583
|
Merge branch 'development' into 1.8
|
2014-07-13 00:16:05 -04:00 |
|
Ben Spiers
|
4bea4c62fd
|
Remove stray @Method
Should fix #1500
|
2014-07-13 05:06:57 +01:00 |
|
Aidan C. Brady
|
9abc111ecd
|
Baby Skeletons, started work on Flamethrower
|
2014-07-12 22:34:58 -04:00 |
|
Aidan C. Brady
|
369eb012af
|
Fixed Portable Tank transfer issue, fixed inventories not being sustained, fixed Logistical Transporter crash
|
2014-07-12 16:02:21 -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
|
7198704363
|
Fixed a crash!
|
2014-07-10 18:13:56 -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 |
|
Aidan C. Brady
|
95b6ac8be1
|
Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development
|
2014-07-10 13:35:37 -04:00 |
|
Aidan C. Brady
|
fc138c57c2
|
Portable Tank now serves as a FluidContainerItem, now I just need to get fluid-accepting machines to recognize them
|
2014-07-10 13:30:58 -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
|
9dc1c1d1c6
|
Work on a more consistent tier system. Added Reinforced Alloy, renamed Atomic Core to Atomic Alloy, and changed the recipe of the Atomic Alloy to use multiple levels of Metallurgic Infuser processing. The Reinforced Alloy is in between.
|
2014-07-09 23:52:01 -04:00 |
|
Aidan C. Brady
|
23adf9ad24
|
Added Salt Blocks - generates similarly to clay. Added tooltips for config GUI. Added option to regenerate ores, as this is now a thing. Also...began implementing different tiers of control circuits.
|
2014-07-09 22:06:36 -04:00 |
|
Aidan C. Brady
|
63970a29ea
|
Upgraded gas item recipe integration greatly, should make things much smoother.
|
2014-07-09 17:05:33 -04:00 |
|
Aidan C. Brady
|
ee87d8cef5
|
Transmitter code cleanup - killed the now-unused merge() method and separated data handlers from ITransmitterNetwork itself. Also added new pipe textures.
|
2014-07-09 15:31:57 -04: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
|
098a74600c
|
Fixed PRC NEI issue, fixed bucket not sustaining inventory, fixed a few other things
|
2014-06-19 20:33:10 +02:00 |
|
Aidan C. Brady
|
fba83a3634
|
Fluidic Plenisher work - just about done!
|
2014-06-19 13:57:30 +02: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
|
a3784d1fe7
|
More portable tank work, mainly on GUIs
|
2014-06-18 21:05:32 +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
|
ead4af2f78
|
Fixed transporter item rendering, fixed WAILA display bug. Dispensers now eject balloon entities!
|
2014-06-17 18:21:59 +02:00 |
|
Aidan C. Brady
|
4fdae8cbef
|
Cherrypicked @dschub's vein fix - thanks!
|
2014-06-15 13:40:06 +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
|
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
|
dd83381774
|
Bug fixes!
|
2014-06-09 16:19:36 +02:00 |
|
Aidan C. Brady
|
726d9ebb0a
|
Atomic Disassembler now can cut down trees with vein mode
|
2014-06-09 15:57:38 +02:00 |
|
Aidan C. Brady
|
4334690f78
|
Improved localization
|
2014-06-09 15:29:00 +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
|
4446e14ba3
|
Sound system work
|
2014-06-02 23:57:40 +02:00 |
|
Aidan C. Brady
|
1933723b52
|
Major packet work, I think it's done. 34 errors to go!
|
2014-06-02 17:33:19 +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
|
fa0c2e6f12
|
More bits of work
|
2014-05-30 23:10:05 +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
|
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
|
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 |
|