From 179311a390623e47d268070358b943a24e7061e0 Mon Sep 17 00:00:00 2001 From: mezz Date: Thu, 3 Dec 2015 10:01:27 -0800 Subject: [PATCH 1/2] Use 2 render passes for saplings (for addon saplings via tree api) --- src/main/java/forestry/arboriculture/items/ItemGermlingGE.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/forestry/arboriculture/items/ItemGermlingGE.java b/src/main/java/forestry/arboriculture/items/ItemGermlingGE.java index fcf8733f7..18031fe4b 100755 --- a/src/main/java/forestry/arboriculture/items/ItemGermlingGE.java +++ b/src/main/java/forestry/arboriculture/items/ItemGermlingGE.java @@ -127,7 +127,7 @@ public class ItemGermlingGE extends ItemGE implements IVariableFermentable { @Override public int getRenderPasses(int metadata) { - return type == EnumGermlingType.SAPLING ? 1 : 2; + return 2; } @Override From 6b9614bccd7f45d8fd13b0c45cdcbab15713c6f9 Mon Sep 17 00:00:00 2001 From: mezz Date: Thu, 3 Dec 2015 10:07:51 -0800 Subject: [PATCH 2/2] Fix #994 Peat-fired Engine no longer accepts Bituminous Peat --- src/main/java/forestry/plugins/PluginFactory.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/forestry/plugins/PluginFactory.java b/src/main/java/forestry/plugins/PluginFactory.java index cd27fb845..0a2ccb6c3 100644 --- a/src/main/java/forestry/plugins/PluginFactory.java +++ b/src/main/java/forestry/plugins/PluginFactory.java @@ -156,7 +156,7 @@ public class PluginFactory extends ForestryPlugin { ItemStack peat = coreItems.peat.getItemStack(); FuelManager.copperEngineFuel.put(peat, new EngineCopperFuel(peat, Constants.ENGINE_COPPER_FUEL_VALUE_PEAT, Constants.ENGINE_COPPER_CYCLE_DURATION_PEAT)); - ItemStack bituminousPeat = coreItems.peat.getItemStack(); + ItemStack bituminousPeat = coreItems.bituminousPeat.getItemStack(); FuelManager.copperEngineFuel.put(bituminousPeat, new EngineCopperFuel(bituminousPeat, Constants.ENGINE_COPPER_FUEL_VALUE_BITUMINOUS_PEAT, Constants.ENGINE_COPPER_CYCLE_DURATION_BITUMINOUS_PEAT)); FuelManager.bronzeEngineFuel.put(Fluids.BIOMASS.getFluid(), new EngineBronzeFuel(Fluids.BIOMASS.getFluid(),