Merge branch 'master' into development

This commit is contained in:
Aidan C. Brady committed 2014-07-26 17:39:03 -04:00
commit 2876eb535d
2 files changed
+21 -7

No files matched your search

@@ -27,7 +27,7 @@ public class FuelHandler
return fuels.get(gas.getName());
}
if(ModAPIManager.INSTANCE.hasAPI("BuildCraftAPI|fuel") && gas.hasFluid())
if(ModAPIManager.INSTANCE.hasAPI("BuildCraftAPI|fuels") && gas.hasFluid())
{
Fuel bcFuel = IronEngineFuel.getFuelForFluid(gas.getFluid());