mirror of
https://github.com/GTNewHorizons/ForestryMC.git
synced 2026-11-22 12:59:44 +00:00
Merge branch 'dev' into inventory-cleanup
Conflicts: src/main/java/forestry/apiculture/gadgets/TileAlvearyHygroregulator.java src/main/java/forestry/core/circuits/ItemSolderingIron.java src/main/java/forestry/core/gadgets/TileAnalyzer.java src/main/java/forestry/energy/gadgets/EngineBronze.java src/main/java/forestry/energy/gadgets/MachineGenerator.java src/main/java/forestry/factory/gadgets/MachineBottler.java src/main/java/forestry/factory/gadgets/MachineCarpenter.java src/main/java/forestry/factory/gadgets/MachineFabricator.java src/main/java/forestry/factory/gadgets/MachineMoistener.java src/main/java/forestry/factory/gadgets/MachineRaintank.java src/main/java/forestry/factory/gadgets/MachineSqueezer.java src/main/java/forestry/factory/gadgets/MachineStill.java src/main/java/forestry/mail/gadgets/MachineTrader.java
This commit is contained in:
commit
db93c6e930
107 files changed
+1673
-1763
No files matched your search
@@ -13,7 +13,7 @@ package forestry.energy.gadgets;
|
||||
import buildcraft.api.statements.ITriggerExternal;
|
||||
import cpw.mods.fml.common.Optional;
|
||||
import cpw.mods.fml.common.registry.GameData;
|
||||
import forestry.api.core.EnumErrorCode;
|
||||
import forestry.core.EnumErrorCode;
|
||||
import forestry.api.core.ForestryAPI;
|
||||
import forestry.api.fuels.FuelManager;
|
||||
import forestry.core.TemperatureState;
|
||||
|
||||
Reference in new issue
Block a user