Fix some merge dodginess.

This commit is contained in:
Ben Spiers committed 2014-11-13 22:18:26 +00:00
1 parent c5e8c866ce
commit 2507bd3ecb
5 files changed
+11 -11

No files matched your search

@@ -98,7 +98,7 @@ public class MekanismGenerators implements IModule
}
}
BuildcraftFuelRegistry.fuel.addFuel(FluidRegistry.getFluid("ethene"), (int)(240 * Mekanism.TO_TE), 40 * FluidContainerRegistry.BUCKET_VOLUME);
BuildcraftFuelRegistry.fuel.addFuel(FluidRegistry.getFluid("ethene"), (int)(240 * general.TO_TE), 40 * FluidContainerRegistry.BUCKET_VOLUME);
}
}