Aidan Brady
81d3d53d76
Merge branch 'development' into 1.8
...
Conflicts:
src/main/java/mekanism/client/ClientTickHandler.java
src/main/java/mekanism/common/item/ItemConfigurator.java
src/main/java/mekanism/common/tile/TileEntityElectricPump.java
src/main/java/mekanism/generators/client/gui/GuiSolarGenerator.java
2014-08-07 12:29:43 -04:00
Ben Spiers
799f49d9b6
Move to Forge block rotation implementation.
...
Hopefully the configurator should rotate more stuff now and more wrenches should be able to rotate our blocks
2014-08-07 17:17:22 +01:00
Ben Spiers
1c71614c4a
Properly localise fluid names on machine blocks
2014-08-04 01:01:15 +01:00
Ben Spiers
14852b0b5d
Move some more code into the Blocks and Items classes, and fix the ObjectHolder annotations. Don't think it's going to be possible to make the Tools items work with ObjectHolder (they'd need to be final fields I think) because the material enums need to be initialised first.
2014-08-03 20:27:20 +01:00
Ben Spiers
2048083e11
Fix energy cubes not coming from NEI charged
2014-08-03 20:27:20 +01:00
Aidan Brady
dde9b53447
Fixed the addition of the "creative control circuit"
2014-07-31 21:08:46 -04:00
Ben Spiers
725b7463f0
Make the mod classes significantly less godlike.
...
Move Config variables into their own class, (in api because other stuff in API references config, may make sense to move it back to common later), and move Blocks and Items into final variables in their own classes. It looks a lot cleaner this way and my OCD can finally rest now.
2014-08-01 01:35:06 +01:00
Aidan Brady
6e975ee632
Made them really infinite
2014-07-31 19:29:49 -04:00
Aidan Brady
ed4aa7671c
Merge branch 'development' into 1.8
...
Conflicts:
src/main/java/mekanism/common/EnergyNetwork.java
2014-07-31 19:00:54 -04:00
Aidan Brady
7e378dd796
Fixed Atomic Disassembler issue
2014-07-31 18:57:18 -04: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
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
6470f69569
A big load of work on the new upgrade GUI
2014-07-22 20:37:53 -04:00
Aidan C. Brady
99482d8fd0
Fixed a minor issue
2014-07-21 22:24:27 -04:00
Aidan C. Brady
076c5f7377
More work!
2014-07-21 21:21:53 -04:00
Aidan C. Brady
7e525e10c6
Fixed a few recipes, also started work on Digital Miner visual
2014-07-20 23:29:35 -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
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