BuildCraft 7.1.23 - fix #3839, fix #3837

2017-11-10 19:30:16 +01:00 · 2017-11-10 19:30:16 +01:00 · b429080afc
parent a0faa7a202
commit b429080afc
825 changed files with 914 additions and 830 deletions
--- a/api/buildcraft/api/blocks/package-info.java
+++ b/api/buildcraft/api/blocks/package-info.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * The BuildCraft API is distributed under the terms of the MIT License.
--- a/api/buildcraft/api/blueprints/BlueprintDeployer.java
+++ b/api/buildcraft/api/blueprints/BlueprintDeployer.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * The BuildCraft API is distributed under the terms of the MIT License.
--- a/api/buildcraft/api/blueprints/BuilderAPI.java
+++ b/api/buildcraft/api/blueprints/BuilderAPI.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * The BuildCraft API is distributed under the terms of the MIT License.
--- a/api/buildcraft/api/blueprints/BuildingPermission.java
+++ b/api/buildcraft/api/blueprints/BuildingPermission.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * The BuildCraft API is distributed under the terms of the MIT License.
--- a/api/buildcraft/api/blueprints/IBuilderContext.java
+++ b/api/buildcraft/api/blueprints/IBuilderContext.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * The BuildCraft API is distributed under the terms of the MIT License.
--- a/api/buildcraft/api/blueprints/ISchematicRegistry.java
+++ b/api/buildcraft/api/blueprints/ISchematicRegistry.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * The BuildCraft API is distributed under the terms of the MIT License.
--- a/api/buildcraft/api/blueprints/ITileBuilder.java
+++ b/api/buildcraft/api/blueprints/ITileBuilder.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * The BuildCraft API is distributed under the terms of the MIT License.
--- a/api/buildcraft/api/blueprints/MappingNotFoundException.java
+++ b/api/buildcraft/api/blueprints/MappingNotFoundException.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * The BuildCraft API is distributed under the terms of the MIT License.
--- a/api/buildcraft/api/blueprints/MappingRegistry.java
+++ b/api/buildcraft/api/blueprints/MappingRegistry.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * The BuildCraft API is distributed under the terms of the MIT License.
--- a/api/buildcraft/api/blueprints/Schematic.java
+++ b/api/buildcraft/api/blueprints/Schematic.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * The BuildCraft API is distributed under the terms of the MIT License.
--- a/api/buildcraft/api/blueprints/SchematicBlock.java
+++ b/api/buildcraft/api/blueprints/SchematicBlock.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * The BuildCraft API is distributed under the terms of the MIT License.
--- a/api/buildcraft/api/blueprints/SchematicBlockBase.java
+++ b/api/buildcraft/api/blueprints/SchematicBlockBase.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * The BuildCraft API is distributed under the terms of the MIT License.
--- a/api/buildcraft/api/blueprints/SchematicEntity.java
+++ b/api/buildcraft/api/blueprints/SchematicEntity.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * The BuildCraft API is distributed under the terms of the MIT License.
--- a/api/buildcraft/api/blueprints/SchematicFactory.java
+++ b/api/buildcraft/api/blueprints/SchematicFactory.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * The BuildCraft API is distributed under the terms of the MIT License.
--- a/api/buildcraft/api/blueprints/SchematicFluid.java
+++ b/api/buildcraft/api/blueprints/SchematicFluid.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * The BuildCraft API is distributed under the terms of the MIT License.
--- a/api/buildcraft/api/blueprints/SchematicMask.java
+++ b/api/buildcraft/api/blueprints/SchematicMask.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * The BuildCraft API is distributed under the terms of the MIT License.
--- a/api/buildcraft/api/blueprints/SchematicTile.java
+++ b/api/buildcraft/api/blueprints/SchematicTile.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * The BuildCraft API is distributed under the terms of the MIT License.
--- a/api/buildcraft/api/blueprints/Translation.java
+++ b/api/buildcraft/api/blueprints/Translation.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * The BuildCraft API is distributed under the terms of the MIT License.
--- a/api/buildcraft/api/blueprints/package-info.java
+++ b/api/buildcraft/api/blueprints/package-info.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * The BuildCraft API is distributed under the terms of the MIT License.
--- a/api/buildcraft/api/boards/IRedstoneBoard.java
+++ b/api/buildcraft/api/boards/IRedstoneBoard.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * The BuildCraft API is distributed under the terms of the MIT License.
--- a/api/buildcraft/api/boards/RedstoneBoardNBT.java
+++ b/api/buildcraft/api/boards/RedstoneBoardNBT.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * The BuildCraft API is distributed under the terms of the MIT License.
--- a/api/buildcraft/api/boards/RedstoneBoardRegistry.java
+++ b/api/buildcraft/api/boards/RedstoneBoardRegistry.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * The BuildCraft API is distributed under the terms of the MIT License.
--- a/api/buildcraft/api/boards/RedstoneBoardRobot.java
+++ b/api/buildcraft/api/boards/RedstoneBoardRobot.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * The BuildCraft API is distributed under the terms of the MIT License.
--- a/api/buildcraft/api/boards/RedstoneBoardRobotNBT.java
+++ b/api/buildcraft/api/boards/RedstoneBoardRobotNBT.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * The BuildCraft API is distributed under the terms of the MIT License.
--- a/api/buildcraft/api/boards/package-info.java
+++ b/api/buildcraft/api/boards/package-info.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * The BuildCraft API is distributed under the terms of the MIT License.
--- a/api/buildcraft/api/core/BCLog.java
+++ b/api/buildcraft/api/core/BCLog.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * The BuildCraft API is distributed under the terms of the MIT License.
--- a/api/buildcraft/api/core/BlockIndex.java
+++ b/api/buildcraft/api/core/BlockIndex.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * The BuildCraft API is distributed under the terms of the MIT License.
--- a/api/buildcraft/api/core/BuildCraftAPI.java
+++ b/api/buildcraft/api/core/BuildCraftAPI.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * The BuildCraft API is distributed under the terms of the MIT License.
--- a/api/buildcraft/api/core/EnumColor.java
+++ b/api/buildcraft/api/core/EnumColor.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * The BuildCraft API is distributed under the terms of the MIT License.
--- a/api/buildcraft/api/core/IAreaProvider.java
+++ b/api/buildcraft/api/core/IAreaProvider.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * The BuildCraft API is distributed under the terms of the MIT License.
--- a/api/buildcraft/api/core/IBox.java
+++ b/api/buildcraft/api/core/IBox.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * The BuildCraft API is distributed under the terms of the MIT License.
--- a/api/buildcraft/api/core/ICoreProxy.java
+++ b/api/buildcraft/api/core/ICoreProxy.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * The BuildCraft API is distributed under the terms of the MIT License.
--- a/api/buildcraft/api/core/IIconProvider.java
+++ b/api/buildcraft/api/core/IIconProvider.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * The BuildCraft API is distributed under the terms of the MIT License.
--- a/api/buildcraft/api/core/IInvSlot.java
+++ b/api/buildcraft/api/core/IInvSlot.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * The BuildCraft API is distributed under the terms of the MIT License.
--- a/api/buildcraft/api/core/ISerializable.java
+++ b/api/buildcraft/api/core/ISerializable.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * BuildCraft is distributed under the terms of the Minecraft Mod Public
--- a/api/buildcraft/api/core/IWorldProperty.java
+++ b/api/buildcraft/api/core/IWorldProperty.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * The BuildCraft API is distributed under the terms of the MIT License.
--- a/api/buildcraft/api/core/IZone.java
+++ b/api/buildcraft/api/core/IZone.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * The BuildCraft API is distributed under the terms of the MIT License.
--- a/api/buildcraft/api/core/JavaTools.java
+++ b/api/buildcraft/api/core/JavaTools.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * The BuildCraft API is distributed under the terms of the MIT License.
--- a/api/buildcraft/api/core/Position.java
+++ b/api/buildcraft/api/core/Position.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * The BuildCraft API is distributed under the terms of the MIT License.
--- a/api/buildcraft/api/core/SafeTimeTracker.java
+++ b/api/buildcraft/api/core/SafeTimeTracker.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * The BuildCraft API is distributed under the terms of the MIT License.
--- a/api/buildcraft/api/core/StackKey.java
+++ b/api/buildcraft/api/core/StackKey.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * The BuildCraft API is distributed under the terms of the MIT License.
--- a/api/buildcraft/api/core/package-info.java
+++ b/api/buildcraft/api/core/package-info.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * The BuildCraft API is distributed under the terms of the MIT License.
--- a/api/buildcraft/api/core/render/ICullable.java
+++ b/api/buildcraft/api/core/render/ICullable.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * BuildCraft is distributed under the terms of the Minecraft Mod Public
--- a/api/buildcraft/api/core/render/ITextureStates.java
+++ b/api/buildcraft/api/core/render/ITextureStates.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * BuildCraft is distributed under the terms of the Minecraft Mod Public
--- a/api/buildcraft/api/crops/package-info.java
+++ b/api/buildcraft/api/crops/package-info.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * The BuildCraft API is distributed under the terms of the MIT License.
--- a/api/buildcraft/api/events/BlockInteractionEvent.java
+++ b/api/buildcraft/api/events/BlockInteractionEvent.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * The BuildCraft API is distributed under the terms of the MIT License.
--- a/api/buildcraft/api/events/RobotEvent.java
+++ b/api/buildcraft/api/events/RobotEvent.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * The BuildCraft API is distributed under the terms of the MIT License.
--- a/api/buildcraft/api/events/package-info.java
+++ b/api/buildcraft/api/events/package-info.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * The BuildCraft API is distributed under the terms of the MIT License.
--- a/api/buildcraft/api/facades/FacadeType.java
+++ b/api/buildcraft/api/facades/FacadeType.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * The BuildCraft API is distributed under the terms of the MIT License.
--- a/api/buildcraft/api/facades/IFacadeItem.java
+++ b/api/buildcraft/api/facades/IFacadeItem.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * The BuildCraft API is distributed under the terms of the MIT License.
--- a/api/buildcraft/api/facades/package-info.java
+++ b/api/buildcraft/api/facades/package-info.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * The BuildCraft API is distributed under the terms of the MIT License.
--- a/api/buildcraft/api/filler/FillerManager.java
+++ b/api/buildcraft/api/filler/FillerManager.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * The BuildCraft API is distributed under the terms of the MIT License.
--- a/api/buildcraft/api/filler/IFillerPattern.java
+++ b/api/buildcraft/api/filler/IFillerPattern.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * The BuildCraft API is distributed under the terms of the MIT License.
--- a/api/buildcraft/api/filler/IFillerRegistry.java
+++ b/api/buildcraft/api/filler/IFillerRegistry.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * The BuildCraft API is distributed under the terms of the MIT License.
--- a/api/buildcraft/api/filler/package-info.java
+++ b/api/buildcraft/api/filler/package-info.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * The BuildCraft API is distributed under the terms of the MIT License.
--- a/api/buildcraft/api/fuels/BuildcraftFuelRegistry.java
+++ b/api/buildcraft/api/fuels/BuildcraftFuelRegistry.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * The BuildCraft API is distributed under the terms of the MIT License.
--- a/api/buildcraft/api/fuels/ICoolant.java
+++ b/api/buildcraft/api/fuels/ICoolant.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * The BuildCraft API is distributed under the terms of the MIT License.
--- a/api/buildcraft/api/fuels/ICoolantManager.java
+++ b/api/buildcraft/api/fuels/ICoolantManager.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * The BuildCraft API is distributed under the terms of the MIT License.
--- a/api/buildcraft/api/fuels/IFuel.java
+++ b/api/buildcraft/api/fuels/IFuel.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * The BuildCraft API is distributed under the terms of the MIT License.
--- a/api/buildcraft/api/fuels/IFuelManager.java
+++ b/api/buildcraft/api/fuels/IFuelManager.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * The BuildCraft API is distributed under the terms of the MIT License.
--- a/api/buildcraft/api/fuels/ISolidCoolant.java
+++ b/api/buildcraft/api/fuels/ISolidCoolant.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * The BuildCraft API is distributed under the terms of the MIT License.
--- a/api/buildcraft/api/fuels/package-info.java
+++ b/api/buildcraft/api/fuels/package-info.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * The BuildCraft API is distributed under the terms of the MIT License.
--- a/api/buildcraft/api/gates/GateExpansionController.java
+++ b/api/buildcraft/api/gates/GateExpansionController.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * The BuildCraft API is distributed under the terms of the MIT License.
--- a/api/buildcraft/api/gates/GateExpansions.java
+++ b/api/buildcraft/api/gates/GateExpansions.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * The BuildCraft API is distributed under the terms of the MIT License.
--- a/api/buildcraft/api/gates/IGate.java
+++ b/api/buildcraft/api/gates/IGate.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * The BuildCraft API is distributed under the terms of the MIT License.
--- a/api/buildcraft/api/gates/IGateExpansion.java
+++ b/api/buildcraft/api/gates/IGateExpansion.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * The BuildCraft API is distributed under the terms of the MIT License.
--- a/api/buildcraft/api/gates/package-info.java
+++ b/api/buildcraft/api/gates/package-info.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * The BuildCraft API is distributed under the terms of the MIT License.
--- a/api/buildcraft/api/items/package-info.java
+++ b/api/buildcraft/api/items/package-info.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * The BuildCraft API is distributed under the terms of the MIT License.
--- a/api/buildcraft/api/library/package-info.java
+++ b/api/buildcraft/api/library/package-info.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * The BuildCraft API is distributed under the terms of the MIT License.
--- a/api/buildcraft/api/lists/package-info.java
+++ b/api/buildcraft/api/lists/package-info.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * The BuildCraft API is distributed under the terms of the MIT License.
--- a/api/buildcraft/api/package-info.java
+++ b/api/buildcraft/api/package-info.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * The BuildCraft API is distributed under the terms of the MIT License.
--- a/api/buildcraft/api/power/IEngine.java
+++ b/api/buildcraft/api/power/IEngine.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * The BuildCraft API is distributed under the terms of the MIT License.
--- a/api/buildcraft/api/power/ILaserTarget.java
+++ b/api/buildcraft/api/power/ILaserTarget.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * The BuildCraft API is distributed under the terms of the MIT License.
--- a/api/buildcraft/api/power/ILaserTargetBlock.java
+++ b/api/buildcraft/api/power/ILaserTargetBlock.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * The BuildCraft API is distributed under the terms of the MIT License.
--- a/api/buildcraft/api/power/IRedstoneEngine.java
+++ b/api/buildcraft/api/power/IRedstoneEngine.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * The BuildCraft API is distributed under the terms of the MIT License.
--- a/api/buildcraft/api/power/IRedstoneEngineReceiver.java
+++ b/api/buildcraft/api/power/IRedstoneEngineReceiver.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * The BuildCraft API is distributed under the terms of the MIT License.
--- a/api/buildcraft/api/power/package-info.java
+++ b/api/buildcraft/api/power/package-info.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * The BuildCraft API is distributed under the terms of the MIT License.
--- a/api/buildcraft/api/recipes/BuildcraftRecipeRegistry.java
+++ b/api/buildcraft/api/recipes/BuildcraftRecipeRegistry.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * The BuildCraft API is distributed under the terms of the MIT License.
--- a/api/buildcraft/api/recipes/CraftingResult.java
+++ b/api/buildcraft/api/recipes/CraftingResult.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * The BuildCraft API is distributed under the terms of the MIT License.
--- a/api/buildcraft/api/recipes/IAssemblyRecipeManager.java
+++ b/api/buildcraft/api/recipes/IAssemblyRecipeManager.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * The BuildCraft API is distributed under the terms of the MIT License.
--- a/api/buildcraft/api/recipes/IFlexibleCrafter.java
+++ b/api/buildcraft/api/recipes/IFlexibleCrafter.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * The BuildCraft API is distributed under the terms of the MIT License.
--- a/api/buildcraft/api/recipes/IFlexibleRecipe.java
+++ b/api/buildcraft/api/recipes/IFlexibleRecipe.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * The BuildCraft API is distributed under the terms of the MIT License.
--- a/api/buildcraft/api/recipes/IFlexibleRecipeIngredient.java
+++ b/api/buildcraft/api/recipes/IFlexibleRecipeIngredient.java
@ -0,0 +1,16 @@
+/**
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
+ * http://www.mod-buildcraft.com
+ *
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
+ */
+package buildcraft.api.recipes;
+
+public interface IFlexibleRecipeIngredient {
+    /**
+     * @return An ItemStack, FluidStack or List of ItemStacks containing the matches for this ingredient.
+     */
+    Object getIngredient();
+}
--- a/api/buildcraft/api/recipes/IFlexibleRecipeViewable.java
+++ b/api/buildcraft/api/recipes/IFlexibleRecipeViewable.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * The BuildCraft API is distributed under the terms of the MIT License.
--- a/api/buildcraft/api/recipes/IIntegrationRecipe.java
+++ b/api/buildcraft/api/recipes/IIntegrationRecipe.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * The BuildCraft API is distributed under the terms of the MIT License.
--- a/api/buildcraft/api/recipes/IIntegrationRecipeManager.java
+++ b/api/buildcraft/api/recipes/IIntegrationRecipeManager.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * The BuildCraft API is distributed under the terms of the MIT License.
--- a/api/buildcraft/api/recipes/IProgrammingRecipeManager.java
+++ b/api/buildcraft/api/recipes/IProgrammingRecipeManager.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * The BuildCraft API is distributed under the terms of the MIT License.
--- a/api/buildcraft/api/recipes/IRecipeManager.java
+++ b/api/buildcraft/api/recipes/IRecipeManager.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * The BuildCraft API is distributed under the terms of the MIT License.
--- a/api/buildcraft/api/recipes/IRefineryRecipeManager.java
+++ b/api/buildcraft/api/recipes/IRefineryRecipeManager.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * The BuildCraft API is distributed under the terms of the MIT License.
--- a/api/buildcraft/api/recipes/RecipeRegistry.java
+++ b/api/buildcraft/api/recipes/RecipeRegistry.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * The BuildCraft API is distributed under the terms of the MIT License.
--- a/api/buildcraft/api/recipes/package-info.java
+++ b/api/buildcraft/api/recipes/package-info.java
@ -1,12 +1,12 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * The BuildCraft API is distributed under the terms of the MIT License.
 * Please check the contents of the license, which should be located
 * as "LICENSE.API" in the BuildCraft source code distribution.
 */
