Aidan C. Brady
|
5513859216
|
Cleanup, updated IC2 API
|
2015-03-23 20:34:43 -04:00 |
|
Aidan C. Brady
|
2ebb4838e8
|
Waila integration - fixes issues with Induction Cells & Induction Providers, also fixed println
|
2015-03-22 01:33:17 -05:00 |
|
Aidan C. Brady
|
1580d968ec
|
Updated CoFH API
|
2015-03-16 11:12:48 -04:00 |
|
Aidan C. Brady
|
db5c2c3d2c
|
Added IToolHammer support
|
2014-11-21 08:17:47 -05:00 |
|
Aidan C. Brady
|
e6838c613c
|
Fixed up BC API
|
2014-11-15 18:02:35 -05:00 |
|
Ben Spiers
|
b31aa92844
|
Update lots of APIs, most notably BC and an actual 1.7 version of CC
Conflicts:
build.properties
src/api/java/buildcraft/api/core/BlockIndex.java
src/api/java/buildcraft/api/core/BuildCraftAPI.java
src/api/java/buildcraft/api/fuels/IFuel.java
src/api/java/buildcraft/api/mj/BatteryObject.java
src/api/java/buildcraft/api/mj/IBatteryIOObject.java
src/api/java/buildcraft/api/mj/IBatteryObject.java
src/api/java/buildcraft/api/mj/IOMode.java
src/api/java/buildcraft/api/mj/MjAPI.java
src/api/java/buildcraft/api/mj/MjBattery.java
src/api/java/buildcraft/api/power/PowerHandler.java
src/api/java/buildcraft/api/recipes/CraftingResult.java
src/api/java/buildcraft/api/recipes/IAssemblyRecipeManager.java
src/api/java/buildcraft/api/recipes/IFlexibleRecipe.java
src/api/java/buildcraft/api/recipes/IRefineryRecipeManager.java
src/api/java/buildcraft/api/transport/IPipe.java
src/main/java/mekanism/common/CommonProxy.java
src/main/java/mekanism/common/EnergyNetwork.java
src/main/java/mekanism/common/FuelHandler.java
src/main/java/mekanism/common/Mekanism.java
src/main/java/mekanism/common/base/IAdvancedBoundingBlock.java
src/main/java/mekanism/common/multipart/MultipartMekanism.java
src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java
src/main/java/mekanism/common/multipart/PartUniversalCable.java
src/main/java/mekanism/common/network/PacketConfigSync.java
src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java
src/main/java/mekanism/common/tile/TileEntityElectricBlock.java
src/main/java/mekanism/common/util/CableUtils.java
src/main/java/mekanism/common/util/MekanismUtils.java
src/main/java/mekanism/common/util/TransporterUtils.java
src/main/java/mekanism/generators/common/MekanismGenerators.java
src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java
src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java
src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java
src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java
src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java
src/main/java/mekanism/generators/common/tile/TileEntityWindTurbine.java
|
2014-11-13 19:30:39 +00:00 |
|
Aidan C. Brady
|
60bf7f5f3d
|
Merge branch 'development' into 1.8 (gosh darn conflicts)
Conflicts:
src/api/java/ic2/api/Direction.java
src/api/java/ic2/api/energy/NodeStats.java
src/main/java/mekanism/common/Mekanism.java
src/main/java/mekanism/common/block/BlockMachine.java
src/main/java/mekanism/common/tile/TileEntityElectricBlock.java
src/main/java/mekanism/common/util/MekanismUtils.java
src/main/java/mekanism/generators/common/block/BlockGenerator.java
|
2014-10-17 12:00:39 -04:00 |
|
Ben Spiers
|
4f41f5a1df
|
Prevent IC2 double-outputting.
|
2014-10-02 18:54:30 +01:00 |
|
Ben Spiers
|
3e71622d95
|
Update IC2 api
|
2014-10-02 18:54:30 +01:00 |
|
Aidan C. Brady
|
34bcc8d068
|
Updated IC2 API
|
2014-08-25 08:03:03 -04:00 |
|
Aidan C. Brady
|
1833bc0796
|
Implemented InvTweaks API. @unpairedbracket, mind sorting out the @Optional stuff for this? I'm not sure how to do that with annotations.
|
2014-08-11 12:31:40 -04:00 |
|
Aidan Brady
|
233f538d75
|
Merge branch 'development' into 1.8
|
2014-08-02 14:00:33 -04:00 |
|
Byron Shelden
|
0de28777c0
|
Updated the RP API to hash e853d244
|
2014-08-02 00:50:32 -07:00 |
|
Ben Spiers
|
d7c060d6fb
|
Update BC API and fix up EnergyNet and CableUtils to work with the new MjAPI
|
2014-07-31 18:41:32 +01:00 |
|
Aidan C. Brady
|
cfdaf37e4b
|
Moved MFR back into api package.
|
2014-07-12 16:10:10 -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
|
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 |
|
Ben Spiers
|
5e0dc25e2b
|
Update BC and IC2 APIs. Not updated Mek code to match yet.
|
2014-07-10 16:53:01 +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
|
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 |
|