mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-22 04:52:25 +00:00
* development: Added Fluid Tank comparator support, fixed Gas Tank comparator support Implement config option for operators to bypass security, added turbine dump/dump excess functionality Fixed Tesseract and Flux Duct support Updated IC2 API, fixed integration Conflicts: src/api/java/ic2/api/Direction.class src/api/java/ic2/api/Direction.java src/api/java/ic2/api/crops/CropCard.class src/api/java/ic2/api/crops/CropCard.java src/api/java/ic2/api/crops/ICropTile.class src/api/java/ic2/api/crops/ICropTile.java src/api/java/ic2/api/energy/prefab/BasicSink.class src/api/java/ic2/api/energy/prefab/BasicSource.class src/api/java/ic2/api/info/Info.class src/api/java/ic2/api/item/IC2Items.class src/api/java/ic2/api/item/ILatheItem.class src/api/java/ic2/api/item/ILatheItem.java src/api/java/ic2/api/network/NetworkHelper.class src/api/java/ic2/api/network/NetworkHelper.java src/api/java/ic2/api/recipe/RecipeInputFluidContainer.class src/api/java/ic2/api/recipe/RecipeInputOreDict.class src/api/java/ic2/api/recipe/Recipes.class src/api/java/ic2/api/recipe/Recipes.java src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java src/main/java/mekanism/common/block/BlockMachine.java src/main/java/mekanism/common/tile/TileEntityFluidTank.java src/main/java/mekanism/common/util/SecurityUtils.java src/main/java/mekanism/generators/client/gui/GuiIndustrialTurbine.java src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineValve.java