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
ba71f26a75
Updated Forge
2014-08-25 08:43:16 -04:00
Ben Spiers
e6957c1561
Update Forge
2014-08-05 01:49:25 +01:00
Aidan C. Brady
cf6f5ab387
Bump versions to 8.0.0
2014-07-12 18:52:46 -04:00
Aidan C. Brady
d72ce6532b
Updated Forge to 10.13.0.1180.
2014-07-12 12:35:42 -04:00
Aidan C. Brady
ab0f002c5e
Fixed FMP version!
2014-07-12 01:17:21 -04:00
Aidan C. Brady
f597bce107
Updated Forge to 1179
2014-07-11 22:25:06 -04: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
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
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
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
Aidan C. Brady
7b6eb46a33
Hopefully fixed Forge
2014-06-14 00:22:15 +02:00
Aidan C. Brady
c9ce7f1983
Hopefully got NEI to download
2014-06-13 19:45:28 +02:00
Aidan C. Brady
5a4b229ca6
Whoops
2014-06-13 12:41:26 +02:00
Aidan C. Brady
c2e0e2eb44
Try updating forge
2014-06-13 12:40:08 +02:00
Aidan C. Brady
8b7904563d
Hopefully fix something
2014-06-13 12:27:35 +02:00
Aidan C. Brady
dd4fa16d00
Update FMP and CCLIB versions
2014-06-13 00:45:28 +02:00
Aidan C. Brady
43a80c7a89
Update forge version
2014-06-13 00:34:54 +02:00
Aidan C. Brady
c72e1c6efc
Work on transmitters
2014-06-08 01:17:47 +02:00
Aidan C. Brady
b387c8529d
Bumped version to 7.0.0, a few fixes and enhancements
2014-06-06 00:16:36 +02:00
Ben Spiers
ab47724473
Move the directory structure around to a more conventional one and start out on the 1.7 update.
...
3797 errors. We have a long way to go.
2014-04-20 03:44:06 +01:00
Aidan C. Brady
8b70e0d50d
v6.0.4 push
2014-03-07 10:46:43 -05:00
Aidan Brady
8070b3ebd7
Bump version to 6.0.3
2014-03-01 11:12:04 -05:00
Aidan Brady
84d300993b
Fix a teleporter issue, bump version number to 6.0.2
2014-02-22 13:58:35 -05:00
Aidan Brady
84b940c586
v6.0.1 release
2014-02-17 12:58:14 -05:00
Aidan Brady
1835f6ff91
Update TE, add module config syncing
2014-01-03 14:26:41 -05:00
Aidan C. Brady
6837b1fb66
Bumped version!
2013-10-29 19:31:26 -04:00
Ben Spiers
9c0b2a56b5
Update to 1.6.4. I hope this works.
2013-09-28 03:37:48 +01:00
Aidan Brady
13400fdc3d
Bumped version to 5.5.7
2013-07-20 12:35:37 -04:00
Aidan Brady
44be9a19b9
v5.5.6 Beta #1
...
*Added Robit.
*Added Chargepads.
*Fixed swords not able to be enchanted.
*Energy displayed in tooltip when mouse hovering over display bar on
GUIs.
*General cleanups.
*Fixed incorrect machine inventory configuration.
2013-05-19 18:43:01 -04:00
Aidan Brady
136e8a537c
v5.5.5 Beta #10
...
*Fixed energy cubes rendering with incorrect rotation.
*Thermal Expansion item charging!
2013-05-07 16:45:34 -04:00
Aidan Brady
557d12bc0c
v5.5.5 Beta #1
...
*Version bumped to v5.5.5.
*Fixed API bug.
*New item charging system.
*Began removing UE references for reliancy.
2013-04-23 15:36:43 -04:00
Aidan Brady
0bf90e75d9
Attempted Jenkins builds
2013-04-13 11:42:11 -04:00
