aidancbrady
398f0284a8
Merge branch '1.11' of https://github.com/aidancbrady/Mekanism into 1.11
...
# By Xander Victory
# Via GitHub (1) and Xander Victory (1)
* '1.11' of https://github.com/aidancbrady/Mekanism :
more !isEmpty checks to validate ItemStacks
more !isEmpty checks to validate ItemStacks
add @Nullable to internal ItemStack fields and also make sure they're not IS.isEmpty()
Fix some more null ItemStacks found with Idea
2017-06-15 19:42:27 -07:00
Xander Victory
f3cd020a31
more !isEmpty checks to validate ItemStacks
2017-06-14 14:16:37 +08:00
aidancbrady
e947ea0a8f
Updated IC2 API
2017-06-11 10:59:25 -07:00
Tom Elfring
66e885474c
Disable Metallurgy compat
2017-05-28 11:51:00 +02:00
Tom Elfring
d7f8b1c0ab
Disable MineFactoryReloaded compat
2017-05-28 11:48:57 +02:00
Tom Elfring
c7114e6f5b
Update WAILA to HWYLA and move to Gradle dependency
2017-05-28 11:47:45 +02:00
Tom Elfring
bdb408972e
Move OpenComputers to Gradle dependency
2017-05-28 11:46:03 +02:00
Tom Elfring
d76d7de871
Move InvTweaks to Gradle dependency
2017-05-28 11:44:27 +02:00
Tom Elfring
51ac2bddbe
Move Tesla to Gradle dependency
2017-05-28 11:41:49 +02:00
aidancbrady
85827362fe
Update IC2 API
2017-05-27 15:24:46 -07:00
aidancbrady
9db5a37d4b
More ItemStack fixes, thanks @thommy101
2017-04-10 23:45:53 -04:00
aidancbrady
6a42eb64e3
Update to 1.11.2. Untested, still using outdated MCMP
2017-03-25 20:35:26 -04:00
aidancbrady
309ed88a1e
Update Tesla API, render fixes
2016-08-04 15:19:36 -04:00
aidancbrady
c703ddf956
Official 1.10 port
...
- updated IC2 API
2016-07-14 02:24:31 -04:00
aidancbrady
e6da7fdc9c
Update to latest Forge, use Capability standards. Need to port to new fluid system
2016-06-23 16:34:27 -04:00
aidancbrady
1cc41c8722
Update IC2 API
2016-06-22 12:13:18 -04:00
aidancbrady
5f2d8d2b8e
Remove unnecessary API, hopefully fixed build
2016-06-15 21:01:59 -04:00
aidancbrady
c6a09b5658
<1500 errors
2016-05-24 21:22:39 -04:00
aidancbrady
374cc57515
Use new GlStateManager methods, got armor models to render (though the transformations seriously need to be updated)
2016-05-10 22:24:37 -04:00
Ben Spiers
84336ec4d1
Merge branch 'development' into 1.8.9
...
Huge merge with 202 conflicts, hopefully not *too* broken.
2016-03-18 04:24:19 +00:00
aidancbrady
1eff6ad6b8
Ship with CoFH energy API (as well as a few item tidbits). It's about time
2016-03-06 12:42:04 -05:00
Ben Spiers
18578139c4
Update some APIs
...
Is IC2 dead? Player's jenkins is down.
2016-01-25 20:25:17 +00:00
Ben Spiers
3126f144d2
API and other consistency fixes
2016-01-25 04:35:25 +00:00
Ben Spiers
8af7ec270a
Fix item package
2016-01-25 00:54:05 +00:00
Ben Spiers
a80f724cc2
Apply various common one-to-one replacements
...
More work on common too. network package now done.
2016-01-23 13:24:51 +00:00
Ben Spiers
569305d3cd
Some changes to external apis for EnumFacing
2016-01-22 00:21:12 +00:00
Ben Spiers
9b8d9d92d6
Start update to 1.8.9
...
Fix all references to cpw.mods.fml namespace
2016-01-14 19:22:48 +00:00
aidancbrady
de839808d7
Improved chemical machines side config
2015-11-26 10:39:36 -07:00
aidancbrady
0313e59b8f
BuildCraft API cleanup and update
2015-11-25 10:24:45 -07:00
Ben Spiers
22282fc838
Update BC API
2015-07-21 20:45:05 +01:00
aidancbrady
d39536d89c
Cool new factory textures (thanks @Radviger), also a (temporarily unused) OC layer. Does this look good @Vexatos?
2015-07-20 10:53:12 -07:00
aidancbrady
7799afed53
Go ahead and bump Forge to latest recommended, 1291 is looking too old
2015-07-14 14:22:27 -07:00
tterrag1098
b70c0e015f
Remove hard dep on unnecessarily new forge version
2015-05-13 17:18:21 -04:00
Ben Spiers
e6ee804686
Update forge again.
2015-04-17 18:27:41 +01:00
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