Commit Graph
151 Commits
Author SHA1 Message Date
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 16c5f7cdb3 Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2014-07-10 16:25:04 -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
Ben Spiers 55b178b907 Revert "Start on Fusion Reactor logic and infrastructure. Currently experimenting with parameters for balance."
This reverts commit 7394ceda8f.
2014-07-10 19:22:54 +01: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 7394ceda8f Start on Fusion Reactor logic and infrastructure. Currently experimenting with parameters for balance. 2014-07-10 16:53:01 +01: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
Aidan C. Brady df31833cb6 Tiny cleanup 2014-07-08 14:13:29 -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 8a8086af3f Merge branch '1.7.10' into development 2014-07-07 15:45:33 +01:00
Ben Spiers f0ad905c07 Merge branch '1.7.10' into development
Conflicts:
	build.properties
	src/main/java/mekanism/common/Mekanism.java
	src/main/java/mekanism/common/voice/VoiceConnection.java
2014-07-07 15:43:53 +01:00
Ben Spiers 786d399c2c Require Forge 10.12.2.1147 or above. 2014-07-05 14:39:25 +01: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
Ben Spiers 1f12d2a91d 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 16:20:02 +01:00
Ben Spiers 3616d19147 Add dependencies to stop some crashes. 2014-06-27 16:20:02 +01:00
Dashkal 9b3ee926e2 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 16:20:02 +01:00
Aidan C. Brady de6d418697 Added a crafting recipe for rails using osmium. Thanks, casilleroatr 2014-06-27 10:56:56 -04: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 7ca2090bc7 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-26 23:43:35 -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
Ben Spiers ff1b3b792e Config GUIs are cool. 2014-06-27 03:22:46 +01:00
Ben Spiers ac223c8df5 Fix ic2 pulling and IConfigurable passthrough (leaving the OreDict fix for the Pull Request). getConnectedOutputters was broken. 2014-06-26 23:47:33 +01:00
Ben Spiers 3a027d0ef4 Aaaaaaand ComputerCraft. 2014-06-26 21:07:46 +01:00
Ben Spiers f463416c0c Metallurgy was easier than expected. 2014-06-26 20:18:03 +01:00
Ben Spiers 26463711de Galacticraft and MFR API Optional-ing 2014-06-26 20:17:45 +01:00
Ben Spiers 8ddda5d0dc BuildCraft now also working without shipping API 2014-06-26 19:28:40 +01:00
Ben Spiers 611d4c8f52 Got some IC2 stuff working now. Turns out I was being stupid. 2014-06-26 18:18:18 +01:00
Aidan C. Brady ab07313573 Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2014-06-26 01:20:15 -04:00
Aidan C. Brady bc3636aaec Quick cleanup 2014-06-26 01:20:09 -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
Ben Spiers 82a708c7b2 Remove bits of APIs that are unneeded. First step in attempting to Do It Right™ 2014-06-24 20:33:25 +01:00
Aidan C. Brady 576470784b Fix OreDict registration typo 2014-06-22 08:48:16 -04:00