-@API(apiVersion = "3.0", owner = "BuildCraftAPI|core", provides = "BuildCraftAPI|recipes")
+@API(apiVersion = "3.1", owner = "BuildCraftAPI|core", provides = "BuildCraftAPI|recipes")
 package buildcraft.api.recipes;
 import cpw.mods.fml.common.API;

--- a/api/buildcraft/api/robots/AIRobot.java
+++ b/api/buildcraft/api/robots/AIRobot.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * The BuildCraft API is distributed under the terms of the MIT License.
--- a/api/buildcraft/api/robots/DockingStation.java
+++ b/api/buildcraft/api/robots/DockingStation.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * BuildCraft is distributed under the terms of the Minecraft Mod Public
--- a/api/buildcraft/api/robots/EntityRobotBase.java
+++ b/api/buildcraft/api/robots/EntityRobotBase.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * The BuildCraft API is distributed under the terms of the MIT License.
--- a/api/buildcraft/api/robots/IRequestProvider.java
+++ b/api/buildcraft/api/robots/IRequestProvider.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * The BuildCraft API is distributed under the terms of the MIT License.
--- a/api/buildcraft/api/robots/IRobotRegistry.java
+++ b/api/buildcraft/api/robots/IRobotRegistry.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * The BuildCraft API is distributed under the terms of the MIT License.
--- a/api/buildcraft/api/robots/ResourceId.java
+++ b/api/buildcraft/api/robots/ResourceId.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * The BuildCraft API is distributed under the terms of the MIT License.
--- a/api/buildcraft/api/robots/ResourceIdBlock.java
+++ b/api/buildcraft/api/robots/ResourceIdBlock.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * BuildCraft is distributed under the terms of the Minecraft Mod Public
--- a/api/buildcraft/api/robots/ResourceIdRequest.java
+++ b/api/buildcraft/api/robots/ResourceIdRequest.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * BuildCraft is distributed under the terms of the Minecraft Mod Public
--- a/api/buildcraft/api/robots/RobotManager.java
+++ b/api/buildcraft/api/robots/RobotManager.java
@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team
+ * Copyright (c) 2011-2017, SpaceToad and the BuildCraft Team
 * http://www.mod-buildcraft.com
 *
 * BuildCraft is distributed under the terms of the Minecraft Mod Public
--- a/Show more
+++ b/Show more