Ben Spiers
39509fc133
Fix I goofed.
2014-08-28 03:13:11 +01:00
Ben Spiers
dd3ae67750
Fix some pretty severe plenisher problems that must have gone a while relatively unnoticed.
2014-08-28 03:12:58 +01:00
Ben Spiers
40c06f1004
Fix secondary energy consumption with speed upgrades.
...
Might make them less efficient with speed upgrades and add a secondary
energy upgrade that mitigates this, like the current energy upgrade.
2014-08-27 02:17:45 +01:00
Aidan C. Brady
6714034771
Fixed RedstoneArsenal dependency
2014-08-24 16:32:20 -04:00
Aidan C. Brady
c364496212
Fixed the evil Bounding Block crash, fixed Dynamic Tank crashing when flowing icon is null
2014-08-24 09:46:38 -04:00
Aidan C. Brady
bbef6aa2b9
A couple crash fixes
2014-08-23 11:07:03 -04:00
Aidan C. Brady
a0622523d1
Added check for 7.0-7.1 Bin crashes
2014-08-20 14:38:11 -04:00
Aidan C. Brady
8c58a9eaed
Fixed crash related to OreDictCache
2014-08-19 19:06:50 -04:00
Ben Spiers
6316ec5fd5
Fix the network fix (doEmit was always being called with tryAgain false).
2014-08-19 16:42:38 +01:00
Aidan C. Brady
a8993cb223
Only break Logistical Sorter algorithm when items are actually sent
2014-08-19 08:35:43 -04:00
Ben Spiers
a9191fad32
Fix Dissolution Chamber upgrades.
...
Closes #1690
2014-08-16 17:22:07 +01:00
Ben Spiers
db3c7863fe
Cherry-pick:
...
Reduce default hydrogen energy density to match old hydrogen generator generation, by popular demand. Add comment to avoid confusion over electrolytic separator usage.
Conflicts:
src/main/java/mekanism/common/CommonProxy.java
2014-08-15 03:39:16 +01:00
Ben Spiers
7813fad1ab
Make redstone-split transmitters join correctly again. Presumably this being broken is why merge() was unused.
2014-08-14 23:30:27 +01:00
Aidan C. Brady
98ee002472
Merge back the network fixes
2014-08-09 13:43:59 -04:00
Aidan C. Brady
a3c6b9dac2
Fixed cable functionality
2014-08-09 13:28:40 -04:00
Aidan C. Brady
ed919fa19a
Fixed the no-update issues
2014-08-08 22:08:55 -04:00
Aidan Brady
a0b8ab0331
Quick cleanup
2014-08-08 21:25:59 -04:00
Aidan Brady
4d4926d0df
Fixed Dynamic Tanks not updating when being filled with buckets. I knew I missed something.
2014-08-08 21:21:28 -04:00
Ben Spiers
520bf46332
Fix my typo
2014-08-08 21:51:37 +01:00
Ben Spiers
cf18bc45a2
Remove unnecessary entity registrations - registerModEntity does it for us. Pray to any and all applicable supernatural entities that this solves the (EntityLivingBase)EntityBalloon crash
2014-08-08 18:25:47 +01:00
Aidan C. Brady
6ff0a147e4
More fixes
2014-08-08 00:00:33 -04:00
Aidan C. Brady
312c8ef127
Push back those fixes
2014-08-07 23:45:30 -04:00
Aidan C. Brady
12ad58b1f9
Turns out I was sending a ton of packets to the entire player list on the server when it wasn't actually necessary at all, switched to new sendToReceivers() method
2014-08-07 22:48:35 -04:00
Aidan C. Brady
7634c29df9
Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development
2014-08-07 21:33:23 -04:00
Aidan C. Brady
1fd5e498e8
Major packet improvements - trying to get on the good side of server owners. More to come.
...
Instead of sending to all players in a dimension or within a defined range, packets will now only be sent to players who have the chunk loaded that the packet is being sent from on the server.
2014-08-07 21:33:17 -04:00
Aidan Brady
008afaf359
Merge branch 'master' into development
2014-08-07 12:21:11 -04:00
Ben Spiers
91dbb7fcd6
Add CC IPeripheralProvider to Bounding, EnergyCube and Generator blocks
2014-08-07 17:17:22 +01: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
2ba639f8fc
Fix running with Forestry but not BC.
2014-08-07 03:58:01 +01:00
Aidan Brady
78c0cc4c7c
Fixed an issue where networks would be forgotten, made shift-M turn jetpack off immediately, simplified network code a bit
2014-08-06 18:25:33 -04:00
Aidan Brady
08914da371
Fixed Electric Pump lag - was able to completely eliminate system of node cleaning while boosting performance immensely
2014-08-06 13:44:59 -04:00
Aidan Brady
20dc1ae28a
Bump version to 7.1.0.
2014-08-06 12:51:48 -04:00
Aidan Brady
7c8208026b
Merge branch 'master' into development
2014-08-06 12:34:46 -04:00
Aidan Brady
1896a42afa
Cleaned up that fix
2014-08-05 22:31:57 -04:00
Ben Spiers
a865a19340
Implement canConnectEnergy so RF cables don't connect when they shouldn't
2014-08-06 02:51:25 +01:00
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
Aidan C. Brady
12215490f0
Fixed a Digital Miner oversight, fixed Bins losing NBT data and allow Bins to accept items with varying item damage
2014-08-05 20:58:22 -04:00
Aidan C. Brady
87c7d888f5
Merge branch 'master' into development
2014-08-05 16:56:02 -04:00
Aidan C. Brady
ed9db80245
Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development
2014-08-05 16:53:48 -04:00
Aidan C. Brady
27b61e288a
Fixed a few bugs
2014-08-05 16:53:40 -04:00
Aidan
92cfc31223
Merge pull request #1625 from jstockwin/development
...
Fixed some Electric Chest bugs
2014-08-05 16:52:28 -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
Aidan C. Brady
04987a5626
Merge branch 'master' into development
2014-08-03 02:52:40 -04: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
jstockwin
79ce886df2
Fixed some Electric Chest bugs
...
Electric Chest was not updating when it was (un)locked, meaning that
mechanical pipes would not (dis)connect and reconnect.
Also noticed that Electric Chest won't accept transporters connecting to
the bottom, which I thought was odd, however it looked intentional so I
left it alone. (..?)
Also made it so electric chests will not open if there is a solid block
above them.
2014-08-03 01:00:16 +01:00
Aidan Brady
7e378dd796
Fixed Atomic Disassembler issue
2014-07-31 18:57:18 -04:00
Aidan Brady
b2e676aabb
Fixed an API issue, fixed Robit nametag not updating, fixed Sorter Mod ID filter bugginess
2014-07-31 18:41:27 -04:00
Aidan Brady
269343f9f0
Revert back to the old method of power distribution to fix BuildCraft issues. We shouldn't try to make up for other mods' bugs.
2014-07-31 18:17:03 -04:00
Ben Spiers
59dab7c848
Move StackUtil to api package for not causing errors.
2014-07-31 15:58:02 +01:00
Ben Spiers
c339ee7a18
Merge branch 'master' into development
2014-07-28 17:33:09 +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
d0d660b9d4
Merge branch 'master' into development
2014-07-27 20:45:53 +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
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
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