Merge remote-tracking branch 'origin/1.12' into 1.12

This commit is contained in:
modmuss50 2018-01-31 13:08:35 +00:00
commit a3d2aa9907

View file

@ -42,7 +42,7 @@ public class FluidGeneratorRecipes extends RecipeMethods {
register(EFluidGenerator.SEMIFLUID, ModFluids.SODIUM, 30);
register(EFluidGenerator.SEMIFLUID, ModFluids.LITHIUM, 60);
register(EFluidGenerator.SEMIFLUID, ModFluids.OIL, 64);
register(EFluidGenerator.SEMIFLUID, ModFluids.OIL, 16);
register(EFluidGenerator.THERMAL, FluidRegistry.LAVA, 60);