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
3f7de46991
Just about polished off baby skeletons, started on getting the Flamethrower to render with correct scale and orientation
2014-07-12 23:59:39 -04:00
Aidan C. Brady
6cc7efc64b
Merge branch 'master' into 1.8
2014-07-12 22:53:21 -04:00
Aidan C. Brady
c223eabb95
Fixed Combiner NEI texture, fixed Cardboard Box not working
2014-07-12 22:52:13 -04:00
Aidan C. Brady
6271284436
Merge branch '1.8' of https://github.com/aidancbrady/Mekanism into 1.8
2014-07-12 22:35:04 -04:00
Aidan C. Brady
9abc111ecd
Baby Skeletons, started work on Flamethrower
2014-07-12 22:34:58 -04:00
Ben Spiers
0638cdb61c
More work on Fusion Reactor and Lasers
2014-07-13 02:46:47 +01:00
Aidan C. Brady
cf6f5ab387
Bump versions to 8.0.0
2014-07-12 18:52:46 -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
Ben Spiers
df58560729
Clean up configs a lot; Fix Config GUIs. This will require people to sort out their configs on their own, as things have moved.
2014-07-07 21:23:04 +01:00
Aidan C. Brady
f67be01658
Tank-based fluid container interaction fixes. Can't figure out the data request issue.
2014-07-07 15:54:26 -04:00
Ben Spiers
5e08f8110a
We can depend on APIs directly now :)
2014-06-27 20:00:10 +01:00
Ben Spiers
589d5f420f
Recommit update changes that were seemingly lost in a rebase-pull.
2014-06-27 20:00:10 +01:00
Ben Spiers
55f8dbfbad
PacketDataRequest.onMessage is being called on the client side in SSP. Stop that from crashing the client, but is it a problem that it's being called at all?
2014-06-27 20:00:10 +01:00
Ben Spiers
9383ea24b6
Add dependencies to stop some crashes.
2014-06-27 20:00:09 +01:00
Dashkal
84bed9b2b1
Port to forge-10.12.2.1121 (was 10.12.1.1112)
...
* Updated build.properties
* Now using the new OreDictionary.getoreIDs() call to obtain oreDict names
* No longer modifying OreDictionary collections in ChemicalInjectionRecipeHandler
* No longer registering list redstone under oreRedstone (causes an NPE)
2014-06-27 20:00:09 +01:00
Aidan C. Brady
5397de0bfa
Added a crafting recipe for rails using osmium. Thanks, casilleroatr
2014-06-27 20:00:09 +01:00
Aidan C. Brady
205a6feab5
Revert "Update to 1.7.10. Thanks for getting the API stuff set up, @unpairedbracket, I'm using Forge 1152 now."
...
This reverts commit 604f138f71
.
2014-06-27 20:00:09 +01:00
Aidan C. Brady
3b5438a064
Merge branch 'master' into 1.7.10
...
Conflicts:
common/mekanism/common/PacketHandler.java
2014-06-26 23:47:43 -04:00
Aidan C. Brady
604f138f71
Update to 1.7.10. Thanks for getting the API stuff set up, @unpairedbracket, I'm using Forge 1152 now.
2014-06-26 23:40:02 -04:00
Ben Spiers
4d0f276e55
Fix a server crash relating to a client-side only class initialization (credit to @kosakriszi). Closes #1442 .
2014-06-27 03:25:47 +01:00