Commit graph

154 commits

Author SHA1 Message Date
Aidan C. Brady
7a67fbf7ca Fluidic Plenisher now detects block updates directly below it, and will replace the block if necessary. Will also no longer replace other source blocks. 2014-08-05 21:27:10 -04:00
Ben Spiers
9652b7adf6 Allow top/bottom to interact with charging slot
Might add side configuration and ejectors and stuff later, but fixes #1281. (Sorry it took so long.)
2014-08-04 20:15:10 +01:00
Ben Spiers
32a52c5f03 Fix the BuildCraft leak quickly
This is already solved in development branches but that commit would pull in a bunch of other stuff as well.
2014-08-03 03:14:17 +01:00
Ben Spiers
9f0e564013 Fix some Server-side packets being sent by the client
Conflicts:
	src/main/java/mekanism/common/tile/TileEntityEnergyCube.java
2014-08-03 02:48:59 +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
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
bb8985b6f8 Fixed a few energy transfer issues 2014-07-23 13:49:42 -04:00
Aidan C. Brady
2b5bb53bc6 Fixed a few recipe issues 2014-07-23 13:43:12 -04:00
Aidan C. Brady
0864e1061a Merge a few more fixes 2014-07-21 16:45:08 -04:00
Aidan C. Brady
27056da3e4 Merge back a few bug fixes 2014-07-21 16:41:27 -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
Aidan C. Brady
de1e264c68 Merge branch 'master' into development 2014-07-14 17:15:11 -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
Ben Spiers
c009940140 Fix Railcraft Dependency
This is such a pain.
2014-07-14 20:47:45 +01:00
Aidan C. Brady
a24bd2e7ad A bit of work on teleporter localization. There's something weird going on, though. 2014-07-14 12:57:57 -04:00
Aidan C. Brady
1094475344 Fixed teleporter crash, fixed asset issue 2014-07-13 23:52:17 -04:00
Aidan C. Brady
17f8fa11da Implemented robit crash fix 2014-07-13 23:34:01 -04:00
Ben Spiers
c560bdc2e1 Fix a different, unrelated OreDict issue. 2014-07-13 19:53:41 +01:00
Ben Spiers
3e3bf2c25c Fix Iron Dust smelting issue. Close #1478 2014-07-13 19:53:41 +01:00
Ben Spiers
4bea4c62fd Remove stray @Method
Should fix #1500
2014-07-13 05:06:57 +01:00
Aidan C. Brady
c223eabb95 Fixed Combiner NEI texture, fixed Cardboard Box not working 2014-07-12 22:52:13 -04:00
Ben Spiers
0758ad752b Fix un-checked MFR API usage 2014-07-12 21:04:33 +01:00
Aidan C. Brady
79f27e9d11 Merge branch 'master' of https://github.com/aidancbrady/Mekanism 2014-07-12 16:02:32 -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
Ben Spiers
a8bfe29c8e Depend on EnderIO and ExtraUtilities
If this doesn't fix it I don't know what will
2014-07-12 19:03:17 +01:00
Ben Spiers
f095cbd3fd Fix the BuildCraft API dependency
Hopefully fix some issues.
2014-07-12 18:46:43 +01:00
Aidan C. Brady
390f0b06bc Force Mekanism to load after FMP 2014-07-12 12:59:44 -04:00
Aidan C. Brady
6095f6e062 Fixed the evil mac sound bug by increasing the sampling rate and doubling the buffer size to two bytes. Also removed printlns. 2014-07-11 16:07:58 -04:00
Aidan C. Brady
177372e9fe Rewrote idle path calculations of Logistical Transporters!
Firstly, stacks will no longer will remember their home locations after a single failed home routing calculation.  More importantly, instead of recursively pathfinding the furthest transporter from a stack's current location, the stack will randomly select a direction to start traveling. Once it reaches the end of a line of transporters, it will attempt to recalculate a path to an inventory.  If it is unsuccessful, it will simply pick another direction to start traveling and the process will repeat.  This keeps the previous behavior, but does it much less CPU-intensively.
2014-07-11 14:52:55 -04:00
Aidan C. Brady
4ba9afb369 Updated recipes to be more consistent. This was about all I wanted to accomplish for v7...either I make Gas Cells tomorrow or I push the release. 2014-07-11 01:45:44 -04:00
Aidan C. Brady
ee00c5a22b Chemical Dissolution Chamber now can accept upgrades 2014-07-11 00:42:06 -04:00
Aidan C. Brady
60b226600f Fixes galore! 2014-07-11 00:34:05 -04:00
Aidan C. Brady
77d3469f61 Fix a few GUI bugs 2014-07-10 23:06:35 -04:00
Aidan C. Brady
171c9767e0 Chemical Crystallizer now accepts upgrades 2014-07-10 22:40:20 -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
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
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
377fff30ca We don't really need getLocation(), instead using Coord4D.get() with the getTile() method. 2014-07-09 15:37:43 -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
Aidan C. Brady
f405a9e2f0 Fixed transmitter recipes to more reasonable options. 2014-07-09 02:15:28 -04:00
Ben Spiers
4e32a77ac8 Fix Client/Server issues. 2014-07-07 23:33:48 +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