Fix gregtech tileentities showing up as unnamed or draconium lens

Fix storage drawers showing up as nothing on interface terminal
mix pattern terminal multiplying items above maxitemstack size
2021-03-07 23:59:39 -03:00 · 2021-03-07 23:56:52 -03:00 · 2021-03-07 00:01:01 -03:00 · 2021-03-07 00:00:16 -03:00 · 2021-03-04 23:08:08 -03:00 · 2021-03-04 23:07:58 -03:00
132 changed files with 3581 additions and 1414 deletions
@@ -0,0 +1,30 @@
+---
+name: Bug report
+about: You found a bug or encountered a crash? Please report it here.
+
+---
+
+<!-- Provide a summary of the issue in the Title above, please do not "[Tag]" it. -->
+
+**Describe the bug**
+<!-- Always use the most recent version from ae-mod.info, it might already be fixed. -->
+
+**To Reproduce**
+<!-- Please provide the steps to reproduce it, otherwise we might not be able to fix it. -->
+
+**Expected behavior**
+<!-- A clear and concise description of what you expected to happen. -->
+
+**Additional context**
+<!-- Screenshots, crashlogs, etc. -->
+<!-- A complete crashlog is required when reporting a crash. No excerpts. -->
+<!-- Please use pastebin or gist for posting the complete crashlog. -->
+
+**Environment**
+<!-- Include as many relevant details about the environment -->
+<!-- Like the used version, SP/MP, other mods and their version -->
+<!-- The following ones are required, please note "latest" is not a version -->
+
+- Minecraft Version: 
+- AE2 Version: 
+- Forge Version:
@@ -0,0 +1,17 @@
+---
+name: Feature Request
+about: A feature request or suggestion to improve Applied Energistics 2
+
+---
+
+<!-- Provide a summary of the issue in the Title above, please do not "[Tag]" it. -->
+
+**Describe the feature**
+<!-- Tell us how it should work. -->
+
+**Reasons why it should be considered**
+<!-- This can help us in various degrees, e.g. to determine if it fits our design ideas. -->
+
+**Additional Context**
+<!-- Use this for further details, e.g. screenshots, links to mods for integrations. -->
+<!-- Features will only be considered for the latest/next version. -->
@@ -0,0 +1,15 @@
+name: 'Lock threads'
+
+on:
+  schedule:
+    - cron: '0 0 * * *'
+
+jobs:
+  lock:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: dessant/lock-threads@v2
+        with:
+          github-token: ${{ github.token }}
+          issue-lock-inactive-days: '180'
+          pr-lock-inactive-days: '180'
@@ -1,34 +1,15 @@
-[![Travis](https://img.shields.io/travis/AppliedEnergistics/Applied-Energistics-2.svg?maxAge=2592000&style=flat-square)](https://travis-ci.org/AppliedEnergistics/Applied-Energistics-2)
-[![Latest Release](https://img.shields.io/github/release/AppliedEnergistics/Applied-Energistics-2.svg?label=Latest%20Release&style=flat-square)](https://github.com/AppliedEnergistics/Applied-Energistics-2/releases)
+This is a fork of AE2 i made for trying to solve issues for the [Omnifactory](https://www.curseforge.com/minecraft/modpacks/omnifactory) modpack.

-# Applied Energistics 2
+See https://github.com/PrototypeTrousers/Applied-Energistics-2/tree/AE2-Omnifactory branch for commits
+and
+https://github.com/PrototypeTrousers/Applied-Energistics-2/releases for the compiled jars.

-## Table of Contents
-
-* [About](#about)
-* [Contacts](#contacts)
-* [License](#license)
-* [Downloads](#downloads)
-* [Installation](#installation)
-* [Issues](#issues)
-* [Building](#building)
-* [Contribution](#contribution)
-* [API](#applied-energistics-2-api)
-* [CraftTweaker](#applied-energistics-2-crafttweaker)
-* [Localization](#applied-energistics-2-localization)
-* [Credits](#credits)
+# Applied Energistics 2 (PrototypeTrousers fork for Omnifactory)

 ## About

 A Mod about Matter, Energy and using them to conquer the world..

-## Contacts
-
-* [Website](http://ae-mod.info/)
-* [IRC #appliedenergistics on esper.net](http://webchat.esper.net/?channels=appliedenergistics&prompt=1)
-* [GitHub](https://github.com/AppliedEnergistics/Applied-Energistics-2)
-* [Discord](https://discord.gg/GygKjjm)
-
 ## License

 * Applied Energistics 2 API
@@ -43,198 +24,6 @@ A Mod about Matter, Energy and using them to conquer the world..
 * Text and Translations
  - [![License](https://img.shields.io/badge/License-No%20Restriction-green.svg?style=flat-square)](https://creativecommons.org/publicdomain/zero/1.0/)

-## Downloads
-
-Downloads can be found on [CurseForge](http://www.curse.com/mc-mods/minecraft/223794-applied-energistics-2) or on the [official website](http://ae-mod.info/Downloads/).
-
-## Installation
-
-You install this mod by putting it into the `minecraft/mods/` folder. It has no additional hard dependencies.
-
-## Issues
-
-Applied Energistics 2 crashing, have a suggestion, found a bug?  Create an issue now!
-
-1. Make sure your issue has not already been answered or fixed and you are using the latest version. Also think about whether your issue is a valid one before submitting it.
-    * If it is already possible with vanilla and AE2 itself, the suggestion will be considered invalid.
-    * Asking for a smaller version, more compact version, or more efficient version of something will also be considered invalid.
-2. Go to [the issues page](https://github.com/AppliedEnergistics/Applied-Energistics-2/issues) and click [new issue](https://github.com/AppliedEnergistics/Applied-Energistics-2/issues/new)
-3. Enter your a title of your issue (something that summarizes your issue), and then create a detailed description of the issue.
-    * Do not tag it with something like `[Feature]`, `[Bug]`, or a version.
-    * Restrict it to a single bug or feature, it makes managing them way easier for us.
-    * The following details are required. Also refer to the issue template when creating one.
-        * Forge version
-        * AE2 version
-        * Crash log, when reporting a crash (Please make sure to use [pastebin](http://pastebin.com/))
-            * Never post an excerpt of what you consider important
-            * Always post the full log
-        * Other mods and their version, when reporting an issue between AE and another mod
-            * Also consider updating these before submitting a new issue, it might be already fixed
-        * A detailed description of the bug or feature
-    * To further help in resolving your issues please try to include the follow if applicable:
-        * What was expected?
-        * How to reproduce the problem?
-            * This is usually a great detail and allows us to fix it way faster
-        * Server or Single Player?
-        * Screen shots or Pictures of the problem
-        * Mod Pack using and version?
-            * Keep in mind that some mods might use an outdated version of AE2
-            * If so you should report it to your modpack
-4. Click `Submit New Issue`, and wait for feedback!
-
-Providing as many details as possible does help us to find and resolve the issue faster and also you getting a fixed version as fast as possible.
-
-Please note that we might close any issue not matching these requirements. 
-
-## Building
-
-1. Clone this repository via 
-  - SSH `git clone git@github.com:AppliedEnergistics/Applied-Energistics-2.git` or 
-  - HTTPS `git clone https://github.com/AppliedEnergistics/Applied-Energistics-2.git`
-2. Setup workspace 
-  - Decompiled source `gradlew setupDecompWorkspace`
-  - Obfuscated source `gradlew setupDevWorkspace`
-  - CI server `gradlew setupCIWorkspace`
-3. Build `gradlew build`. Jar will be in `build/libs`
-4. For core developer: Setup IDE
-  - IntelliJ: Import into IDE, execute `gradlew genIntellijRuns` and change RunConfiguration to `*_main` as quickfix for [ForgeGradle](https://github.com/MinecraftForge/ForgeGradle/issues/357)
-  - Eclipse: execute `gradlew eclipse`
-5. For add-on developer: Core-Mod Detection
-  - In order to have FML detect AE from your dev environment, add the following VM Option to your run profile
-  - `-Dfml.coreMods.load=appeng.coremod.AppEngCore`
-
-## Contribution
-
-Before you want to add major changes, you might want to discuss them with us first, before wasting your time.
-If you are still willing to contribute to this project, you can contribute via [Pull-Request](https://help.github.com/articles/creating-a-pull-request).
-
-The [guidelines for contributing](https://github.com/AppliedEnergistics/Applied-Energistics-2/blob/master/.github/CONTRIBUTING.md) contain more detailed information about topics like the used code style and should also be considered.
-
-Here are a few things to keep in mind that will help get your PR approved.
-
-* A PR should be focused on content. Any PRs where the changes are only syntax will be rejected.
-* Use the file you are editing as a style guide.
-* Consider your feature. [Suggestion Guidelines](http://ae-mod.info/Suggestion-Guidelines/)
-  - Is your suggestion already possible using Vanilla + AE2?
-  - Make sure your feature isn't already in the works, or hasn't been rejected previously.
-  - Does your feature simplify another feature of AE2? These changes will not be accepted.
-  - If your feature can be done by any popular mod, discuss with us first.
-
-**Getting Started**
-
-1. Fork this repository
-2. Clone the fork via
-  * SSH `git clone git@github.com:<your username>/Applied-Energistics-2.git` or 
-  * HTTPS `git clone https://github.com/<your username>/Applied-Energistics-2.git`
-3. Change code base
-4. Add changes to git `git add -A`
-5. Commit changes to your clone `git commit -m "<summery of made changes>"`
-6. Push to your fork `git push`
-7. Create a Pull-Request on GitHub
-8. Wait for review
-9. Squash commits for cleaner history
-
-If you are only doing single file pull requests, GitHub supports using a quick way without the need of cloning your fork. Also read up about [synching](https://help.github.com/articles/syncing-a-fork) if you plan to contribute on regular basis.
-
-## Applied Energistics 2 API
-
-The API for Applied Energistics 2. It is open source to discuss changes, improve documentation, and provide better add-on support in general.
-
-Universal builds obtained [Here](http://ae2.ae-mod.info/Downloads/) should work in a development environment.
-
-### Maven
-
-When compiling against the AE2 API you can use gradle dependencies, just add
-
-    dependencies {
-        compile "appeng:appliedenergistics2:rv_-_____-__:api"
-    }
-
-or add the compile line to your existing dependencies task to your build.gradle
-
-Where the __ are filled in with the correct version criteria; AE2 is available from the default forge maven so no additional repositories are necessary.
-
-An example string would be `appeng:appliedenergistics2:rv5-stable-1:api` for the API only or `appeng:appliedenergistics2:rv5-stable-1`  for the whole mod.
-
-## Applied Energistics 2 CraftTweaker
-
-### Inscriber
-Add a recipe. When `inscribe` is true the bottom and top inputs are not consumed.
-
-	mods.appliedenergistics2.Inscriber.addRecipe(ItemStack output, ItemStack input, boolean inscribe, 
-	                                             @Optional ItemStack topInput, @Optional ItemStack bottomInput );
-
-Remove all recipes for this output stack. 
-	                                             
-	mods.appliedenergistics2.Inscriber.removeRecipe(ItemStack output);	
-
-### Grindstone
-Add a recipe.
-
-	mods.appliedenergistics2.Grinder.addRecipe( ItemStack output, ItemStack input, int turns, 
-	                                            @Optional ItemStack secondary1Output, @Optional float secondary1Chance,
-	                                            @Optional ItemStack secondary2Output, @Optional float secondary2Chance);
-	
-Remove recipes for this input.
-
-	mods.appliedenergistics2.Grinder.removeRecipe(ItemStack input);	
-
-### Spatial
-Whitelist a TileEntity class for Spatial IO.
-
-	mods.appliedenergistics2.Spatial.whitelistEntity( String fullEntityClassName );
-
-### Attunement
-Attune a ItemStack or ModID to a specific P2P-Tunnel type. ModID's are used as fallback when no ItemStack was found.
-
-	mods.appliedenergistics2.Attunement.attuneME( ItemStack itemStack );
-	mods.appliedenergistics2.Attunement.attuneME( String modID );
-	mods.appliedenergistics2.Attunement.attuneItem( ItemStack itemStack );
-	mods.appliedenergistics2.Attunement.attuneItem( String modID );
-	mods.appliedenergistics2.Attunement.attuneFluid( ItemStack itemStack );
-	mods.appliedenergistics2.Attunement.attuneFluid( String modID );
-	mods.appliedenergistics2.Attunement.attuneRedstone( ItemStack itemStack );
-	mods.appliedenergistics2.Attunement.attuneRedstone( String modID );
-	mods.appliedenergistics2.Attunement.attuneRF( ItemStack itemStack );
-	mods.appliedenergistics2.Attunement.attuneRF( String modID );
-	mods.appliedenergistics2.Attunement.attuneIC2( ItemStack itemStack );
-	mods.appliedenergistics2.Attunement.attuneIC2( String modID );
-	mods.appliedenergistics2.Attunement.attuneLight( ItemStack itemStack );
-	mods.appliedenergistics2.Attunement.attuneLight( String modID );
-
-### Cannon
-Add ammo types for the matter cannon.
-
-	mods.appliedenergistics2.Cannon.registerAmmo( ItemStack itemStack, double weight );
-
-## Applied Energistics 2 Localization
-
-### English Text
-
-`en_US` is included in this repository, fixes to typos are welcome.
-
-### Encoding
-
-Files must be encoded as UTF-8.
-
-### New or updated Translations
-
-The language files are located in `/src/main/resources/assets/appliedenergistics2/lang/` and use the [appropriate locale code](http://minecraft.gamepedia.com/Language) as name and `.lang` as extension.
-
-To update an translation edit the corresponding file and improve/correct the existing entry. Or copy any entries from `en_US.lang` for missing translation.
-
-To create a new translation, copy the contents of `en_US.lang`, create a new file with appropriate filename, and translate it to your language.
-
-Please keep in mind that we use [String format](https://docs.oracle.com/javase/8/docs/api/java/util/Formatter.html) to pass additional data to the text for displaying.
-Therefore you should preserve parts like `%s` or `%1$d%%`, which allows us to replace them with the correct values while you still have the option to change their order for match the rules of grammar.
-This might not be possible for some languages. Should this be the case, please contact us.
-
-### Final Note
-
-If you have have issues localizing something feel free to contact us on IRC, at #AppliedEnergistics on Esper.net
-
-Thanks to everyone helping out to improve localization of AE2.
-
 ## Credits

 Thanks to
@@ -57,7 +57,7 @@ tasks.withType(JavaCompile) {
    options.encoding = 'UTF-8'
 }

-version = aeversion + "-" + aechannel + "-" + aebuild
+version = aeversion + "-" + aechannel + "-" + aebuild + " " + trousers
 group = aegroup
 archivesBaseName = aebasename

@@ -1,15 +1,16 @@
-aeversion=rv5
-aechannel=alpha
-aebuild=0
+aeversion=rv6
+aechannel=stable
+aebuild=7
 aegroup=appeng
 aebasename=appliedenergistics2
+trousers=omni-fixes-v21b

 #########################################################
 # Versions                                              #
 #########################################################
 minecraft_version=1.12.2
 mcp_mappings=snapshot_20171003
-forge_version=14.23.3.2655
+forge_version=14.23.5.2847

 #########################################################
 # Installable                                           #
@@ -19,14 +20,14 @@ hwyla_version=1.8.26-B41_1.12.2
 #########################################################
 # Provided APIs                                         #
 #########################################################
-jei_version=4.10.0.198
+jei_version=4.16.1.302
 tesla_version=1.0.63
 ic2_version=2.8.73-ex112
 top_version=1.12-1.4.23-16
 cofhcore_version=1.12.2-4.5.2.19
 crafttweaker_version=4.1.8.9
 inventorytweaks_version=1.63
-ctm_version=0.3.0.15
+ctm_version=MC1.12.2-0.3.1.16

 #########################################################
 # Deployment                                            #
@@ -24,36 +24,44 @@ allprojects {
 }

 javadoc {
-    options.encoding = 'UTF-8'
-    options.charSet = 'UTF-8'
+	options.encoding = 'UTF-8'
+	options.charSet = 'UTF-8'
 }

 task javadocs(type: Javadoc) {
-    source = sourceSets.api.java
-    include "appeng/api/**"
+	source = sourceSets.api.java
+	include "appeng/api/**"

-    // Due to ForgeGradle having to be a special snowflake,
-    // we have to add some custom configurations to the normal compile configuration and hope it does not break.
-    classpath = configurations.compile + configurations.forgeGradleMc + configurations.forgeGradleMcDeps 
+	// Due to ForgeGradle having to be a special snowflake,
+	// we have to add some custom configurations to the normal compile configuration and hope it does not break.
+	classpath = configurations.compile + configurations.forgeGradleMc + configurations.forgeGradleMcDeps 
 }

 task javadocJar(type: Jar, dependsOn: javadocs) {
 	from javadoc.destinationDir
-    classifier = 'javadoc'
+
+	classifier = 'javadoc'
 }

 task apiJar(type: Jar) {
-    from sourceSets.api.java
-    include "appeng/api/**"
+	from sourceSets.api.java
+	include "appeng/api/**"

-    from sourceSets.api.output
-    include "appeng/api/**"
+	from sourceSets.api.output
+	include "appeng/api/**"

-    classifier = 'api'
+	classifier = 'api'
+}
+
+task sourceJar(type: Jar, overwrite: true) {
+	from sourceSets.api.allSource
+	from sourceSets.main.allSource
+
+	classifier = 'sources'
 }

 artifacts {
-    archives apiJar
-    archives javadocJar
-    archives sourceJar
+	archives apiJar
+	archives javadocJar
+	archives sourceJar
 }
@@ -19,6 +19,11 @@
 repositories {
    mavenLocal()

+    maven {
+        name = "storagedrawers"
+        url = "https://dl.bintray.com/jaquadro/dev/"
+    }
+
    maven {
        name "Mobius"
        url "http://mobiusstrip.eu/maven"
@@ -64,10 +69,10 @@ repositories {
        url "http://maven.blamejared.com/"
    }

-    maven { // modmaven, maven proxy
-        name 'modmaven'
-        url "https://modmaven.k-4u.nl/"
-    }
+    //maven { // modmaven, maven proxy
+    //    name 'modmaven'
+    //    url "https://modmaven.k-4u.nl/"
+    //}

    maven {
 		name = "CurseForge"
@@ -80,6 +85,9 @@ configurations {
 }

 dependencies {
+    deobfCompile "com.jaquadro.minecraft.storagedrawers:StorageDrawers:1.12.2-5.4.2:api"
+    deobfCompile "gregtechce:gregtech:1.12.2:1.12.0.662"
+
    // installable runtime dependencies
    mods "mcp.mobius.waila:Hwyla:${hwyla_version}"
    mods "net.industrial-craft:industrialcraft-2:${ic2_version}:dev"
@@ -94,10 +102,12 @@ dependencies {
    compileOnly "cofh:CoFHCore:${cofhcore_version}:deobf"
    compileOnly "CraftTweaker2:CraftTweaker2-API:${crafttweaker_version}"
 	compileOnly "inventory-tweaks:InventoryTweaks:${inventorytweaks_version}:api"
-    compileOnly "team.chisel.ctm:CTM:MC1.12-${ctm_version}"
+    compileOnly "team.chisel.ctm:CTM:${ctm_version}"

    // at runtime, use the full JEI jar
    runtime "mezz.jei:jei_${minecraft_version}:${jei_version}"
+    runtime "com.jaquadro.minecraft.storagedrawers:StorageDrawers:1.12.2-5.4.2"
+    runtime "com.jaquadro.minecraft.chameleon:Chameleon:1.12-4.1.3"

    // unit test dependencies
    testCompile "junit:junit:4.12"
@@ -26,5 +26,5 @@ package appeng.api.config;

 public enum ActionItems
 {
-	WRENCH, CLOSE, STASH, ENCODE, SUBSTITUTION
+	WRENCH, CLOSE, STASH, ENCODE, SUBSTITUTION, MULTIPLY_BY_TWO, MULTIPLY_BY_THREE, INCREASE_BY_ONE, DIVIDE_BY_TWO, DIVIDE_BY_THREE, DECREASE_BY_ONE, MAX_COUNT
 }
@@ -29,5 +29,5 @@ package appeng.api.implementations.items;
 */
 public enum MemoryCardMessages
 {
-	INVALID_MACHINE, SETTINGS_LOADED, SETTINGS_SAVED, SETTINGS_CLEARED
+	INVALID_MACHINE, SETTINGS_LOADED, SETTINGS_SAVED, SETTINGS_RESET, SETTINGS_CLEARED
 }
@@ -28,7 +28,6 @@ import java.util.EnumSet;

 import javax.annotation.Nonnegative;
 import javax.annotation.Nonnull;
-import javax.annotation.Nullable;

 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumFacing;
@@ -124,8 +123,8 @@ public interface IGridBlock
 	/**
 	 * Determines what item stack is used to render this node in the GUI.
 	 *
-	 * @return the render item stack to use to render this node, null is valid, and will not show this node.
+	 * @return the render item stack to use to render this node. Returning an empty ItemStack will not show this node.
 	 */
-	@Nullable
+	@Nonnull
 	ItemStack getMachineRepresentation();
 }
@@ -99,9 +99,18 @@ public interface ICraftingGrid extends IGridCache
 	/**
 	 * is this item being crafted?
 	 *
-	 * @param aeStackInSlot item being crafted
+	 * @param what item being crafted
 	 *
 	 * @return true if it is being crafting
 	 */
-	boolean isRequesting( IAEItemStack aeStackInSlot );
+	boolean isRequesting( IAEItemStack what );
+
+	/**
+	 * The total amount being requested across all crafting cpus of a grid.
+	 *
+	 * @param what item being requested, ignores stacksize
+	 *
+	 * @return The total amount being requested.
+	 */
+	long requesting( IAEItemStack what );
 }
@@ -291,6 +291,9 @@ public interface IPart extends IBoxProvider, ICustomCableConnection

 	/**
 	 * Used to determine which parts can be placed on what cables.
+	 * 
+	 * Dense cables are not allowed for functional (getGridNode returns a node) parts.
+	 * Doing so will result in crashes.
 	 *
 	 * @param what placed part
 	 *
@@ -365,4 +368,4 @@ public interface IPart extends IBoxProvider, ICustomCableConnection
 		return null;
 	}

-}
+}
@@ -0,0 +1,87 @@
+package yalter.mousetweaks.api;
+
+import net.minecraft.inventory.Container;
+import net.minecraft.inventory.Slot;
+
+/**
+ * This is the interface you want to implement in your GuiScreen to make it compatible with Mouse Tweaks.
+ * If this interface is not enough (for example, you need a custom slot click function, or if you use a custom Container
+ * which happens to be incompatible), check IMTModGuiContainer2Ex instead.
+ * If you just need to disable Mouse Tweaks or the wheel tweak, see the MouseTweaksIgnore
+ * or the MouseTweaksDisableWheelTweak annotations.
+ */
+public interface IMTModGuiContainer2 {
+	/**
+	 * If you want to disable Mouse Tweaks in your GuiScreen, return true from this method.
+	 *
+	 * @return True if Mouse Tweaks should be disabled, false otherwise.
+	 */
+	boolean MT_isMouseTweaksDisabled();
+
+	/**
+	 * If you want to disable the Wheel Tweak in your GuiScreen, return true from this method.
+	 *
+	 * @return True if the Wheel Tweak should be disabled, false otherwise.
+	 */
+	boolean MT_isWheelTweakDisabled();
+
+	/**
+	 * Returns the Container.
+	 *
+	 * @return Container that is currently in use.
+	 */
+	Container MT_getContainer();
+
+	/**
+	 * Returns the Slot that is currently selected by the player, or null if no Slot is selected.
+	 *
+	 * @return Slot that is located under the mouse, or null if no Slot it currently under the mouse.
+	 */
+	Slot MT_getSlotUnderMouse();
+
+	/**
+	 * Return true if the given Slot behaves like the vanilla crafting output slots (inside the crafting table,
+	 * or the furnace output slot, or the anvil output slot, etc.). These slots are handled differently by Mouse Tweaks.
+	 *
+	 * @param slot the slot to check
+	 * @return True if slot is a crafting output slot.
+	 */
+	boolean MT_isCraftingOutput(Slot slot);
+
+	/**
+	 * Return true if the given Slot should be ignored by Mouse Tweaks. Examples of ignored slots are the item select
+	 * slots and the Destroy Item slot in the vanilla creative inventory.
+	 *
+	 * @param slot the slot to check
+	 * @return Tru if slot should be ignored by Mouse Tweaks.
+	 */
+	boolean MT_isIgnored(Slot slot);
+
+	/**
+	 * If your container has an RMB dragging functionality (like vanilla containers), disable it inside this method.
+	 * This method is called every frame (render tick), which is after all mouseClicked / mouseClickMove / mouseReleased
+	 * events are handled (although note these events are handled every game tick, which is far less frequent than every
+	 * render tick).<br><br>
+	 *
+	 * If true is returned from this method, Mouse Tweaks (after checking other conditions like isIgnored) will click
+	 * the slot on which the right mouse button was initially pressed (in most cases this is the slot currently under
+	 * mouse). This is needed because the vanilla RMB dragging functionality prevents the initial slot click.<br><br>
+	 *
+	 * For vanilla containers this method looks like this:
+	 * <pre>
+	 * this.ignoreMouseUp = true;
+	 *
+	 * if (this.dragSplitting) {
+	 *     if (this.dragSplittingButton == 1) {
+	 *         this.dragSplitting = false;
+	 *         return true;
+	 *     }
+	 * }
+	 *
+	 * return false;
+	 * </pre>
+	 *
+	 * @return True if Mouse Tweaks should click the slot on which the RMB was pressed.
+	 */
+	boolean MT_disableRMBDraggingFunctionality();
+}
@@ -19,6 +19,7 @@
 package appeng.capabilities;


+import com.jaquadro.minecraft.storagedrawers.api.capabilities.IItemRepository;
 import net.darkhax.tesla.api.ITeslaConsumer;
 import net.darkhax.tesla.api.ITeslaHolder;
 import net.minecraft.nbt.NBTBase;
@@ -54,6 +55,8 @@ public final class Capabilities

 	public static Capability<IEnergyStorage> FORGE_ENERGY;

+	public static Capability<IItemRepository> ITEM_REPOSITORY_CAPABILITY;
+
 	/**
 	 * Register AE2 provided capabilities.
 	 */
@@ -99,6 +102,9 @@ public final class Capabilities
 		FORGE_ENERGY = cap;
 	}

+	@CapabilityInject( IItemRepository.class )
+	private static void capIItemRepositoryRegistered( Capability<IItemRepository> cap ) { ITEM_REPOSITORY_CAPABILITY = cap; }
+
 	// Create a storage implementation that does not do anything
 	private static <T> Capability.IStorage<T> createNullStorage()
 	{
@@ -25,6 +25,7 @@ import java.util.EnumMap;
 import java.util.List;
 import java.util.Random;

+import appeng.helpers.HighlighterHandler;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.settings.KeyBinding;
@@ -37,6 +38,7 @@ import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.World;
 import net.minecraftforge.client.event.MouseEvent;
 import net.minecraftforge.client.event.RenderLivingEvent;
+import net.minecraftforge.client.event.RenderWorldLastEvent;
 import net.minecraftforge.client.event.TextureStitchEvent;
 import net.minecraftforge.client.model.ModelLoaderRegistry;
 import net.minecraftforge.common.ForgeModContainer;
@@ -106,6 +108,11 @@ public class ClientHelper extends ServerHelper
 		}
 	}

+	@SubscribeEvent
+	public void renderWorldLastEvent( RenderWorldLastEvent event) {
+		HighlighterHandler.tick(event);
+	}
+
 	@Override
 	public World getWorld()
 	{
@@ -35,6 +35,7 @@ import com.google.common.base.Joiner;
 import com.google.common.base.Stopwatch;
 import com.google.common.collect.Lists;

+import net.minecraftforge.fml.common.Optional;
 import org.lwjgl.input.Keyboard;
 import org.lwjgl.input.Mouse;
 import org.lwjgl.opengl.GL11;
@@ -87,9 +88,11 @@ import appeng.core.sync.packets.PacketSwapSlots;
 import appeng.fluids.client.render.FluidStackSizeRenderer;
 import appeng.fluids.container.slots.IMEFluidSlot;
 import appeng.helpers.InventoryAction;
+import yalter.mousetweaks.api.IMTModGuiContainer2;


-public abstract class AEBaseGui extends GuiContainer
+@Optional.Interface( iface = "yalter.mousetweaks.api.IMTModGuiContainer2", modid = "mousetweaks" )
+public abstract class AEBaseGui extends GuiContainer implements IMTModGuiContainer2
 {
 	private final List<InternalSlotME> meSlots = new ArrayList<>();
 	// drag y
@@ -473,7 +476,10 @@ public abstract class AEBaseGui extends GuiContainer
 			switch( clickType )
 			{
 				case PICKUP: // pickup / set-down.
-					action = ( mouseButton == 1 ) ? InventoryAction.SPLIT_OR_PLACE_SINGLE : InventoryAction.PICKUP_OR_SET_DOWN;
+					if (slot.getStack().isEmpty() && !player.inventory.getItemStack().isEmpty())
+						action = InventoryAction.SPLIT_OR_PLACE_SINGLE;
+					if (!slot.getStack().isEmpty() && player.inventory.getItemStack().getCount() <= 1)
+						action = InventoryAction.PICKUP_OR_SET_DOWN;
 					break;
 				case QUICK_MOVE:
 					action = ( mouseButton == 1 ) ? InventoryAction.PICKUP_SINGLE : InventoryAction.SHIFT_CLICK;
@@ -702,6 +708,16 @@ public abstract class AEBaseGui extends GuiContainer
 				}
 			}
 		}
+		if( slot instanceof SlotFake )
+		{
+			final ItemStack stack = ( (SlotFake) slot ).getStack();
+			if( stack != ItemStack.EMPTY )
+			{
+				InventoryAction direction = wheel > 0 ? InventoryAction.PLACE_SINGLE : InventoryAction.PICKUP_SINGLE;
+				final PacketInventoryAction p = new PacketInventoryAction( direction , slot.slotNumber , 0);
+				NetworkHandler.instance().sendToServer( p );
+			}
+		}
 	}

 	protected boolean enableSpaceClicking()
@@ -961,4 +977,53 @@ public abstract class AEBaseGui extends GuiContainer
 	{
 		return this.meSlots;
 	}
+
+	@Override
+	@Optional.Method( modid = "mousetweaks" )
+	public boolean MT_isMouseTweaksDisabled()
+	{
+		return false;
+	}
+
+	@Override
+	@Optional.Method( modid = "mousetweaks" )
+	public boolean MT_isWheelTweakDisabled()
+	{
+		return true;
+	}
+
+	@Override
+	@Optional.Method( modid = "mousetweaks" )
+	public Container MT_getContainer()
+	{
+		return this.inventorySlots;
+	}
+
+	@Override
+	@Optional.Method( modid = "mousetweaks" )
+	public Slot MT_getSlotUnderMouse()
+	{
+		return getSlotUnderMouse();
+	}
+
+	@Override
+	@Optional.Method( modid = "mousetweaks" )
+	public boolean MT_isCraftingOutput( Slot slot )
+	{
+		return slot instanceof SlotOutput || slot instanceof AppEngCraftingSlot;
+	}
+
+	@Override
+	@Optional.Method( modid = "mousetweaks" )
+	public boolean MT_isIgnored( Slot slot )
+	{
+		return false;
+	}
+
+	@Override
+	@Optional.Method( modid = "mousetweaks" )
+	public boolean MT_disableRMBDraggingFunctionality()
+	{
+		return false;
+	}
 }
@@ -0,0 +1,97 @@
+package appeng.client.gui;
+
+import javax.annotation.Nullable;
+import appeng.api.storage.data.IAEItemStack;
+import appeng.client.gui.implementations.GuiCraftAmount;
+import appeng.client.gui.implementations.GuiCraftConfirm;
+import appeng.client.gui.implementations.GuiCraftingCPU;
+import appeng.client.gui.widgets.GuiCustomSlot;
+import appeng.container.implementations.ContainerCraftAmount;
+import mezz.jei.api.gui.IAdvancedGuiHandler;
+import net.minecraft.client.renderer.RenderItem;
+import net.minecraft.inventory.Slot;
+import net.minecraft.item.ItemStack;
+
+import java.awt.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+
+public class AEGuiHandler implements IAdvancedGuiHandler<AEBaseGui>
+{
+
+    @Override
+    public Class<AEBaseGui> getGuiContainerClass()
+    {
+        return AEBaseGui.class;
+    }
+
+    @Nullable
+    @Override
+    public List<Rectangle> getGuiExtraAreas( AEBaseGui guiContainer )
+    {
+        return Collections.emptyList();
+    }
+
+    @Nullable
+    @Override
+    public Object getIngredientUnderMouse( AEBaseGui guiContainer, int mouseX, int mouseY )
+    {
+        List<IAEItemStack> visual = new ArrayList<>();
+        int guiSlotIdx = 0;
+        Object result = null;
+        if( guiContainer instanceof GuiCraftConfirm )
+        {
+            guiSlotIdx = getSlotidx( guiContainer, mouseX, mouseY, ( (GuiCraftConfirm) guiContainer ).getDisplayedRows() );
+            visual = ( (GuiCraftConfirm) guiContainer ).getVisual();
+            if( guiSlotIdx < visual.size() && guiSlotIdx != -1 )
+            {
+                result = visual.get( guiSlotIdx ).getDefinition();
+            }
+            else
+            {
+                return null;
+            }
+        }
+
+        if( guiContainer instanceof GuiCraftingCPU )
+        {
+            guiSlotIdx = getSlotidx( guiContainer, mouseX, mouseY, ( (GuiCraftingCPU) guiContainer ).getDisplayedRows() );
+            visual = ( (GuiCraftingCPU) guiContainer ).getVisual();
+            if( guiSlotIdx < visual.size() && guiSlotIdx != -1 )
+            {
+                result = visual.get( guiSlotIdx ).getDefinition();
+            }
+            else
+            {
+                return null;
+            }
+        }
+        
+        if( guiContainer instanceof GuiCraftAmount )
+        {
+            if( guiContainer.getSlotUnderMouse() != null )
+            {
+                result = guiContainer.getSlotUnderMouse().getStack();
+            }
+        }
+        return result;
+    }
+
+    private int getSlotidx(AEBaseGui guiContainer, int mouseX, int mouseY, int rows)
+    {
+        int guileft = guiContainer.getGuiLeft();
+        int guitop = guiContainer.getGuiTop();
+        int currentScroll = guiContainer.getScrollBar().getCurrentScroll();
+        final int xo = 9;
+        final int yo = 19;
+
+        int guiSlotx = ( mouseX - guileft - xo ) / 67;
+        if( guiSlotx > 2 || mouseX < guileft + xo ) return -1;
+        int guiSloty = ( mouseY - guitop - yo ) / 23;
+        if( guiSloty > ( rows - 1 ) || mouseY < guitop + yo ) return -1;
+        return ( guiSloty * 3 ) + guiSlotx + ( currentScroll * 3 );
+    }
+}
@@ -582,4 +582,14 @@ public class GuiCraftConfirm extends AEBaseGui
 			}
 		}
 	}
+
+	public List<IAEItemStack> getVisual()
+	{
+		return visual;
+	}
+
+	public int getDisplayedRows()
+	{
+		return this.rows;
+	}
 }
@@ -493,4 +493,14 @@ public class GuiCraftingCPU extends AEBaseGui implements ISortSource
 	{
 		return ViewItems.ALL;
 	}
+
+	public List<IAEItemStack> getVisual()
+	{
+		return visual;
+	}
+
+	public int getDisplayedRows()
+	{
+		return DISPLAYED_ROWS;
+	}
 }
@@ -20,17 +20,12 @@ package appeng.client.gui.implementations;


 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-import java.util.WeakHashMap;
+import java.util.*;

+import appeng.util.BlockPosUtils;
 import com.google.common.collect.HashMultimap;

+import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Slot;
@@ -49,6 +44,12 @@ import appeng.container.implementations.ContainerInterfaceTerminal;
 import appeng.core.localization.GuiText;
 import appeng.parts.reporting.PartInterfaceTerminal;
 import appeng.util.Platform;
+import net.minecraft.nbt.NBTUtil;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.text.TextComponentString;
+
+
+import static appeng.client.render.BlockPosHighlighter.hilightBlock;


 public class GuiInterfaceTerminal extends AEBaseGui
@@ -61,22 +62,29 @@ public class GuiInterfaceTerminal extends AEBaseGui

 	private final HashMap<Long, ClientDCInternalInv> byId = new HashMap<>();
 	private final HashMultimap<String, ClientDCInternalInv> byName = HashMultimap.create();
+	private final HashMap<ClientDCInternalInv,BlockPos> blockPosHashMap = new HashMap<>();
+	private final HashMap<GuiButton,ClientDCInternalInv> guiButtonHashMap = new HashMap<>();
 	private final ArrayList<String> names = new ArrayList<>();
 	private final ArrayList<Object> lines = new ArrayList<>();

 	private final Map<String, Set<Object>> cachedSearches = new WeakHashMap<>();

 	private boolean refreshList = false;
-	private MEGuiTextField searchField;
+	private MEGuiTextField searchFieldOutputs;
+	private MEGuiTextField searchFieldInputs;
+	private PartInterfaceTerminal partInterfaceTerminal;
+	private GuiButton guiButtonHide;
+	private GuiButton guiButtonNextAssembler;

 	public GuiInterfaceTerminal( final InventoryPlayer inventoryPlayer, final PartInterfaceTerminal te )
 	{
 		super( new ContainerInterfaceTerminal( inventoryPlayer, te ) );

+		this.partInterfaceTerminal = te;
 		final GuiScrollbar scrollbar = new GuiScrollbar();
 		this.setScrollBar( scrollbar );
 		this.xSize = 195;
-		this.ySize = 222;
+		this.ySize = 236;
 	}

 	@Override
@@ -86,24 +94,50 @@ public class GuiInterfaceTerminal extends AEBaseGui

 		this.getScrollBar().setLeft( 175 );
 		this.getScrollBar().setHeight( 106 );
-		this.getScrollBar().setTop( 18 );
+		this.getScrollBar().setTop( 32 );

-		this.searchField = new MEGuiTextField( this.fontRenderer, this.guiLeft + Math.max( 104, this.offsetX ), this.guiTop + 4, 65, 12 );
-		this.searchField.setEnableBackgroundDrawing( false );
-		this.searchField.setMaxStringLength( 25 );
-		this.searchField.setTextColor( 0xFFFFFF );
-		this.searchField.setVisible( true );
-		this.searchField.setFocused( true );
+		this.searchFieldInputs = new MEGuiTextField( this.fontRenderer, this.guiLeft + Math.max( 16, this.offsetX ), this.guiTop + 18, 65, 12 );
+		this.searchFieldInputs.setEnableBackgroundDrawing( false );
+		this.searchFieldInputs.setMaxStringLength( 25 );
+		this.searchFieldInputs.setTextColor( 0xFFFFFF );
+		this.searchFieldInputs.setVisible( true );
+		this.searchFieldInputs.setFocused( false );
+
+//		this.searchFieldOutputs = new MEGuiTextField( this.fontRenderer, this.guiLeft + Math.max( 105, this.offsetX ), this.guiTop + 4, 65, 12 );
+		this.searchFieldOutputs = new MEGuiTextField( this.fontRenderer, this.guiLeft + Math.max( 94, this.offsetX ), this.guiTop + 18, 65, 12 );
+		this.searchFieldOutputs.setEnableBackgroundDrawing( false );
+		this.searchFieldOutputs.setMaxStringLength( 25 );
+		this.searchFieldOutputs.setTextColor( 0xFFFFFF );
+		this.searchFieldOutputs.setVisible( true );
+		this.searchFieldOutputs.setFocused( true );
+
+		this.searchFieldInputs.setText( partInterfaceTerminal.in );
+		this.searchFieldOutputs.setText( partInterfaceTerminal.out );
+	}
+
+	@Override
+	public void onGuiClosed()
+	{
+		partInterfaceTerminal.saveSearchStrings( this.searchFieldInputs.getText().toLowerCase(), this.searchFieldOutputs.getText().toLowerCase() );
+		super.onGuiClosed();
 	}

 	@Override
 	public void drawFG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
 	{
+		this.buttonList.clear();
+
 		this.fontRenderer.drawString( this.getGuiDisplayName( GuiText.InterfaceTerminal.getLocal() ), 8, 6, 4210752 );
 		this.fontRenderer.drawString( GuiText.inventory.getLocal(), 8, this.ySize - 96 + 3, 4210752 );

 		final int ex = this.getScrollBar().getCurrentScroll();

+		this.guiButtonNextAssembler = new GuiButton( -1, guiLeft + 110, guiTop + 4, 12, 12, "M" );
+		this.buttonList.add( guiButtonNextAssembler );
+
+		this.guiButtonHide = new GuiButton( -1, guiLeft + 128, guiTop + 4, 60, 12, "Hide Full" );
+		this.buttonList.add( guiButtonHide );
+
 		final Iterator<Slot> o = this.inventorySlots.inventorySlots.iterator();
 		while( o.hasNext() )
 		{
@@ -113,7 +147,7 @@ public class GuiInterfaceTerminal extends AEBaseGui
 			}
 		}

-		int offset = 17;
+		int offset = 32;
 		for( int x = 0; x < LINES_ON_PAGE && ex + x < this.lines.size(); x++ )
 		{
 			final Object lineObj = this.lines.get( ex + x );
@@ -124,6 +158,10 @@ public class GuiInterfaceTerminal extends AEBaseGui
 				{
 					this.inventorySlots.inventorySlots.add( new SlotDisconnected( inv, z, z * 18 + 8, 1 + offset ) );
 				}
+				GuiButton guiButton = new GuiButton( x, guiLeft + 1, guiTop + offset + 3, 8, 10, "?" );
+				guiButtonHashMap.put( guiButton , inv);
+				this.buttonList.add( guiButton );
+
 			}
 			else if( lineObj instanceof String )
 			{
@@ -148,24 +186,66 @@ public class GuiInterfaceTerminal extends AEBaseGui
 	@Override
 	protected void mouseClicked( final int xCoord, final int yCoord, final int btn ) throws IOException
 	{
-		this.searchField.mouseClicked( xCoord, yCoord, btn );
+		this.searchFieldInputs.mouseClicked( xCoord, yCoord, btn );

-		if( btn == 1 && this.searchField.isMouseIn( xCoord, yCoord ) )
+		if( btn == 1 && this.searchFieldInputs.isMouseIn( xCoord, yCoord ) )
 		{
-			this.searchField.setText( "" );
+			this.searchFieldInputs.setText( "" );
+			this.refreshList();
+		}
+
+		this.searchFieldOutputs.mouseClicked( xCoord, yCoord, btn );
+
+		if( btn == 1 && this.searchFieldOutputs.isMouseIn( xCoord, yCoord ) )
+		{
+			this.searchFieldOutputs.setText( "" );
 			this.refreshList();
 		}

 		super.mouseClicked( xCoord, yCoord, btn );
 	}

+	@Override
+	protected void actionPerformed( final GuiButton btn ) throws IOException
+	{
+		if( guiButtonHashMap.containsKey( btn ) )
+		{
+			BlockPos blockPos = blockPosHashMap.get( guiButtonHashMap.get( this.selectedButton ) );
+			BlockPos blockPos2 = mc.player.getPosition();
+			hilightBlock( blockPos, System.currentTimeMillis() + 500 * BlockPosUtils.getDistance(blockPos, blockPos2) );
+			mc.player.sendStatusMessage( new TextComponentString( "The interface is now highlighted at " + "X: " + blockPos.getX() + "Y: " + blockPos.getY() + "Z: " + blockPos.getZ() ), false );
+			mc.player.closeScreen();
+		}
+
+		if (btn == guiButtonHide)
+		{
+			partInterfaceTerminal.onlyInterfacesWithFreeSlots = !partInterfaceTerminal.onlyInterfacesWithFreeSlots;
+			this.refreshList();
+		}
+
+		if (btn == guiButtonNextAssembler)
+		{
+			// Set Search to "Molecular Assembler" and set "Only Free Interface"
+			boolean currentOnlyInterfacesWithFreeSlots = this.partInterfaceTerminal.onlyInterfacesWithFreeSlots;
+			String currentSearchText = this.searchFieldOutputs.getText();
+
+			this.partInterfaceTerminal.onlyInterfacesWithFreeSlots = true;
+			this.searchFieldOutputs.setText("Molecular Assembler");
+
+			this.refreshList();
+
+			this.partInterfaceTerminal.onlyInterfacesWithFreeSlots = currentOnlyInterfacesWithFreeSlots;
+			this.searchFieldOutputs.setText(currentSearchText);
+		}
+	}
+
 	@Override
 	public void drawBG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
 	{
-		this.bindTexture( "guis/interfaceterminal.png" );
+		this.bindTexture( "guis/newinterfaceterminal.png" );
 		this.drawTexturedModalRect( offsetX, offsetY, 0, 0, this.xSize, this.ySize );

-		int offset = 17;
+		int offset = 32;
 		final int ex = this.getScrollBar().getCurrentScroll();

 		for( int x = 0; x < LINES_ON_PAGE && ex + x < this.lines.size(); x++ )
@@ -177,14 +257,19 @@ public class GuiInterfaceTerminal extends AEBaseGui

 				GlStateManager.color( 1, 1, 1, 1 );
 				final int width = inv.getInventory().getSlots() * 18;
-				this.drawTexturedModalRect( offsetX + 7, offsetY + offset, 7, 139, width, 18 );
+				this.drawTexturedModalRect( offsetX + 7, offsetY + offset, 7, 153, width, 18 );
 			}
 			offset += 18;
 		}

-		if( this.searchField != null )
+		if( this.searchFieldInputs != null )
 		{
-			this.searchField.drawTextBox();
+			this.searchFieldInputs.drawTextBox();
+		}
+
+		if( this.searchFieldOutputs != null )
+		{
+			this.searchFieldOutputs.drawTextBox();
 		}
 	}

@@ -193,15 +278,21 @@ public class GuiInterfaceTerminal extends AEBaseGui
 	{
 		if( !this.checkHotbarKeys( key ) )
 		{
-			if( character == ' ' && this.searchField.getText().isEmpty() )
+			if( character == ' ' && this.searchFieldInputs.getText().isEmpty() && this.searchFieldInputs.isFocused() )
 			{
 				return;
 			}

-			if( this.searchField.textboxKeyTyped( character, key ) )
+			if( character == ' ' && this.searchFieldOutputs.getText().isEmpty() && this.searchFieldOutputs.isFocused())
+			{
+				return;
+			}
+
+			if( this.searchFieldInputs.textboxKeyTyped( character, key ) || this.searchFieldOutputs.textboxKeyTyped( character, key ))
 			{
 				this.refreshList();
 			}
+
 			else
 			{
 				super.keyTyped( character, key );
@@ -227,6 +318,7 @@ public class GuiInterfaceTerminal extends AEBaseGui
 					final long id = Long.parseLong( key.substring( 1 ), Character.MAX_RADIX );
 					final NBTTagCompound invData = in.getCompoundTag( key );
 					final ClientDCInternalInv current = this.getById( id, invData.getLong( "sortBy" ), invData.getString( "un" ) );
+					blockPosHashMap.put( current, NBTUtil.getPosFromTag( invData.getCompoundTag( "pos" )) );

 					for( int x = 0; x < current.getInventory().getSlots(); x++ )
 					{
@@ -260,41 +352,68 @@ public class GuiInterfaceTerminal extends AEBaseGui
 	private void refreshList()
 	{
 		this.byName.clear();
+		this.buttonList.clear();

-		final String searchFilterLowerCase = this.searchField.getText().toLowerCase();
+		final String searchFieldInputs = this.searchFieldInputs.getText().toLowerCase();
+		final String searchFieldOutputs = this.searchFieldOutputs.getText().toLowerCase();

-		final Set<Object> cachedSearch = this.getCacheForSearchTerm( searchFilterLowerCase );
+		final Set<Object> cachedSearch = this.getCacheForSearchTerm( "IN:" + searchFieldInputs + " OUT:" + searchFieldOutputs + partInterfaceTerminal.onlyInterfacesWithFreeSlots);
 		final boolean rebuild = cachedSearch.isEmpty();

 		for( final ClientDCInternalInv entry : this.byId.values() )
 		{
-			// ignore inventory if not doing a full rebuild or cache already marks it as miss.
+			// ignore inventory if not doing a full rebuild and cache already marks it as miss.
 			if( !rebuild && !cachedSearch.contains( entry ) )
 			{
 				continue;
 			}

 			// Shortcut to skip any filter if search term is ""/empty
-			boolean found = searchFilterLowerCase.isEmpty();
+
+			boolean found = (searchFieldInputs.isEmpty() && searchFieldOutputs.isEmpty() && !partInterfaceTerminal.onlyInterfacesWithFreeSlots);

 			// Search if the current inventory holds a pattern containing the search term.
-			if( !found && !searchFilterLowerCase.isEmpty() )
+			if( !found )
 			{
 				for( final ItemStack itemStack : entry.getInventory() )
 				{
-					found = this.itemStackMatchesSearchTerm( itemStack, searchFilterLowerCase );
+					if( !searchFieldInputs.isEmpty() && !searchFieldOutputs.isEmpty() )
+						found = ( this.itemStackMatchesSearchTerm( itemStack, searchFieldInputs, 0 ) || this.itemStackMatchesSearchTerm( itemStack, searchFieldOutputs, 1 ) );
+					else if( !searchFieldInputs.isEmpty() )
+						found = ( this.itemStackMatchesSearchTerm( itemStack, searchFieldInputs, 0 ) );
+					else if( !searchFieldOutputs.isEmpty() )
+						found = ( this.itemStackMatchesSearchTerm( itemStack, searchFieldOutputs, 1 ) );
 					if( found )
 					{
 						break;
 					}
 				}
+			} 
+
+			// If only Interfaces with empty slots should be shown, check that here
+			boolean interfaceHasFreeSlots = false;
+			if (partInterfaceTerminal.onlyInterfacesWithFreeSlots) {
+				for( final ItemStack itemStack : entry.getInventory() )
+				{
+					if(itemStack.isEmpty()){
+						interfaceHasFreeSlots = true;
+						break;
+					}
+				}
 			}

 			// if found, filter skipped or machine name matching the search term, add it
-			if( found || entry.getName().toLowerCase().contains( searchFilterLowerCase ) )
+			if( found || (entry.getName().toLowerCase().contains( searchFieldInputs ) && entry.getName().toLowerCase().contains( searchFieldOutputs )))
 			{
-				this.byName.put( entry.getName(), entry );
-				cachedSearch.add( entry );
+				if (!partInterfaceTerminal.onlyInterfacesWithFreeSlots)
+				{
+					this.byName.put( entry.getName(), entry );
+					cachedSearch.add( entry );
+				}
+				else if ( interfaceHasFreeSlots ){
+					this.byName.put( entry.getName(), entry );
+					cachedSearch.add( entry );
+				}
 			}
 			else
 			{
@@ -324,7 +443,7 @@ public class GuiInterfaceTerminal extends AEBaseGui
 		this.getScrollBar().setRange( 0, this.lines.size() - LINES_ON_PAGE, 2 );
 	}

-	private boolean itemStackMatchesSearchTerm( final ItemStack itemStack, final String searchTerm )
+	private boolean itemStackMatchesSearchTerm( final ItemStack itemStack, final String searchTerm,int pass )
 	{
 		if( itemStack.isEmpty() )
 		{
@@ -338,14 +457,21 @@ public class GuiInterfaceTerminal extends AEBaseGui
 			return false;
 		}

-		// Potential later use to filter by input
-		// NBTTagList inTag = encodedValue.getTagList( "in", 10 );
-		final NBTTagList outTag = encodedValue.getTagList( "out", 10 );
+		NBTTagList tag = new NBTTagList();

-		for( int i = 0; i < outTag.tagCount(); i++ )
+		if (pass == 0)
+		{
+			tag = encodedValue.getTagList( "in", 10 );
+		}
+		else
+		{
+			tag = encodedValue.getTagList( "out", 10 );
+		}
+
+		for( int i = 0; i < tag.tagCount(); i++ )
 		{

-			final ItemStack parsedItemStack = new ItemStack( outTag.getCompoundTagAt( i ) );
+			final ItemStack parsedItemStack = new ItemStack( tag.getCompoundTagAt( i ) );
 			if( !parsedItemStack.isEmpty() )
 			{
 				final String displayName = Platform
@@ -60,6 +60,13 @@ public class GuiPatternTerm extends GuiMEMonitorable
 	private GuiImgButton substitutionsDisabledBtn;
 	private GuiImgButton encodeBtn;
 	private GuiImgButton clearBtn;
+	private GuiImgButton x2Btn;
+	private GuiImgButton x3Btn;
+	private GuiImgButton plusOneBtn;
+	private GuiImgButton divTwoBtn;
+	private GuiImgButton divThreeBtn;
+	private GuiImgButton minusOneBtn;
+	private GuiImgButton maxCountBtn;

 	public GuiPatternTerm( final InventoryPlayer inventoryPlayer, final ITerminalHost te )
 	{
@@ -85,7 +92,13 @@ public class GuiPatternTerm extends GuiMEMonitorable

 			if( this.encodeBtn == btn )
 			{
-				NetworkHandler.instance().sendToServer( new PacketValueConfig( "PatternTerminal.Encode", "1" ) );
+				if ( isShiftKeyDown() ){
+					NetworkHandler.instance().sendToServer( new PacketValueConfig( "PatternTerminal.Encode", "2" ) );
+				}
+				else
+				{
+					NetworkHandler.instance().sendToServer( new PacketValueConfig( "PatternTerminal.Encode", "1" ) );
+				}
 			}

 			if( this.clearBtn == btn )
@@ -93,6 +106,41 @@ public class GuiPatternTerm extends GuiMEMonitorable
 				NetworkHandler.instance().sendToServer( new PacketValueConfig( "PatternTerminal.Clear", "1" ) );
 			}

+			if( this.x2Btn == btn )
+			{
+				NetworkHandler.instance().sendToServer( new PacketValueConfig( "PatternTerminal.MultiplyByTwo", "1" ) );
+			}
+
+			if( this.x3Btn == btn )
+			{
+				NetworkHandler.instance().sendToServer( new PacketValueConfig( "PatternTerminal.MultiplyByThree", "1" ) );
+			}
+
+			if( this.divTwoBtn == btn )
+			{
+				NetworkHandler.instance().sendToServer( new PacketValueConfig( "PatternTerminal.DivideByTwo", "1" ) );
+			}
+
+			if( this.divThreeBtn == btn )
+			{
+				NetworkHandler.instance().sendToServer( new PacketValueConfig( "PatternTerminal.DivideByThree", "1" ) );
+			}
+
+			if( this.plusOneBtn == btn )
+			{
+				NetworkHandler.instance().sendToServer( new PacketValueConfig( "PatternTerminal.IncreaseByOne", "1" ) );
+			}
+
+			if( this.minusOneBtn == btn )
+			{
+				NetworkHandler.instance().sendToServer( new PacketValueConfig( "PatternTerminal.DecreaseByOne", "1" ) );
+			}
+
+			if( this.maxCountBtn == btn )
+			{
+				NetworkHandler.instance().sendToServer( new PacketValueConfig( "PatternTerminal.MaximizeCount", "1" ) );
+			}
+
 			if( this.substitutionsEnabledBtn == btn || this.substitutionsDisabledBtn == btn )
 			{
 				NetworkHandler.instance()
@@ -131,6 +179,34 @@ public class GuiPatternTerm extends GuiMEMonitorable
 		this.clearBtn.setHalfSize( true );
 		this.buttonList.add( this.clearBtn );

+		this.x3Btn = new GuiImgButton( this.guiLeft + 128, this.guiTop + this.ySize - 158, Settings.ACTIONS, ActionItems.MULTIPLY_BY_THREE );
+		this.x3Btn.setHalfSize( true );
+		this.buttonList.add( this.x3Btn );
+
+		this.x2Btn = new GuiImgButton( this.guiLeft + 128, this.guiTop + this.ySize - 148, Settings.ACTIONS, ActionItems.MULTIPLY_BY_TWO );
+		this.x2Btn.setHalfSize( true );
+		this.buttonList.add( this.x2Btn );
+
+		this.plusOneBtn = new GuiImgButton( this.guiLeft + 128, this.guiTop + this.ySize - 138, Settings.ACTIONS, ActionItems.INCREASE_BY_ONE );
+		this.plusOneBtn.setHalfSize( true );
+		this.buttonList.add( this.plusOneBtn );
+
+		this.divThreeBtn = new GuiImgButton( this.guiLeft + 100, this.guiTop + this.ySize - 158, Settings.ACTIONS, ActionItems.DIVIDE_BY_THREE );
+		this.divThreeBtn.setHalfSize( true );
+		this.buttonList.add( this.divThreeBtn );
+
+		this.divTwoBtn = new GuiImgButton( this.guiLeft + 100, this.guiTop + this.ySize - 148, Settings.ACTIONS, ActionItems.DIVIDE_BY_TWO );
+		this.divTwoBtn.setHalfSize( true );
+		this.buttonList.add( this.divTwoBtn );
+
+		this.minusOneBtn = new GuiImgButton( this.guiLeft + 100, this.guiTop + this.ySize - 138, Settings.ACTIONS, ActionItems.DECREASE_BY_ONE );
+		this.minusOneBtn.setHalfSize( true );
+		this.buttonList.add( this.minusOneBtn );
+
+		//this.maxCountBtn = new GuiImgButton( this.guiLeft + 128, this.guiTop + this.ySize - 108, Settings.ACTIONS, ActionItems.MAX_COUNT );
+		//this.maxCountBtn.setHalfSize( true );
+		//this.buttonList.add( this.maxCountBtn );
+
 		this.encodeBtn = new GuiImgButton( this.guiLeft + 147, this.guiTop + this.ySize - 142, Settings.ACTIONS, ActionItems.ENCODE );
 		this.buttonList.add( this.encodeBtn );
 	}
@@ -142,6 +218,13 @@ public class GuiPatternTerm extends GuiMEMonitorable
 		{
 			this.tabCraftButton.visible = true;
 			this.tabProcessButton.visible = false;
+			this.x2Btn.visible = false;
+			this.x3Btn.visible = false;
+			this.divTwoBtn.visible = false;
+			this.divThreeBtn.visible = false;
+			this.plusOneBtn.visible = false;
+			this.minusOneBtn.visible = false;
+			//this.maxCountBtn.visible = false;

 			if( this.container.substitute )
 			{
@@ -160,6 +243,13 @@ public class GuiPatternTerm extends GuiMEMonitorable
 			this.tabProcessButton.visible = true;
 			this.substitutionsEnabledBtn.visible = false;
 			this.substitutionsDisabledBtn.visible = false;
+			this.x2Btn.visible = true;
+			this.x3Btn.visible = true;
+			this.divTwoBtn.visible = true;
+			this.divThreeBtn.visible = true;
+			this.plusOneBtn.visible = true;
+			this.minusOneBtn.visible = true;
+			//this.maxCountBtn.visible = true;
 		}

 		super.drawFG( offsetX, offsetY, mouseX, mouseY );
@@ -134,6 +134,14 @@ public class GuiImgButton extends GuiButton implements ITooltip
 			this.registerApp( 6, Settings.ACTIONS, ActionItems.CLOSE, ButtonToolTips.Clear, ButtonToolTips.ClearSettings );
 			this.registerApp( 6, Settings.ACTIONS, ActionItems.STASH, ButtonToolTips.Stash, ButtonToolTips.StashDesc );

+			this.registerApp( 6 + 4 * 16, Settings.ACTIONS, ActionItems.MULTIPLY_BY_TWO, ButtonToolTips.MultiplyByTwo, ButtonToolTips.MultiplyByTwoDesc );
+			this.registerApp( 7 + 4 * 16, Settings.ACTIONS, ActionItems.MULTIPLY_BY_THREE, ButtonToolTips.MultiplyByThree, ButtonToolTips.MultiplyByThreeDesc );
+			this.registerApp( 8 + 4 * 16, Settings.ACTIONS, ActionItems.INCREASE_BY_ONE, ButtonToolTips.IncreaseByOne, ButtonToolTips.IncreaseByOneDesc );
+			this.registerApp( 9 + 4 * 16, Settings.ACTIONS, ActionItems.DIVIDE_BY_TWO, ButtonToolTips.DivideByTwo, ButtonToolTips.DivideByTwoDesc );
+			this.registerApp( 10 + 4 * 16, Settings.ACTIONS, ActionItems.DIVIDE_BY_THREE, ButtonToolTips.DivideByThree, ButtonToolTips.DivideByThreeDesc );
+			this.registerApp( 11 + 4 * 16, Settings.ACTIONS, ActionItems.DECREASE_BY_ONE, ButtonToolTips.DecreaseByOne, ButtonToolTips.DecreaseByOneDesc );
+			this.registerApp( 12 + 4 * 16, Settings.ACTIONS, ActionItems.MAX_COUNT, ButtonToolTips.MaxCount, ButtonToolTips.MaxCountDesc );
+
 			this.registerApp( 8, Settings.ACTIONS, ActionItems.ENCODE, ButtonToolTips.Encode, ButtonToolTips.EncodeDescription );
 			this.registerApp( 4 + 3 * 16, Settings.ACTIONS, ItemSubstitution.ENABLED, ButtonToolTips.Substitutions, ButtonToolTips.SubstitutionsDescEnabled );
 			this.registerApp( 7 + 3 * 16, Settings.ACTIONS, ItemSubstitution.DISABLED, ButtonToolTips.Substitutions, ButtonToolTips.SubstitutionsDescDisabled );
@@ -0,0 +1,25 @@
+package appeng.client.render;
+
+import net.minecraft.util.math.BlockPos;
+
+// taken from McJty's McJtyLib
+public class BlockPosHighlighter
+{
+    private static BlockPos hilightedBlock;
+    private static long expireHilight;
+
+    public static void hilightBlock( BlockPos c, long expireHilight ) {
+        hilightedBlock = c;
+        BlockPosHighlighter.expireHilight = expireHilight;
+    }
+
+    public static BlockPos getHilightedBlock() {
+        return hilightedBlock;
+    }
+
+    public static long getExpireHilight() {
+        return expireHilight;
+    }
+
+
+}
@@ -45,6 +45,7 @@ public class FacadeBakedItemModel extends DelegateBakedModel

 	private final ItemStack textureStack;
 	private final FacadeBuilder facadeBuilder;
+	private List<BakedQuad> quads = null;

 	protected FacadeBakedItemModel( IBakedModel base, ItemStack textureStack, FacadeBuilder facadeBuilder )
 	{
@@ -60,9 +61,13 @@ public class FacadeBakedItemModel extends DelegateBakedModel
 		{
 			return Collections.emptyList();
 		}
-		List<BakedQuad> quads = new ArrayList<>();
-		quads.addAll( this.facadeBuilder.buildFacadeItemQuads( this.textureStack, EnumFacing.NORTH ) );
-		quads.addAll( this.getBaseModel().getQuads( state, side, rand ) );
+		if( quads == null )
+		{
+		    quads = new ArrayList<>();
+            quads.addAll( this.facadeBuilder.buildFacadeItemQuads( this.textureStack, EnumFacing.NORTH ) );
+            quads.addAll( this.getBaseModel().getQuads( state, side, rand ) );
+            quads = Collections.unmodifiableList( quads );
+        }
 		return quads;
 	}

@@ -21,9 +21,12 @@ package appeng.client.render;

 import java.util.Collections;
 import java.util.List;
+import java.util.Objects;

 import javax.annotation.Nullable;

+import it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap;
+import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.renderer.block.model.BakedQuad;
 import net.minecraft.client.renderer.block.model.IBakedModel;
@@ -47,6 +50,7 @@ public class FacadeDispatcherBakedModel extends DelegateBakedModel
 {
 	private final VertexFormat format;
 	private final FacadeBuilder facadeBuilder;
+	private final Int2ObjectMap<FacadeBakedItemModel> cache = new Int2ObjectArrayMap<>();

 	public FacadeDispatcherBakedModel( IBakedModel baseModel, VertexFormat format, FacadeBuilder facadeBuilder )
 	{
@@ -91,7 +95,15 @@ public class FacadeDispatcherBakedModel extends DelegateBakedModel

 				ItemStack textureItem = itemFacade.getTextureItem( stack );

-				return new FacadeBakedItemModel( FacadeDispatcherBakedModel.this.getBaseModel(), textureItem, FacadeDispatcherBakedModel.this.facadeBuilder );
+				int hash = Objects.hash( textureItem.getItem().getRegistryName(), textureItem.getMetadata(), textureItem.getTagCompound() );
+				FacadeBakedItemModel model = FacadeDispatcherBakedModel.this.cache.get( hash );
+				if( model == null )
+				{
+				    model = new FacadeBakedItemModel(FacadeDispatcherBakedModel.this.getBaseModel(), textureItem, FacadeDispatcherBakedModel.this.facadeBuilder);
+                    FacadeDispatcherBakedModel.this.cache.put(hash, model);
+                }
+
+				return model;
 			}
 		};
 	}
@@ -493,6 +493,11 @@ class CableBuilder
 			this.addCoveredConnection( facing, cableColor, connectionType, cableBusAdjacent, quadsOut );
 			return;
 		}
+		else if( connectionType == AECableType.DENSE_COVERED )
+		{
+			this.addDenseCoveredConnection( facing, cableColor, connectionType, cableBusAdjacent, quadsOut );
+			return;
+		}

 		CubeBuilder cubeBuilder = new CubeBuilder( this.format, quadsOut );

@@ -172,7 +172,7 @@ public class CableBusBakedModel implements IBakedModel

 		final AECableType secondType = sides.get( firstSide.getOpposite() );

-		return firstType == secondType;
+		return firstType == secondType && cableType == firstType && cableType == secondType;
 	}

 	private void addCableQuads( CableBusRenderState renderState, List<BakedQuad> quadsOut )
@@ -67,8 +67,8 @@ import appeng.thirdparty.codechicken.lib.model.pipeline.transformers.QuadTinter;
 public class FacadeBuilder
 {

-	public static double THICK_THICKNESS = 2D / 16D;
-	public static double THIN_THICKNESS = 1D / 16D;
+	public static final double THICK_THICKNESS = 2D / 16D;
+	public static final double THIN_THICKNESS = 1D / 16D;

 	public static final AxisAlignedBB[] THICK_FACADE_BOXES = new AxisAlignedBB[] {
 			new AxisAlignedBB( 0.0, 0.0, 0.0, 1.0, THICK_THICKNESS, 1.0 ),
@@ -141,7 +141,7 @@ public class FacadeBuilder

 			IBlockState blockState = facadeRenderState.getSourceBlock();
 			// If we aren't forcing transparency let the block decide if it should render.
-			if( !transparent )
+			if( !transparent && layer != null )
 			{
 				if( !blockState.getBlock().canRenderInLayer( blockState, layer ) )
 				{
@@ -224,7 +224,7 @@ public class FacadeBuilder

 			List<BakedQuad> modelQuads = new ArrayList<>();
 			// If we are forcing transparent facades, fake the render layer, and grab all quads.
-			if( transparent )
+			if( transparent || layer == null )
 			{
 				for( BlockRenderLayer forcedLayer : BlockRenderLayer.values() )
 				{
@@ -100,15 +100,18 @@ class GlassBakedModel implements IBakedModel
 	@Override
 	public List<BakedQuad> getQuads( @Nullable IBlockState state, @Nullable EnumFacing side, long rand )
 	{
-
 		if( !( state instanceof IExtendedBlockState ) || side == null )
 		{
 			return Collections.emptyList();
 		}

-		IExtendedBlockState extState = (IExtendedBlockState) state;
+		final IExtendedBlockState extState = (IExtendedBlockState) state;
+		final GlassState glassState = extState.getValue( BlockQuartzGlass.GLASS_STATE );

-		GlassState glassState = extState.getValue( BlockQuartzGlass.GLASS_STATE );
+		if( glassState == null )
+		{
+			return Collections.emptyList();
+		}

 		final int cx = Math.abs( glassState.getX() % 10 );
 		final int cy = Math.abs( glassState.getY() % 10 );
@@ -125,12 +128,12 @@ class GlassBakedModel implements IBakedModel
 			v /= 2;
 		}

-		TextureAtlasSprite glassTexture = this.glassTextures[texIdx];
+		final TextureAtlasSprite glassTexture = this.glassTextures[texIdx];

 		// Render the glass side
-		List<BakedQuad> quads = new ArrayList<>( 5 ); // At most 5
+		final List<BakedQuad> quads = new ArrayList<>( 5 ); // At most 5

-		List<Vec3d> corners = RenderHelper.getFaceCorners( side );
+		final List<Vec3d> corners = RenderHelper.getFaceCorners( side );
 		quads.add( this.createQuad( side, corners, glassTexture, u, v ) );

 		/*
@@ -143,8 +146,9 @@ class GlassBakedModel implements IBakedModel
 		 * Converted to a number, this bitmask is 5. So the texture at index 5 is used.
 		 * That texture had "0101" in its filename to indicate this.
 		 */
-		int edgeBitmask = makeBitmask( glassState, side );
-		TextureAtlasSprite sideSprite = this.frameTextures[edgeBitmask];
+		final int edgeBitmask = makeBitmask( glassState, side );
+		final TextureAtlasSprite sideSprite = this.frameTextures[edgeBitmask];
+
 		if( sideSprite != null )
 		{
 			quads.add( this.createQuad( side, corners, sideSprite, 0, 0 ) );
@@ -462,7 +462,6 @@ public abstract class AEBaseContainer extends Container
 							else if( destination.isEmpty() )
 							{
 								cs.putStack( tis.copy() );
-								cs.onSlotChanged();
 								this.updateSlot( cs );
 								break;
 							}
@@ -700,8 +699,23 @@ public abstract class AEBaseContainer extends Container
 							is.setCount( 1 );
 							s.putStack( is );
 						}
-
+						else
+						{
+							final ItemStack is = s.getStack().copy();
+							if (is.getCount() < is.getMaxStackSize())
+								is.grow( 1 );
+							s.putStack( is );
+						}
 						break;
+					case PICKUP_SINGLE:
+						if( hand.isEmpty() )
+						{
+							final ItemStack is = s.getStack().copy();
+							if (is.getCount() > 1)
+								is.shrink( 1 );
+							s.putStack( is );
+						}
+					break;
 					case SPLIT_OR_PLACE_SINGLE:

 						ItemStack is = s.getStack();
@@ -47,7 +47,7 @@ import appeng.container.slot.SlotRestrictedInput;
 import appeng.tile.misc.TileCellWorkbench;
 import appeng.util.Platform;
 import appeng.util.helpers.ItemHandlerUtil;
-import appeng.util.inv.WrapperLazyItemHandler;
+import appeng.util.inv.WrapperSupplierItemHandler;
 import appeng.util.iterators.NullIterator;


@@ -97,7 +97,7 @@ public class ContainerCellWorkbench extends ContainerUpgradeable
 		this.addSlotToContainer( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.WORKBENCH_CELL, cell, 0, 152, 8, this.getPlayerInv() ) );

 		final IItemHandler inv = this.getUpgradeable().getInventoryByName( "config" );
-		final WrapperLazyItemHandler upgradeInventory = new WrapperLazyItemHandler( this::getCellUpgradeInventory );
+		final WrapperSupplierItemHandler upgradeInventory = new WrapperSupplierItemHandler( this::getCellUpgradeInventory );
 		// null, 3 * 8 );

 		int offset = 0;
@@ -51,6 +51,12 @@ public class ContainerCraftAmount extends AEBaseContainer
 		this.addSlotToContainer( this.getCraftingItem() );
 	}

+	@Override
+	public Slot getSlot( int slotId )
+	{
+		return super.getSlot( 0 );
+	}
+
 	@Override
 	public void detectAndSendChanges()
 	{
@@ -53,7 +53,7 @@ public class ContainerInterface extends ContainerUpgradeable
 		for( int x = 0; x < DualityInterface.NUMBER_OF_PATTERN_SLOTS; x++ )
 		{
 			this.addSlotToContainer( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.ENCODED_PATTERN, this.myDuality
-					.getPatterns(), x, 8 + 18 * x, 90 + 7, this.getInventoryPlayer() ) );
+					.getPatterns(), x, 8 + 18 * x, 90 + 7, this.getInventoryPlayer() ).setStackLimit( 1 ) );
 		}

 		for( int x = 0; x < DualityInterface.NUMBER_OF_CONFIG_SLOTS; x++ )
@@ -28,6 +28,8 @@ import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTUtil;
+import net.minecraft.util.math.BlockPos;
 import net.minecraftforge.items.IItemHandler;

 import appeng.api.config.Settings;
@@ -78,7 +80,7 @@ public final class ContainerInterfaceTerminal extends AEBaseContainer
 			this.grid = anchor.getActionableNode().getGrid();
 		}

-		this.bindPlayerInventory( ip, 0, 222 - /* height of player inventory */82 );
+		this.bindPlayerInventory( ip, 0, 236 - /* height of player inventory */82 );
 	}

 	@Override
@@ -378,6 +380,7 @@ public final class ContainerInterfaceTerminal extends AEBaseContainer
 		{
 			tag.setLong( "sortBy", inv.sortBy );
 			tag.setString( "un", inv.unlocalizedName );
+			tag.setTag("pos", NBTUtil.createPosTag( inv.pos ) );
 		}

 		for( int x = 0; x < length; x++ )
@@ -408,6 +411,7 @@ public final class ContainerInterfaceTerminal extends AEBaseContainer
 		private final String unlocalizedName;
 		private final IItemHandler client;
 		private final IItemHandler server;
+		private final BlockPos pos;

 		public InvTracker( final DualityInterface dual, final IItemHandler patterns, final String unlocalizedName )
 		{
@@ -415,6 +419,7 @@ public final class ContainerInterfaceTerminal extends AEBaseContainer
 			this.client = new AppEngInternalInventory( null, this.server.getSlots() );
 			this.unlocalizedName = unlocalizedName;
 			this.sortBy = dual.getSortValue();
+			this.pos = dual.getLocation().getPos();
 		}
 	}

@@ -60,31 +60,21 @@ public class ContainerMEPortableCell extends ContainerMEMonitorable
 	{
 		final ItemStack currentItem = this.slot < 0 ? this.getPlayerInv().getCurrentItem() : this.getPlayerInv().getStackInSlot( this.slot );

-		if( this.civ != null )
-		{
-			if( currentItem != this.civ.getItemStack() )
-			{
-				if( !currentItem.isEmpty() )
-				{
-					if( ItemStack.areItemsEqual( this.civ.getItemStack(), currentItem ) )
-					{
-						this.getPlayerInv().setInventorySlotContents( this.getPlayerInv().currentItem, this.civ.getItemStack() );
-					}
-					else
-					{
-						this.setValidContainer( false );
-					}
-				}
-				else
-				{
-					this.setValidContainer( false );
-				}
-			}
-		}
-		else
+		if( this.civ == null || currentItem.isEmpty() )
 		{
 			this.setValidContainer( false );
 		}
+		else if( this.civ != null && !this.civ.getItemStack().isEmpty() && currentItem != this.civ.getItemStack() )
+		{
+			if( ItemStack.areItemsEqual( this.civ.getItemStack(), currentItem ) )
+			{
+				this.getPlayerInv().setInventorySlotContents( this.getPlayerInv().currentItem, this.civ.getItemStack() );
+			}
+			else
+			{
+				this.setValidContainer( false );
+			}
+		}

 		// drain 1 ae t
 		this.ticks++;
@@ -203,6 +203,19 @@ public class ContainerPatternTerm extends ContainerMEMonitorable implements IAEA

 	}

+	public void encodeAndMoveToInventory()
+	{
+		encode();
+		ItemStack output = this.patternSlotOUT.getStack();
+		if ( !output.isEmpty() )
+		{
+			if (!getPlayerInv().addItemStackToInventory( output )){
+				getPlayerInv().player.dropItem( output , false );
+			}
+			this.patternSlotOUT.putStack( ItemStack.EMPTY );
+		}
+	}
+
 	public void encode()
 	{
 		ItemStack output = this.patternSlotOUT.getStack();
@@ -269,6 +282,212 @@ public class ContainerPatternTerm extends ContainerMEMonitorable implements IAEA
 		output.setTagCompound( encodedValue );
 	}

+	public void multiply(int multiple)
+	{
+		ItemStack[] input = new ItemStack[9];
+		boolean canMultiplyInputs = true;
+		boolean canMultiplyOutputs = true;
+
+		for( int x = 0; x < this.craftingSlots.length; x++ )
+		{
+			input[x] = this.craftingSlots[x].getStack();
+			if( !input[x].isEmpty() && input[x].getCount() * multiple > input[x].getMaxStackSize() )
+			{
+				canMultiplyInputs = false;
+			}
+		}
+		for( final OptionalSlotFake outputSlot : this.outputSlots )
+		{
+			final ItemStack out = outputSlot.getStack();
+			if( !out.isEmpty() && out.getCount() * multiple > out.getMaxStackSize() )
+			{
+				canMultiplyOutputs = false;
+			}
+		}
+		if( canMultiplyInputs && canMultiplyOutputs )
+		{
+			for( SlotFakeCraftingMatrix craftingSlot : this.craftingSlots )
+			{
+				ItemStack stack = craftingSlot.getStack();
+				if( !stack.isEmpty() )
+				craftingSlot.getStack().setCount( stack.getCount() * multiple );
+			}
+			for( OptionalSlotFake outputSlot : this.outputSlots )
+			{
+				ItemStack stack = outputSlot.getStack();
+				if( !stack.isEmpty() )
+				outputSlot.getStack().setCount( stack.getCount() * multiple );
+			}
+		}
+	}
+
+	public void divide(int divide)
+	{
+		ItemStack[] input = new ItemStack[9];
+		boolean canDivideInputs = true;
+		boolean canDivideOutputs = true;
+
+		for( int x = 0; x < this.craftingSlots.length; x++ )
+		{
+			input[x] = this.craftingSlots[x].getStack();
+			if( !input[x].isEmpty() && input[x].getCount() % divide != 0 )
+			{
+				canDivideInputs = false;
+			}
+		}
+		for( final OptionalSlotFake outputSlot : this.outputSlots )
+		{
+			final ItemStack out = outputSlot.getStack();
+			if( !out.isEmpty() && out.getCount() % divide != 0 )
+			{
+				canDivideOutputs = false;
+			}
+		}
+		if( canDivideInputs && canDivideOutputs )
+		{
+			for( SlotFakeCraftingMatrix craftingSlot : this.craftingSlots )
+			{
+				ItemStack stack = craftingSlot.getStack();
+				if( !stack.isEmpty() )
+				craftingSlot.getStack().setCount( stack.getCount() / divide );
+			}
+			for( OptionalSlotFake outputSlot : this.outputSlots )
+			{
+				ItemStack stack = outputSlot.getStack();
+				if( !stack.isEmpty() )
+				outputSlot.getStack().setCount( stack.getCount() / divide );
+			}
+		}
+	}
+
+	public void increase(int increase)
+	{
+		ItemStack[] input = new ItemStack[9];
+		boolean canIncreaseInputs = true;
+		boolean canIncreaseOutputs = true;
+
+		for( int x = 0; x < this.craftingSlots.length; x++ )
+		{
+			input[x] = this.craftingSlots[x].getStack();
+			if( !input[x].isEmpty() && input[x].getCount() + increase > input[x].getMaxStackSize() )
+			{
+				canIncreaseInputs = false;
+			}
+		}
+		for( final OptionalSlotFake outputSlot : this.outputSlots )
+		{
+			final ItemStack out = outputSlot.getStack();
+			if( !out.isEmpty() && out.getCount() + increase > out.getMaxStackSize() )
+			{
+				canIncreaseOutputs = false;
+			}
+		}
+		if( canIncreaseInputs && canIncreaseOutputs )
+		{
+			for( SlotFakeCraftingMatrix craftingSlot : this.craftingSlots )
+			{
+				ItemStack stack = craftingSlot.getStack();
+				if( !stack.isEmpty() )
+				craftingSlot.getStack().setCount( stack.getCount() + increase );
+			}
+			for( OptionalSlotFake outputSlot : this.outputSlots )
+			{
+				ItemStack stack = outputSlot.getStack();
+				if( !stack.isEmpty() )
+				outputSlot.getStack().setCount( stack.getCount() + increase );
+			}
+		}
+	}
+
+	public void decrease(int decrease)
+	{
+		ItemStack[] input = new ItemStack[9];
+		boolean canDecreaseInputs = true;
+		boolean canDecreaseOutputs = true;
+
+		for( int x = 0; x < this.craftingSlots.length; x++ )
+		{
+			input[x] = this.craftingSlots[x].getStack();
+			if( !input[x].isEmpty() && input[x].getCount() - decrease < 1 )
+			{
+				canDecreaseInputs = false;
+			}
+		}
+		for( final OptionalSlotFake outputSlot : this.outputSlots )
+		{
+			final ItemStack out = outputSlot.getStack();
+			if( !out.isEmpty() && out.getCount() - decrease < 1 )
+			{
+				canDecreaseOutputs = false;
+			}
+		}
+		if( canDecreaseInputs && canDecreaseOutputs )
+		{
+			for( SlotFakeCraftingMatrix craftingSlot : this.craftingSlots )
+			{
+				ItemStack stack = craftingSlot.getStack();
+				if( !stack.isEmpty() )
+				craftingSlot.getStack().setCount( stack.getCount() - decrease );
+			}
+			for( OptionalSlotFake outputSlot : this.outputSlots )
+			{
+				ItemStack stack = outputSlot.getStack();
+				if( !stack.isEmpty() )
+				outputSlot.getStack().setCount( stack.getCount() - decrease );
+			}
+		}
+	}
+
+	public void maximizeCount()
+	{
+		ItemStack[] input = new ItemStack[9];
+		boolean canGrowInputs = true;
+		boolean canGrowOutputs = true;
+		int maxInputStackGrowth = 0;
+		int maxOutputStackGrowth = 0;
+
+
+		for( int x = 0; x < this.craftingSlots.length; x++ )
+		{
+			input[x] = this.craftingSlots[x].getStack();
+			if( !input[x].isEmpty() && input[x].getMaxStackSize() - input[x].getCount() > maxInputStackGrowth )
+			{
+				maxInputStackGrowth = input[x].getMaxStackSize() - input[x].getCount();
+			}
+			if( !input[x].isEmpty() && input[x].getCount() + maxInputStackGrowth > input[x].getMaxStackSize() )
+			{
+				canGrowInputs = false;
+			}
+		}
+		for( final OptionalSlotFake outputSlot : this.outputSlots )
+		{
+			final ItemStack out = outputSlot.getStack();
+			{
+				maxOutputStackGrowth = out.getMaxStackSize() - out.getCount();
+			}
+			if( !out.isEmpty() && out.getCount() + maxOutputStackGrowth > out.getMaxStackSize() )
+			{
+				canGrowOutputs = false;
+			}
+		}
+		if( canGrowInputs && canGrowOutputs )
+		{
+			int maxStackGrowth = Math.min(maxInputStackGrowth,maxOutputStackGrowth);
+			for( SlotFakeCraftingMatrix craftingSlot : this.craftingSlots )
+			{
+				ItemStack stack = craftingSlot.getStack();
+				if( !stack.isEmpty() )
+					craftingSlot.getStack().setCount( stack.getCount() + maxStackGrowth );
+			}
+			for( OptionalSlotFake outputSlot : this.outputSlots )
+			{
+				ItemStack stack = outputSlot.getStack();
+				if( !stack.isEmpty() )
+					outputSlot.getStack().setCount( stack.getCount() + maxStackGrowth );
+			}
+		}
+	}
+
 	private ItemStack[] getInputs()
 	{
 		final ItemStack[] input = new ItemStack[9];
@@ -87,7 +87,7 @@ public class AppEngSlot extends Slot
 	{
 		if( this.isSlotEnabled() )
 		{
-			return ItemHandlerUtil.isItemValidForSlot( this.itemHandler, this.index, par1ItemStack );
+			return this.itemHandler.isItemValid( this.index, par1ItemStack );
 		}
 		return false;
 	}
@@ -121,7 +121,6 @@ public class AppEngSlot extends Slot
 		if( this.isSlotEnabled() )
 		{
 			ItemHandlerUtil.setStackInSlot( this.itemHandler, this.index, stack );
-			this.onSlotChanged();

 			if( this.getContainer() != null )
 			{
@@ -138,7 +137,6 @@ public class AppEngSlot extends Slot
 	@Override
 	public void onSlotChanged()
 	{
-		ItemHandlerUtil.markDirty( this.itemHandler, this.index );
 		this.setIsValid( hasCalculatedValidness.NotAvailable );
 	}

@@ -47,6 +47,8 @@ import net.minecraftforge.fml.common.event.FMLServerStoppedEvent;
 import net.minecraftforge.fml.common.event.FMLServerStoppingEvent;
 import net.minecraftforge.fml.common.network.NetworkRegistry;

+import team.chisel.ctm.CTM;
+
 import appeng.api.AEApi;
 import appeng.core.crash.CrashInfo;
 import appeng.core.crash.IntegrationCrashEnhancement;
@@ -81,7 +83,7 @@ public final class AppEng

 	private static final String FORGE_CURRENT_VERSION = ForgeVersion.majorVersion + "." + ForgeVersion.minorVersion + "." + ForgeVersion.revisionVersion + "." + ForgeVersion.buildVersion;
 	private static final String FORGE_MAX_VERSION = ( ForgeVersion.majorVersion + 1 ) + ".0.0.0";
-	public static final String MOD_DEPENDENCIES = "required-after:forge@[" + FORGE_CURRENT_VERSION + "," + FORGE_MAX_VERSION + ")";
+	public static final String MOD_DEPENDENCIES = "required-after:forge@[" + FORGE_CURRENT_VERSION + "," + FORGE_MAX_VERSION + ");after:ctm@[" + CTM.VERSION + ",);";

 	@Nonnull
 	private static final AppEng INSTANCE = new AppEng();
@@ -164,6 +164,7 @@ public enum AEFeature
 	PATTERNS( "Patterns", Constants.CATEGORY_CRAFTING_FEATURES ),
 	CRAFTING_CPU( "CraftingCPU", Constants.CATEGORY_CRAFTING_FEATURES ),
 	CRAFTING_MANAGER_FALLBACK( "CraftingManagerFallback", Constants.CATEGORY_CRAFTING_FEATURES, "Use CraftingManager to find an alternative recipe, after a pattern rejected an ingredient. Should be enabled to avoid issues, but can have a minor performance impact." ),
+	INSANE_BLOCKING_MODE( "InsaneBlockingMode", Constants.CATEGORY_CRAFTING_FEATURES, "Use the default AE2 blocking mode that doesn't work on any machines" ),

 	BASIC_CARDS( "BasicCards", Constants.CATEGORY_UPGRADES ),
 	ADVANCED_CARDS( "AdvancedCards", Constants.CATEGORY_UPGRADES ),
@@ -137,6 +137,21 @@ public enum ButtonToolTips
 	BlockPlacementYes,
 	BlockPlacementNo,

+	MultiplyByTwo,
+	MultiplyByTwoDesc,
+	MultiplyByThree,
+	MultiplyByThreeDesc,
+	IncreaseByOne,
+	IncreaseByOneDesc,
+	DivideByTwo,
+	DivideByTwoDesc,
+	DivideByThree,
+	DivideByThreeDesc,
+	DecreaseByOne,
+	DecreaseByOneDesc,
+	MaxCount,
+	MaxCountDesc,
+
 	// Used in the tooltips of the items in the terminal, when moused over
 	ItemsStored,
 	ItemsRequestable,
@@ -29,6 +29,7 @@ public enum PlayerMessages
 	InvalidMachine,
 	LoadedSettings,
 	SavedSettings,
+	ResetSettings,
 	MachineNotPowered,

 	isNowLocked,
@@ -23,7 +23,12 @@ import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
+import java.util.Collection;
+import java.util.Iterator;

+import appeng.api.config.FuzzyMode;
+import appeng.api.storage.data.IItemList;
+import appeng.container.implementations.ContainerPatternTerm;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;

@@ -64,6 +69,8 @@ public class PacketJEIRecipe extends AppEngPacket
 {

 	private ItemStack[][] recipe;
+	private ItemStack[] output;
+

 	// automatic.
 	public PacketJEIRecipe( final ByteBuf stream ) throws IOException
@@ -86,7 +93,19 @@ public class PacketJEIRecipe extends AppEngPacket
 					}
 				}
 			}
+			if ( comp.hasKey("outputs") ) {
+				final NBTTagList outputList = comp.getTagList("outputs", 10);
+				this.output = new ItemStack[3];
+				for( int x = 0; x < this.output.length; x++ )
+				{
+					if( outputList.tagCount() > 0 )
+					{
+						this.output[x] = new ItemStack(outputList.getCompoundTagAt( x ));
+					}
+				}
+			}
 		}
+
 	}

 	// api
@@ -185,6 +204,26 @@ public class PacketJEIRecipe extends AppEngPacket
 								if( cct.useRealItems() )
 								{
 									out = Platform.poweredExtraction( energy, storage, request, cct.getActionSource() );
+									if( out == null )
+									{
+										Collection<IAEItemStack> outList = inv.getInventory( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) ).getStorageList().findFuzzy( request, FuzzyMode.IGNORE_ALL );
+										IAEItemStack mostDamaged = null;
+										for( IAEItemStack is : outList )
+										{
+											if( !is.isCraftable() )
+											{
+												if( mostDamaged == null || mostDamaged.getItemDamage() < is.getItemDamage() )
+												{
+													mostDamaged = is;
+												}
+											}
+										}
+										if( mostDamaged != null )
+										{
+											mostDamaged.setStackSize( 1 );
+											out = Platform.poweredExtraction( energy, storage, mostDamaged, cct.getActionSource() );
+										}
+									}
 								}
 								else
 								{
@@ -198,10 +237,27 @@ public class PacketJEIRecipe extends AppEngPacket
 										// Fall back using an existing item
 										out = storage.extractItems( request, Actionable.SIMULATE, cct.getActionSource() );
 									}
+
+									if( out == null )
+									{
+										IItemList<IAEItemStack> items = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList();
+										Iterator<IAEItemStack> iterator = inv.getInventory( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) ).getAvailableItems( items ).iterator();
+										while ( iterator.hasNext() )
+										{
+											final IAEItemStack o = iterator.next();
+											if( o.getDefinition().isItemEqual( request.getDefinition() ) && o.isCraftable() )
+											{
+												out = o;
+												break;
+											}
+											iterator.remove();
+										}
+									}
 								}

 								if( out != null )
 								{
+									out.setStackSize( recipe[x][y].getCount() );
 									currentItem = out.createItemStack();
 								}
 							}
@@ -213,11 +269,15 @@ public class PacketJEIRecipe extends AppEngPacket

 								if( cct.useRealItems() )
 								{
-									currentItem = ad.removeItems( 1, this.recipe[x][y], null );
+									currentItem = ad.removeSimilarItems(1, this.recipe[x][y],FuzzyMode.IGNORE_ALL, null );
 								}
 								else
 								{
-									currentItem = ad.simulateRemove( 1, this.recipe[x][y], null );
+									currentItem = ad.simulateSimilarRemove(recipe[x][y].getCount(), this.recipe[x][y],FuzzyMode.IGNORE_ALL, null );
+									if( currentItem.isEmpty() )
+									{
+										currentItem = this.recipe[x][y].copy();
+									}
 								}
 							}
 						}
@@ -225,7 +285,17 @@ public class PacketJEIRecipe extends AppEngPacket
 				}
 				ItemHandlerUtil.setStackInSlot( craftMatrix, x, currentItem );
 			}
+
 			con.onCraftMatrixChanged( new WrapperInvItemHandler( craftMatrix ) );
+
+			if( this.output != null && con instanceof ContainerPatternTerm && !( (ContainerPatternTerm) con ).isCraftingMode() )
+			{
+				IItemHandler outputSlots = cct.getInventoryByName( "output" );
+				for( int i = 0; i < this.output.length; ++i )
+				{
+					ItemHandlerUtil.setStackInSlot( outputSlots, i, this.output[i] );
+				}
+			}
 		}
 	}

@@ -175,12 +175,46 @@ public class PacketValueConfig extends AppEngPacket
 			}
 			else if( this.Name.equals( "PatternTerminal.Encode" ) )
 			{
-				cpt.encode();
+				if (this.Value.equals( "2" )) {
+					cpt.encodeAndMoveToInventory();
+				}
+				else
+				{
+					cpt.encode();
+				}
 			}
 			else if( this.Name.equals( "PatternTerminal.Clear" ) )
 			{
 				cpt.clear();
 			}
+			else if( this.Name.equals( "PatternTerminal.MultiplyByTwo" ) )
+			{
+				cpt.multiply(2);
+			}
+			else if( this.Name.equals( "PatternTerminal.MultiplyByThree" ) )
+			{
+				cpt.multiply(3);
+			}
+			else if( this.Name.equals( "PatternTerminal.DivideByTwo" ) )
+			{
+				cpt.divide(2);
+			}
+			else if( this.Name.equals( "PatternTerminal.DivideByThree" ) )
+			{
+				cpt.divide(3);
+			}
+			else if( this.Name.equals( "PatternTerminal.IncreaseByOne" ) )
+			{
+				cpt.increase(1);
+			}
+			else if( this.Name.equals( "PatternTerminal.DecreaseByOne" ) )
+			{
+				cpt.decrease(1);
+			}
+			else if( this.Name.equals( "PatternTerminal.MaximizeCount" ) )
+			{
+				cpt.maximizeCount();
+			}
 			else if( this.Name.equals( "PatternTerminal.Substitute" ) )
 			{
 				cpt.getPatternTerminal().setSubstitution( this.Value.equals( "1" ) );
@@ -59,7 +59,6 @@ public class CraftingJob implements Runnable, ICraftingJob
 	private final IItemList<IAEItemStack> missing = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList();
 	private final HashMap<String, TwoIntegers> opsAndMultiplier = new HashMap<>();
 	private final Object monitor = new Object();
-	private final Stopwatch watch = Stopwatch.createUnstarted();
 	private CraftingTreeNode tree;
 	private final IAEItemStack output;
 	private boolean simulate = false;
@@ -67,10 +66,7 @@ public class CraftingJob implements Runnable, ICraftingJob
 	private long bytes = 0;
 	private final IActionSource actionSrc;
 	private final ICraftingCallback callback;
-	private boolean running = false;
 	private boolean done = false;
-	private int time = 5;
-	private int incTime = Integer.MAX_VALUE;

 	private World wrapWorld( final World w )
 	{
@@ -137,7 +133,6 @@ public class CraftingJob implements Runnable, ICraftingJob
 			try
 			{
 				TickHandler.INSTANCE.registerCraftingSimulation( this.world, this );
-				this.handlePausing();

 				final Stopwatch timer = Stopwatch.createStarted();

@@ -219,42 +214,6 @@ public class CraftingJob implements Runnable, ICraftingJob
 		this.finish();
 	}

-	void handlePausing() throws InterruptedException
-	{
-		if( this.incTime > 100 )
-		{
-			this.incTime = 0;
-
-			synchronized( this.monitor )
-			{
-				if( this.watch.elapsed( TimeUnit.MICROSECONDS ) > this.time )
-				{
-					this.running = false;
-					this.watch.stop();
-					this.monitor.notify();
-				}
-
-				if( !this.running )
-				{
-					AELog.craftingDebug( "crafting job will now sleep" );
-
-					while( !this.running )
-					{
-						this.monitor.wait();
-					}
-
-					AELog.craftingDebug( "crafting job now active" );
-				}
-			}
-
-			if( Thread.interrupted() )
-			{
-				throw new InterruptedException();
-			}
-		}
-		this.incTime++;
-	}
-
 	private void finish()
 	{
 		if( this.callback != null )
@@ -266,7 +225,6 @@ public class CraftingJob implements Runnable, ICraftingJob

 		synchronized( this.monitor )
 		{
-			this.running = false;
 			this.done = true;
 			this.monitor.notify();
 		}
@@ -310,45 +268,15 @@ public class CraftingJob implements Runnable, ICraftingJob
 	}

 	/**
-	 * returns true if this needs more simulation.
-	 *
-	 * @param milli milliseconds of simulation
-	 *
 	 * @return true if this needs more simulation
 	 */
-	public boolean simulateFor( final int milli )
+	public boolean simulateFor()
 	{
-		this.time = milli;
-
-		synchronized( this.monitor )
-		{
-			if( this.done )
-			{
+		synchronized( this.monitor ) {
+			if ( this.done ) {
 				return false;
 			}
-
-			this.watch.reset();
-			this.watch.start();
-			this.running = true;
-
-			AELog.craftingDebug( "main thread is now going to sleep" );
-
-			this.monitor.notify();
-
-			while( this.running )
-			{
-				try
-				{
-					this.monitor.wait();
-				}
-				catch( final InterruptedException ignored )
-				{
-				}
-			}
-
-			AELog.craftingDebug( "main thread is now active" );
 		}
-
 		return true;
 	}

@@ -119,7 +119,6 @@ public class CraftingTreeNode

 	IAEItemStack request( final MECraftingInventory inv, long l, final IActionSource src ) throws CraftBranchFailure, InterruptedException
 	{
-		this.job.handlePausing();

 		final List<IAEItemStack> thingsUsed = new ArrayList<>();

@@ -147,7 +146,7 @@ public class CraftingTreeNode

 			for( IAEItemStack fuzz : itemList )
 			{
-				if( this.parent.details.isValidItemForSlot( this.getSlot(), fuzz.createItemStack(), this.world ) )
+				if( this.parent.details.isValidItemForSlot( this.getSlot(), fuzz.copy().setStackSize( 1 ).createItemStack(), this.world ) )
 				{
 					fuzz = fuzz.copy();
 					fuzz.setStackSize( l );
@@ -77,8 +77,6 @@ public class CraftingTreeProcess
 				ic.setInventorySlotContents( x, is[x] == null ? ItemStack.EMPTY : is[x].createItemStack() );
 			}

-			FMLCommonHandler.instance().firePlayerCraftingEvent( Platform.getPlayer( (WorldServer) world ), details.getOutput( ic, world ), ic );
-
 			for( int x = 0; x < ic.getSizeInventory(); x++ )
 			{
 				final ItemStack g = ic.getStackInSlot( x );
@@ -187,7 +185,6 @@ public class CraftingTreeProcess

 	void request( final MECraftingInventory inv, final long i, final IActionSource src ) throws CraftBranchFailure, InterruptedException
 	{
-		this.job.handlePausing();

 		if( this.fullSimulation )
 		{
@@ -201,8 +198,6 @@ public class CraftingTreeProcess
 				ic.setInventorySlotContents( entry.getKey().getSlot(), stack.createItemStack() );
 			}

-			FMLCommonHandler.instance().firePlayerCraftingEvent( Platform.getPlayer( (WorldServer) this.world ), this.details.getOutput( ic, this.world ), ic );
-
 			for( int x = 0; x < ic.getSizeInventory(); x++ )
 			{
 				ItemStack is = ic.getStackInSlot( x );
@@ -265,7 +260,7 @@ public class CraftingTreeProcess
 	{
 		for( final IAEItemStack is : this.details.getCondensedOutputs() )
 		{
-			if( is.equals( what2 ) )
+			if( is.isSameType( what2 ) )
 			{
 				what2 = what2.copy();
 				what2.setStackSize( is.getStackSize() );
@@ -105,7 +105,7 @@ public class BlockQuartzGlass extends AEBaseBlock
 			}
 		}

-		return w.getBlockState( pos ).shouldSideBeRendered( w, adjacentPos, side );
+		return super.shouldSideBeRendered( state, w, pos, side );
 	}

 	@Override
@@ -128,7 +128,7 @@ public class FluidStackSizeRenderer
 		format.setDecimalFormatSymbols( symbols );
 		format.setRoundingMode( RoundingMode.DOWN );

-		return format.format( originalSize / 1000f );
+		return format.format( originalSize / 1000d );
 	}

 }
@@ -27,11 +27,8 @@ import javax.annotation.Nonnull;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.init.Items;
 import net.minecraft.inventory.IContainerListener;
 import net.minecraft.item.ItemStack;
-import net.minecraftforge.common.ForgeModContainer;
-import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.FluidUtil;
 import net.minecraftforge.fluids.capability.IFluidHandlerItem;
@@ -353,32 +350,24 @@ public class ContainerFluidTerminal extends AEBaseContainer implements IConfigMa
 			super.doAction( player, action, slot, id );
 			return;
 		}
-		ItemStack held = player.inventory.getItemStack();
+
+		final ItemStack held = player.inventory.getItemStack();
 		if( held.getCount() != 1 )
 		{
 			// only support stacksize 1 for now
 			return;
 		}
-		IFluidHandlerItem fh = FluidUtil.getFluidHandler( held );
+
+		final IFluidHandlerItem fh = FluidUtil.getFluidHandler( held );
 		if( fh == null )
 		{
 			// only fluid handlers items
 			return;
 		}
-		boolean isBucket = held.getItem() == Items.BUCKET || held.getItem() == Items.WATER_BUCKET || held.getItem() == Items.LAVA_BUCKET || held
-				.getItem() == Items.MILK_BUCKET || held.getItem() == ForgeModContainer.getInstance().universalBucket;

 		if( action == InventoryAction.FILL_ITEM && this.clientRequestedTargetFluid != null )
 		{
-			AEFluidStack stack = (AEFluidStack) this.clientRequestedTargetFluid.copy();
-
-			AELog.debug( "Filling %s with %s, %s mb", held.getDisplayName(), this.clientRequestedTargetFluid.getFluidStack().getLocalizedName(),
-					stack.getStackSize() );
-
-			if( isBucket && stack.getStackSize() < Fluid.BUCKET_VOLUME )
-			{ // Although buckets support less than a buckets worth of fluid, it does not display how much it holds
-				return;
-			}
+			final IAEFluidStack stack = this.clientRequestedTargetFluid.copy();

 			// Check how much we can store in the item
 			stack.setStackSize( Integer.MAX_VALUE );
@@ -386,16 +375,22 @@ public class ContainerFluidTerminal extends AEBaseContainer implements IConfigMa
 			stack.setStackSize( amountAllowed );

 			// Check if we can pull out of the system
-			IAEFluidStack canPull = Platform.poweredExtraction( this.getPowerSource(), this.monitor, stack, this.getActionSource(), Actionable.SIMULATE );
-			if( canPull == null || canPull.getStackSize() < 1 || ( isBucket && canPull.getStackSize() != Fluid.BUCKET_VOLUME ) )
+			final IAEFluidStack canPull = Platform.poweredExtraction( this.getPowerSource(), this.monitor, stack, this.getActionSource(), Actionable.SIMULATE );
+			if( canPull == null || canPull.getStackSize() < 1 )
+			{
+				return;
+			}
+
+			// How much could fit into the container
+			final int canFill = fh.fill( canPull.getFluidStack(), false );
+			if( canFill == 0 )
 			{
-				// Either we couldn't pull out of the system,
-				// or we are using a bucket and can only pull out less than a buckets worth of fluid
 				return;
 			}

 			// Now actually pull out of the system
-			IAEFluidStack pulled = Platform.poweredExtraction( this.getPowerSource(), this.monitor, stack, this.getActionSource() );
+			stack.setStackSize( canFill );
+			final IAEFluidStack pulled = Platform.poweredExtraction( this.getPowerSource(), this.monitor, stack, this.getActionSource() );
 			if( pulled == null || pulled.getStackSize() < 1 )
 			{
 				// Something went wrong
@@ -404,42 +399,55 @@ public class ContainerFluidTerminal extends AEBaseContainer implements IConfigMa
 			}

 			// Actually fill
-			fh.fill( pulled.getFluidStack(), true );
+			final int used = fh.fill( pulled.getFluidStack(), true );
+
+			if( used != canFill )
+			{
+				AELog.error( "Fluid item [%s] reported a different possible amount than it actually accepted.", held.getDisplayName() );
+			}

 			player.inventory.setItemStack( fh.getContainer() );
 			this.updateHeld( player );
 		}
 		else if( action == InventoryAction.EMPTY_ITEM )
 		{
-			// Empty held item
-			AELog.debug( "Emptying %s", held.getDisplayName() );
-
 			// See how much we can drain from the item
-			FluidStack extract = fh.drain( Integer.MAX_VALUE, false );
+			final FluidStack extract = fh.drain( Integer.MAX_VALUE, false );
 			if( extract == null || extract.amount < 1 )
 			{
 				return;
 			}

 			// Check if we can push into the system
-			IAEFluidStack notPushed = Platform.poweredInsert( this.getPowerSource(), this.monitor, AEFluidStack.fromFluidStack( extract ),
+			final IAEFluidStack notStorable = Platform.poweredInsert( this.getPowerSource(), this.monitor, AEFluidStack.fromFluidStack( extract ),
 					this.getActionSource(), Actionable.SIMULATE );
-			if( isBucket && notPushed != null && notPushed.getStackSize() > 0 )
-			{
-				// We can't push enough for the bucket
-				return;
-			}

-			IAEFluidStack notInserted = Platform.poweredInsert( this.getPowerSource(), this.monitor, AEFluidStack.fromFluidStack( extract ),
-					this.getActionSource() );
-			if( notInserted != null && notInserted.getStackSize() > 0 )
+			if( notStorable != null && notStorable.getStackSize() > 0 )
 			{
-				// Only try to extract the amount we DID insert
-				extract.amount -= Math.toIntExact( notInserted.getStackSize() );
+				final int toStore = (int) ( extract.amount - notStorable.getStackSize() );
+				final FluidStack storable = fh.drain( toStore, false );
+
+				if( storable == null || storable.amount == 0 )
+				{
+					return;
+				}
+				else
+				{
+					extract.amount = storable.amount;
+				}
 			}

 			// Actually drain
-			fh.drain( extract, true );
+			final FluidStack drained = fh.drain( extract, true );
+			extract.amount = drained.amount;
+
+			final IAEFluidStack notInserted = Platform.poweredInsert( this.getPowerSource(), this.monitor, AEFluidStack.fromFluidStack( extract ),
+					this.getActionSource() );
+
+			if( notInserted != null && notInserted.getStackSize() > 0 )
+			{
+				AELog.error( "Fluid item [%s] reported a different possible amount to drain than it actually provided.", held.getDisplayName() );
+			}

 			player.inventory.setItemStack( fh.getContainer() );
 			this.updateHeld( player );
@@ -28,6 +28,7 @@ import net.minecraftforge.common.capabilities.Capability;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
+import net.minecraftforge.fluids.capability.IFluidHandler;
 import net.minecraftforge.items.IItemHandler;

 import appeng.api.AEApi;
@@ -72,7 +73,7 @@ import appeng.util.IConfigManagerHost;
 import appeng.util.Platform;


-public class DualityFluidInterface implements IGridTickable, IStorageMonitorable, IAEFluidInventory, IUpgradeableHost, IConfigManagerHost
+public class DualityFluidInterface implements IGridTickable, IStorageMonitorable, IAEFluidInventory, IUpgradeableHost, IConfigManagerHost, IConfigurableFluidInventory
 {
 	public static final int NUMBER_OF_TANKS = 6;
 	public static final int TANK_CAPACITY = Fluid.BUCKET_VOLUME * 4;
@@ -255,6 +256,17 @@ public class DualityFluidInterface implements IGridTickable, IStorageMonitorable

 	private void readConfig()
 	{
+		this.hasConfig = false;
+
+		for( int i = 0; i < this.config.getSlots(); i++ )
+		{
+			if( this.config.getFluidInSlot( i ) != null )
+			{
+				this.hasConfig = true;
+				break;
+			}
+		}
+
 		final boolean had = this.hasWorkToDo();

 		for( int x = 0; x < NUMBER_OF_TANKS; x++ )
@@ -592,6 +604,14 @@ public class DualityFluidInterface implements IGridTickable, IStorageMonitorable
 		return null;
 	}

+	@Override
+	public IFluidHandler getFluidInventoryByName( final String name) {
+		if (name.equals("config")) {
+			return this.config;
+		}
+		return null;
+	}
+
 	@Override
 	public int getInstalledUpgrades( Upgrades u )
 	{
@@ -85,11 +85,11 @@ public class FluidCellConfig extends CellConfig
 	}

 	@Override
-	public boolean isItemValidForSlot( int slot, ItemStack stack )
+	public boolean isItemValid( int slot, ItemStack stack )
 	{
 		if( stack.isEmpty() || stack.getItem() instanceof FluidDummyItem )
 		{
-			super.isItemValidForSlot( slot, stack );
+			super.isItemValid( slot, stack );
 		}
 		FluidStack fluid = FluidUtil.getFluidContained( stack );
 		if( fluid == null || !Api.INSTANCE.definitions().items().dummyFluidItem().maybeStack( 1 ).isPresent() )
@@ -100,7 +100,7 @@ public class FluidCellConfig extends CellConfig
 		ItemStack is = Api.INSTANCE.definitions().items().dummyFluidItem().maybeStack( 1 ).get();
 		FluidDummyItem item = (FluidDummyItem) is.getItem();
 		item.setFluidStack( is, fluid );
-		return super.isItemValidForSlot( slot, is );
+		return super.isItemValid( slot, is );
 	}

 }
@@ -0,0 +1,11 @@
+package appeng.fluids.helper;
+
+import net.minecraftforge.fluids.capability.IFluidHandler;
+
+public interface IConfigurableFluidInventory
+{
+    default IFluidHandler getFluidInventoryByName( String name )
+    {
+        return null;
+    }
+}
@@ -26,6 +26,9 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;

+import appeng.api.config.Settings;
+import appeng.api.config.StorageFilter;
+import appeng.parts.misc.PartStorageBus;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.capability.IFluidHandler;
 import net.minecraftforge.fluids.capability.IFluidTankProperties;
@@ -61,12 +64,18 @@ public class FluidHandlerAdapter implements IMEInventory<IAEFluidStack>, IBaseMo
 	private final IFluidHandler fluidHandler;
 	private final IGridProxyable proxyable;
 	private final FluidHandlerAdapter.InventoryCache cache;
+	private StorageFilter mode;

 	FluidHandlerAdapter( IFluidHandler fluidHandler, IGridProxyable proxy )
 	{
 		this.fluidHandler = fluidHandler;
 		this.proxyable = proxy;
-		this.cache = new FluidHandlerAdapter.InventoryCache( this.fluidHandler );
+		if( this.proxyable instanceof PartStorageBus )
+		{
+			PartStorageBus partStorageBus = (PartStorageBus) this.proxyable;
+			this.mode = ( (StorageFilter) partStorageBus.getConfigManager().getSetting( Settings.STORAGE_FILTER ) );
+		}
+		this.cache = new FluidHandlerAdapter.InventoryCache( this.fluidHandler, this.mode);
 	}

 	@Override
@@ -195,9 +204,11 @@ public class FluidHandlerAdapter implements IMEInventory<IAEFluidStack>, IBaseMo
 	{
 		private IAEFluidStack[] cachedAeStacks = new IAEFluidStack[0];
 		private final IFluidHandler fluidHandler;
+		private final StorageFilter mode;

-		public InventoryCache( IFluidHandler fluidHandler )
+		public InventoryCache( IFluidHandler fluidHandler, StorageFilter mode )
 		{
+			this.mode = mode;
 			this.fluidHandler = fluidHandler;
 		}

@@ -217,8 +228,14 @@ public class FluidHandlerAdapter implements IMEInventory<IAEFluidStack>, IBaseMo
 			{
 				// Save the old stuff
 				final IAEFluidStack oldAEFS = this.cachedAeStacks[slot];
-				final FluidStack newFS = tankProperties[slot].getContents();
-
+				FluidStack newFS = tankProperties[slot].getContents();
+				if( this.mode == StorageFilter.EXTRACTABLE_ONLY && newFS != null )
+				{
+					if( this.fluidHandler.drain( 1, false ) == null )
+					{
+						newFS = null;
+					}
+				}
 				this.handlePossibleSlotChanges( slot, oldAEFS, newFS, changes );
 			}

@@ -304,7 +304,8 @@ public class PartFluidAnnihilationPlane extends PartBasicState implements IGridT
 				{
 					return false;
 				}
-				return inv.injectItems( stack, Actionable.SIMULATE, this.mySrc ) == null;
+				final IAEFluidStack leftOver = inv.injectItems( stack, Actionable.SIMULATE, this.mySrc );
+				return leftOver == null || leftOver.getStackSize() == 0;
 			}
 		}
 		catch( final GridAccessException e )
@@ -6,6 +6,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;

+import appeng.fluids.helper.IConfigurableFluidInventory;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockLiquid;
 import net.minecraft.block.state.IBlockState;
@@ -51,9 +52,10 @@ import appeng.parts.automation.PartAbstractFormationPlane;
 import appeng.parts.automation.PlaneModels;
 import appeng.util.Platform;
 import appeng.util.prioritylist.PrecisePriorityList;
+import net.minecraftforge.fluids.capability.IFluidHandler;


-public class PartFluidFormationPlane extends PartAbstractFormationPlane<IAEFluidStack> implements IAEFluidInventory
+public class PartFluidFormationPlane extends PartAbstractFormationPlane<IAEFluidStack> implements IAEFluidInventory, IConfigurableFluidInventory
 {
 	private static final PlaneModels MODELS = new PlaneModels( "part/fluid_formation_plane_", "part/fluid_formation_plane_on_" );

@@ -222,6 +224,14 @@ public class PartFluidFormationPlane extends PartAbstractFormationPlane<IAEFluid
 		return this.config;
 	}

+	@Override
+	public IFluidHandler getFluidInventoryByName( final String name) {
+		if (name.equals("config")) {
+			return this.config;
+		}
+		return null;
+	}
+
 	@Override
 	public ItemStack getItemStackRepresentation()
 	{
@@ -21,6 +21,7 @@ package appeng.fluids.parts;

 import java.util.EnumSet;

+import appeng.fluids.helper.IConfigurableFluidInventory;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -30,6 +31,7 @@ import net.minecraft.util.EnumHand;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.Vec3d;
 import net.minecraftforge.common.capabilities.Capability;
+import net.minecraftforge.fluids.capability.IFluidHandler;
 import net.minecraftforge.items.IItemHandler;

 import appeng.api.AEApi;
@@ -61,7 +63,7 @@ import appeng.parts.PartModel;
 import appeng.util.Platform;


-public class PartFluidInterface extends PartBasicState implements IGridTickable, IStorageMonitorable, IFluidInterfaceHost, IPriorityHost
+public class PartFluidInterface extends PartBasicState implements IGridTickable, IStorageMonitorable, IFluidInterfaceHost, IPriorityHost, IConfigurableFluidInventory
 {
 	public static final ResourceLocation MODEL_BASE = new ResourceLocation( AppEng.MOD_ID, "part/fluid_interface_base" );

@@ -233,6 +235,11 @@ public class PartFluidInterface extends PartBasicState implements IGridTickable,
 		return this.duality.getInventoryByName( name );
 	}

+	@Override
+	public IFluidHandler getFluidInventoryByName( final String name) {
+		return this.duality.getFluidInventoryByName(name);
+	}
+
 	@Override
 	public ItemStack getItemStackRepresentation()
 	{
@@ -4,6 +4,7 @@ package appeng.fluids.parts;

 import java.util.Random;

+import appeng.fluids.helper.IConfigurableFluidInventory;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -22,11 +23,13 @@ import appeng.api.networking.events.MENetworkChannelsChanged;
 import appeng.api.networking.events.MENetworkEventSubscribe;
 import appeng.api.networking.events.MENetworkPowerStatusChange;
 import appeng.api.networking.security.IActionSource;
+import appeng.api.networking.storage.IBaseMonitor;
 import appeng.api.networking.storage.IStackWatcher;
 import appeng.api.networking.storage.IStackWatcherHost;
 import appeng.api.parts.IPartCollisionHelper;
 import appeng.api.parts.IPartModel;
 import appeng.api.storage.IMEMonitor;
+import appeng.api.storage.IMEMonitorHandlerReceiver;
 import appeng.api.storage.IStorageChannel;
 import appeng.api.storage.channels.IFluidStorageChannel;
 import appeng.api.storage.data.IAEFluidStack;
@@ -46,9 +49,10 @@ import appeng.parts.PartModel;
 import appeng.parts.automation.PartUpgradeable;
 import appeng.util.IConfigManagerHost;
 import appeng.util.Platform;
+import net.minecraftforge.fluids.capability.IFluidHandler;


-public class PartFluidLevelEmitter extends PartUpgradeable implements IStackWatcherHost, IConfigManagerHost, IAEFluidInventory
+public class PartFluidLevelEmitter extends PartUpgradeable implements IStackWatcherHost, IConfigManagerHost, IAEFluidInventory, IMEMonitorHandlerReceiver<IAEFluidStack>, IConfigurableFluidInventory
 {
 	@PartModels
 	public static final ResourceLocation MODEL_BASE_OFF = new ResourceLocation( AppEng.MOD_ID, "part/level_emitter_base_off" );
@@ -153,6 +157,41 @@ public class PartFluidLevelEmitter extends PartUpgradeable implements IStackWatc
 		return cf | ( this.prevState ? FLAG_ON : 0 );
 	}

+	@Override
+	public boolean isValid( final Object effectiveGrid )
+	{
+		try
+		{
+			return this.getProxy().getGrid() == effectiveGrid;
+		}
+		catch( final GridAccessException e )
+		{
+			return false;
+		}
+	}
+
+	@Override
+	public void postChange( final IBaseMonitor<IAEFluidStack> monitor, final Iterable<IAEFluidStack> change, final IActionSource actionSource )
+	{
+		this.updateReportingValue( (IMEMonitor<IAEFluidStack>) monitor );
+	}
+
+	@Override
+	public void onListUpdate()
+	{
+		try
+		{
+			final IStorageChannel<IAEFluidStack> channel = AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class );
+			final IMEMonitor<IAEFluidStack> inventory = this.getProxy().getStorage().getInventory( channel );
+
+			this.updateReportingValue( inventory );
+		}
+		catch( final GridAccessException e )
+		{
+			// ;P
+		}
+	}
+
 	private void updateState()
 	{
 		final boolean isOn = this.isLevelEmitterOn();
@@ -168,31 +207,53 @@ public class PartFluidLevelEmitter extends PartUpgradeable implements IStackWatc

 	private void configureWatchers()
 	{
+		final IFluidStorageChannel channel = AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class );
+
 		if( this.stackWatcher != null )
 		{
 			this.stackWatcher.reset();

 			final IAEFluidStack myStack = this.config.getFluidInSlot( 0 );
-			if( myStack != null )
+
+			try
 			{
-				this.stackWatcher.add( myStack );
+				if( myStack != null )
+				{
+					this.getProxy().getStorage().getInventory( channel ).removeListener( this );
+					this.stackWatcher.add( myStack );
+				}
+				else
+				{
+					this.getProxy()
+							.getStorage()
+							.getInventory( channel )
+							.addListener( this, this.getProxy().getGrid() );
+				}
+
+				final IMEMonitor<IAEFluidStack> inventory = this.getProxy().getStorage().getInventory( channel );
+
+				this.updateReportingValue( inventory );
+			}
+			catch( GridAccessException e )
+			{
+				// NOP
 			}
-		}
-		try
-		{
-			this.updateReportingValue(
-					this.getProxy().getStorage().getInventory( AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class ) ) );
-		}
-		catch( GridAccessException e )
-		{
-			// x.x
 		}
 	}

 	private void updateReportingValue( final IMEMonitor<IAEFluidStack> monitor )
 	{
 		final IAEFluidStack myStack = this.config.getFluidInSlot( 0 );
-		if( myStack != null )
+
+		if( myStack == null )
+		{
+			this.lastReportedValue = 0;
+			for( final IAEFluidStack st : monitor.getStorageList() )
+			{
+				this.lastReportedValue += st.getStackSize();
+			}
+		}
+		else
 		{
 			final IAEFluidStack r = monitor.getStorageList().findPrecise( myStack );
 			if( r == null )
@@ -295,6 +356,14 @@ public class PartFluidLevelEmitter extends PartUpgradeable implements IStackWatc
 		return this.config;
 	}

+	@Override
+	public IFluidHandler getFluidInventoryByName( final String name) {
+		if (name.equals("config")) {
+			return this.config;
+		}
+		return null;
+	}
+
 	@Override
 	public void readFromNBT( final NBTTagCompound data )
 	{
@@ -25,6 +25,7 @@ import java.util.Objects;

 import javax.annotation.Nonnull;

+import appeng.fluids.helper.IConfigurableFluidInventory;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -87,7 +88,7 @@ import appeng.util.prioritylist.PrecisePriorityList;
 * @version rv6 - 22/05/2018
 * @since rv6 22/05/2018
 */
-public class PartFluidStorageBus extends PartSharedStorageBus implements IMEMonitorHandlerReceiver<IAEFluidStack>, IAEFluidInventory
+public class PartFluidStorageBus extends PartSharedStorageBus implements IMEMonitorHandlerReceiver<IAEFluidStack>, IAEFluidInventory, IConfigurableFluidInventory
 {
 	public static final ResourceLocation MODEL_BASE = new ResourceLocation( AppEng.MOD_ID, "part/fluid_storage_bus_base" );
 	@PartModels
@@ -469,6 +470,14 @@ public class PartFluidStorageBus extends PartSharedStorageBus implements IMEMoni
 		return this.config;
 	}

+	@Override
+	public IFluidHandler getFluidInventoryByName(final String name) {
+		if (name.equals("config")) {
+			return this.config;
+		}
+		return null;
+	}
+
 	@Nonnull
 	@Override
 	public IPartModel getStaticModels()
@@ -19,6 +19,7 @@
 package appeng.fluids.parts;


+import appeng.fluids.helper.IConfigurableFluidInventory;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -44,6 +45,7 @@ import appeng.fluids.util.IAEFluidTank;
 import appeng.me.GridAccessException;
 import appeng.parts.automation.PartUpgradeable;
 import appeng.util.Platform;
+import net.minecraftforge.fluids.capability.IFluidHandler;


 /**
@@ -51,7 +53,7 @@ import appeng.util.Platform;
 * @version rv6 - 30/04/2018
 * @since rv6 30/04/2018
 */
-public abstract class PartSharedFluidBus extends PartUpgradeable implements IGridTickable
+public abstract class PartSharedFluidBus extends PartUpgradeable implements IGridTickable, IConfigurableFluidInventory
 {

 	private final AEFluidInventory config = new AEFluidInventory( null, 9 );
@@ -176,6 +178,14 @@ public abstract class PartSharedFluidBus extends PartUpgradeable implements IGri
 		return this.config;
 	}

+	@Override
+	public IFluidHandler getFluidInventoryByName( final String name) {
+		if (name.equals("config")) {
+			return this.config;
+		}
+		return null;
+	}
+
 	protected IFluidStorageChannel getChannel()
 	{
 		return AEApi.instance().storage().getStorageChannel( IFluidStorageChannel.class );
@@ -23,11 +23,13 @@ import java.util.EnumSet;

 import javax.annotation.Nullable;

+import appeng.fluids.helper.IConfigurableFluidInventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumFacing;
 import net.minecraftforge.common.capabilities.Capability;
+import net.minecraftforge.fluids.capability.IFluidHandler;
 import net.minecraftforge.items.IItemHandler;

 import appeng.api.AEApi;
@@ -50,7 +52,7 @@ import appeng.helpers.IPriorityHost;
 import appeng.tile.grid.AENetworkTile;


-public class TileFluidInterface extends AENetworkTile implements IGridTickable, IFluidInterfaceHost, IPriorityHost
+public class TileFluidInterface extends AENetworkTile implements IGridTickable, IFluidInterfaceHost, IPriorityHost, IConfigurableFluidInventory
 {
 	private final DualityFluidInterface duality = new DualityFluidInterface( this.getProxy(), this );

@@ -176,6 +178,11 @@ public class TileFluidInterface extends AENetworkTile implements IGridTickable,
 		return this.duality.getInventoryByName( name );
 	}

+	@Override
+	public IFluidHandler getFluidInventoryByName(final String name) {
+		return this.duality.getFluidInventoryByName(name);
+	}
+
 	@Override
 	public ItemStack getItemStackRepresentation()
 	{
@@ -17,10 +17,10 @@ public class AEFluidInventory implements IAEFluidTank
 {
 	private final IAEFluidStack[] fluids;
 	private final IAEFluidInventory handler;
-	private final long capacity;
+	private final int capacity;
 	private IFluidTankProperties[] props = null;

-	public AEFluidInventory( final IAEFluidInventory handler, final int slots, final long capcity )
+	public AEFluidInventory( final IAEFluidInventory handler, final int slots, final int capcity )
 	{
 		this.fluids = new IAEFluidStack[slots];
 		this.handler = handler;
@@ -29,7 +29,7 @@ public class AEFluidInventory implements IAEFluidTank

 	public AEFluidInventory( final IAEFluidInventory handler, final int slots )
 	{
-		this( handler, slots, Long.MAX_VALUE );
+		this( handler, slots, Integer.MAX_VALUE );
 	}

 	@Override
@@ -110,45 +110,34 @@ public class AEFluidInventory implements IAEFluidTank

 		final IAEFluidStack fluid = this.fluids[slot];

-		if( !doFill )
-		{
-			if( fluid == null )
-			{
-				return resource.amount;
-			}
-
-			if( !fluid.equals( resource ) )
-			{
-				return 0;
-			}
-
-			return (int) Math.min( Math.min( this.capacity - fluid.getStackSize(), resource.amount ), Integer.MAX_VALUE );
-		}
-
-		if( fluid == null )
-		{
-			this.setFluidInSlot( slot, AEFluidStack.fromFluidStack( resource ) );
-			return resource.amount;
-		}
-
-		if( !fluid.equals( resource ) )
+		if( fluid != null && !fluid.equals( resource ) )
 		{
 			return 0;
 		}
-		long filled = this.capacity - fluid.getStackSize();

-		if( resource.amount < filled )
+		int amountToStore = this.capacity;
+
+		if( fluid != null )
 		{
-			fluid.setStackSize( fluid.getStackSize() + resource.amount );
-			filled = resource.amount;
-		}
-		else
-		{
-			fluid.setStackSize( this.capacity );
+			amountToStore -= fluid.getStackSize();
 		}

-		this.onContentChanged( slot );
-		return (int) filled;
+		amountToStore = Math.min( amountToStore, resource.amount );
+
+		if( doFill )
+		{
+			if( fluid == null )
+			{
+				this.setFluidInSlot( slot, AEFluidStack.fromFluidStack( resource ) );
+			}
+			else
+			{
+				fluid.setStackSize( fluid.getStackSize() + amountToStore );
+				this.onContentChanged( slot );
+			}
+		}
+
+		return amountToStore;
 	}

 	public FluidStack drain( final int slot, final FluidStack resource, final boolean doDrain )
@@ -363,7 +352,7 @@ public class AEFluidInventory implements IAEFluidTank
 		@Override
 		public int getCapacity()
 		{
-			return (int) Math.min( AEFluidInventory.this.capacity, Integer.MAX_VALUE );
+			return Math.min( AEFluidInventory.this.capacity, Integer.MAX_VALUE );
 		}

 		@Override
@@ -49,37 +49,41 @@ import appeng.util.item.AEStack;
 public final class AEFluidStack extends AEStack<IAEFluidStack> implements IAEFluidStack, Comparable<AEFluidStack>
 {

-	private final int myHash;
 	private final Fluid fluid;
 	private NBTTagCompound tagCompound;

-	private AEFluidStack( final AEFluidStack is )
+	private AEFluidStack( final AEFluidStack fluidStack )
 	{
-
-		this.fluid = is.fluid;
-		this.setStackSize( is.getStackSize() );
+		this.fluid = fluidStack.fluid;
+		this.setStackSize( fluidStack.getStackSize() );

 		// priority = is.priority;
-		this.setCraftable( is.isCraftable() );
-		this.setCountRequestable( is.getCountRequestable() );
+		this.setCraftable( fluidStack.isCraftable() );
+		this.setCountRequestable( fluidStack.getCountRequestable() );

-		this.myHash = is.myHash;
+		if( fluidStack.hasTagCompound() )
+		{
+			this.tagCompound = fluidStack.tagCompound.copy();
+		}
 	}

-	private AEFluidStack( @Nonnull final FluidStack is )
+	private AEFluidStack( @Nonnull final FluidStack fluidStack )
 	{
-		this.fluid = is.getFluid();
+		this.fluid = fluidStack.getFluid();

 		if( this.fluid == null )
 		{
 			throw new IllegalArgumentException( "Fluid is null." );
 		}

-		this.setStackSize( is.amount );
+		this.setStackSize( fluidStack.amount );
 		this.setCraftable( false );
 		this.setCountRequestable( 0 );

-		this.myHash = this.fluid.hashCode() ^ ( this.tagCompound == null ? 0 : System.identityHashCode( this.tagCompound ) );
+		if( fluidStack.tag != null )
+		{
+			this.tagCompound = fluidStack.tag.copy();
+		}
 	}

 	public static AEFluidStack fromFluidStack( final FluidStack input )
@@ -92,9 +96,9 @@ public final class AEFluidStack extends AEStack<IAEFluidStack> implements IAEFlu
 		return new AEFluidStack( input );
 	}

-	public static IAEFluidStack fromNBT( final NBTTagCompound i )
+	public static IAEFluidStack fromNBT( final NBTTagCompound data )
 	{
-		final FluidStack fluidStack = FluidStack.loadFluidStackFromNBT( i );
+		final FluidStack fluidStack = FluidStack.loadFluidStackFromNBT( data );

 		if( fluidStack == null )
 		{
@@ -102,15 +106,21 @@ public final class AEFluidStack extends AEStack<IAEFluidStack> implements IAEFlu
 		}

 		final AEFluidStack fluid = AEFluidStack.fromFluidStack( fluidStack );
-		fluid.setStackSize( i.getLong( "Cnt" ) );
-		fluid.setCountRequestable( i.getLong( "Req" ) );
-		fluid.setCraftable( i.getBoolean( "Craft" ) );
+		fluid.setStackSize( data.getLong( "Cnt" ) );
+		fluid.setCountRequestable( data.getLong( "Req" ) );
+		fluid.setCraftable( data.getBoolean( "Craft" ) );
+
+		if( fluid.hasTagCompound() )
+		{
+			fluid.tagCompound = fluid.tagCompound.copy();
+		}
+
 		return fluid;
 	}

-	public static IAEFluidStack fromPacket( final ByteBuf data ) throws IOException
+	public static IAEFluidStack fromPacket( final ByteBuf buffer ) throws IOException
 	{
-		final byte mask = data.readByte();
+		final byte mask = buffer.readByte();
 		final byte stackType = (byte) ( ( mask & 0x0C ) >> 2 );
 		final byte countReqType = (byte) ( ( mask & 0x30 ) >> 4 );
 		final boolean isCraftable = ( mask & 0x40 ) > 0;
@@ -119,26 +129,26 @@ public final class AEFluidStack extends AEStack<IAEFluidStack> implements IAEFlu
 		// don't send this...
 		final NBTTagCompound d = new NBTTagCompound();

-		final byte len2 = data.readByte();
+		final byte len2 = buffer.readByte();
 		final byte[] name = new byte[len2];
-		data.readBytes( name, 0, len2 );
+		buffer.readBytes( name, 0, len2 );

 		d.setString( "FluidName", new String( name, "UTF-8" ) );
 		d.setByte( "Count", (byte) 0 );

 		if( hasTagCompound )
 		{
-			final int len = data.readInt();
+			final int len = buffer.readInt();

 			final byte[] bd = new byte[len];
-			data.readBytes( bd );
+			buffer.readBytes( bd );

 			final DataInputStream di = new DataInputStream( new ByteArrayInputStream( bd ) );
-			d.setTag( "tag", CompressedStreamTools.read( di ) );
+			d.setTag( "Tag", CompressedStreamTools.read( di ) );
 		}

-		final long stackSize = getPacketValue( stackType, data );
-		final long countRequestable = getPacketValue( countReqType, data );
+		final long stackSize = getPacketValue( stackType, buffer );
+		final long countRequestable = getPacketValue( countReqType, buffer );

 		final FluidStack fluidStack = FluidStack.loadFluidStackFromNBT( d );

@@ -168,51 +178,21 @@ public final class AEFluidStack extends AEStack<IAEFluidStack> implements IAEFlu
 	}

 	@Override
-	public void writeToNBT( final NBTTagCompound i )
+	public void writeToNBT( final NBTTagCompound data )
 	{
-		/*
-		 * Mojang Fucked this over ; GC Optimization - Ugly Yes, but it saves a lot in the memory department.
-		 */
+		data.setString( "FluidName", this.fluid.getName() );
+		data.setByte( "Count", (byte) 0 );
+		data.setLong( "Cnt", this.getStackSize() );
+		data.setLong( "Req", this.getCountRequestable() );
+		data.setBoolean( "Craft", this.isCraftable() );

-		/*
-		 * NBTBase FluidName = i.getTag( "FluidName" ); NBTBase Count = i.getTag( "Count" ); NBTBase Cnt = i.getTag(
-		 * "Cnt" ); NBTBase Req = i.getTag( "Req" ); NBTBase Craft = i.getTag( "Craft" );
-		 */
-
-		/*
-		 * if ( FluidName != null && FluidName instanceof NBTTagString ) ((NBTTagString) FluidName).data = (String)
-		 * this.fluid.getName(); else
-		 */
-		i.setString( "FluidName", this.fluid.getName() );
-
-		/*
-		 * if ( Count != null && Count instanceof NBTTagByte ) ((NBTTagByte) Count).data = (byte) 0; else
-		 */
-		i.setByte( "Count", (byte) 0 );
-
-		/*
-		 * if ( Cnt != null && Cnt instanceof NBTTagLong ) ((NBTTagLong) Cnt).data = this.stackSize; else
-		 */
-		i.setLong( "Cnt", this.getStackSize() );
-
-		/*
-		 * if ( Req != null && Req instanceof NBTTagLong ) ((NBTTagLong) Req).data = this.stackSize; else
-		 */
-		i.setLong( "Req", this.getCountRequestable() );
-
-		/*
-		 * if ( Craft != null && Craft instanceof NBTTagByte ) ((NBTTagByte) Craft).data = (byte) (this.isCraftable() ?
-		 * 1 : 0); else
-		 */
-		i.setBoolean( "Craft", this.isCraftable() );
-
-		if( this.tagCompound != null )
+		if( this.hasTagCompound() )
 		{
-			i.setTag( "tag", this.tagCompound );
+			data.setTag( "Tag", this.tagCompound );
 		}
 		else
 		{
-			i.removeTag( "tag" );
+			data.removeTag( "Tag" );
 		}
 	}

@@ -255,29 +235,43 @@ public final class AEFluidStack extends AEStack<IAEFluidStack> implements IAEFlu
 	}

 	@Override
-	public int compareTo( final AEFluidStack b )
+	public int compareTo( final AEFluidStack other )
 	{
-		final int diff = this.hashCode() - b.hashCode();
-		return diff > 0 ? 1 : ( diff < 0 ? -1 : 0 );
+		if( this.fluid != other.fluid )
+		{
+			return this.fluid.getName().compareTo( other.fluid.getName() );
+		}
+
+		if( Platform.itemComparisons().isNbtTagEqual( this.tagCompound, other.tagCompound ) )
+		{
+			return 0;
+		}
+
+		return this.tagCompound.hashCode() - other.tagCompound.hashCode();
 	}

 	@Override
 	public int hashCode()
 	{
-		return this.myHash;
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + ( ( this.fluid == null ) ? 0 : this.fluid.hashCode() );
+		result = prime * result + ( ( this.tagCompound == null ) ? 0 : this.tagCompound.hashCode() );
+
+		return result;
 	}

 	@Override
-	public boolean equals( final Object ia )
+	public boolean equals( final Object other )
 	{
-		if( ia instanceof AEFluidStack )
+		if( other instanceof AEFluidStack )
 		{
-			final AEFluidStack is = (AEFluidStack) ia;
+			final AEFluidStack is = (AEFluidStack) other;
 			return is.fluid == this.fluid && Platform.itemComparisons().isNbtTagEqual( this.tagCompound, is.tagCompound );
 		}
-		else if( ia instanceof FluidStack )
+		else if( other instanceof FluidStack )
 		{
-			final FluidStack is = (FluidStack) ia;
+			final FluidStack is = (FluidStack) other;
 			return is.getFluid() == this.fluid && Platform.itemComparisons().isNbtTagEqual( this.tagCompound, is.tag );
 		}
 		return false;
@@ -286,7 +280,7 @@ public final class AEFluidStack extends AEStack<IAEFluidStack> implements IAEFlu
 	@Override
 	public String toString()
 	{
-		return this.getFluidStack().toString();
+		return this.getStackSize() + "x" + this.getFluidStack().getFluid().getName() + " " + this.tagCompound;
 	}

 	@Override
@@ -298,11 +292,8 @@ public final class AEFluidStack extends AEStack<IAEFluidStack> implements IAEFlu
 	@Override
 	public FluidStack getFluidStack()
 	{
-		final FluidStack is = new FluidStack( this.fluid, (int) Math.min( Integer.MAX_VALUE, this.getStackSize() ) );
-		if( this.tagCompound != null )
-		{
-			is.tag = this.tagCompound.copy();
-		}
+		final int amount = (int) Math.min( Integer.MAX_VALUE, this.getStackSize() );
+		final FluidStack is = new FluidStack( this.fluid, amount, this.tagCompound );

 		return is;
 	}
@@ -327,24 +318,24 @@ public final class AEFluidStack extends AEStack<IAEFluidStack> implements IAEFlu
 	}

 	@Override
-	public void writeToPacket( final ByteBuf i ) throws IOException
+	public void writeToPacket( final ByteBuf buffer ) throws IOException
 	{
 		final byte mask = (byte) ( ( this.getType( this.getStackSize() ) << 2 ) | ( this
 				.getType( this.getCountRequestable() ) << 4 ) | ( (byte) ( this.isCraftable() ? 1 : 0 ) << 6 ) | ( this.hasTagCompound() ? 1 : 0 ) << 7 );

-		i.writeByte( mask );
+		buffer.writeByte( mask );

-		this.writeToStream( i );
+		this.writeToStream( buffer );

-		this.putPacketValue( i, this.getStackSize() );
-		this.putPacketValue( i, this.getCountRequestable() );
+		this.putPacketValue( buffer, this.getStackSize() );
+		this.putPacketValue( buffer, this.getCountRequestable() );
 	}

-	private void writeToStream( final ByteBuf i ) throws IOException
+	private void writeToStream( final ByteBuf buffer ) throws IOException
 	{
 		final byte[] name = this.fluid.getName().getBytes( "UTF-8" );
-		i.writeByte( (byte) name.length );
-		i.writeBytes( name );
+		buffer.writeByte( (byte) name.length );
+		buffer.writeBytes( name );
 		if( this.hasTagCompound() )
 		{
 			final ByteArrayOutputStream bytes = new ByteArrayOutputStream();
@@ -355,8 +346,8 @@ public final class AEFluidStack extends AEStack<IAEFluidStack> implements IAEFlu
 			final byte[] tagBytes = bytes.toByteArray();
 			final int size = tagBytes.length;

-			i.writeInt( size );
-			i.writeBytes( tagBytes );
+			buffer.writeInt( size );
+			buffer.writeBytes( tagBytes );
 		}
 	}
 }
@@ -29,8 +29,12 @@ import java.util.Optional;

 import javax.annotation.Nullable;

+import appeng.integration.modules.gregtech.GTCEInventoryAdaptor;
+import appeng.util.*;
 import com.google.common.collect.ImmutableSet;

+import gregtech.api.block.machines.BlockMachine;
+import gregtech.api.metatileentity.MetaTileEntity;
 import net.minecraft.block.Block;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.init.Items;
@@ -46,6 +50,7 @@ import net.minecraft.util.math.RayTraceResult;
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.World;
 import net.minecraftforge.common.capabilities.Capability;
+import net.minecraftforge.fml.common.Loader;
 import net.minecraftforge.items.CapabilityItemHandler;
 import net.minecraftforge.items.IItemHandler;
 import net.minecraftforge.items.wrapper.RangedWrapper;
@@ -88,6 +93,8 @@ import appeng.api.util.AEPartLocation;
 import appeng.api.util.DimensionalCoord;
 import appeng.api.util.IConfigManager;
 import appeng.capabilities.Capabilities;
+import appeng.core.AEConfig;
+import appeng.core.features.AEFeature;
 import appeng.core.settings.TickRates;
 import appeng.me.GridAccessException;
 import appeng.me.helpers.AENetworkProxy;
@@ -99,19 +106,18 @@ import appeng.parts.automation.StackUpgradeInventory;
 import appeng.parts.automation.UpgradeInventory;
 import appeng.tile.inventory.AppEngInternalAEInventory;
 import appeng.tile.inventory.AppEngInternalInventory;
-import appeng.util.ConfigManager;
-import appeng.util.IConfigManagerHost;
-import appeng.util.InventoryAdaptor;
-import appeng.util.Platform;
 import appeng.util.inv.AdaptorItemHandler;
 import appeng.util.inv.IAEAppEngInventory;
 import appeng.util.inv.IInventoryDestination;
 import appeng.util.inv.InvOperation;
 import appeng.util.item.AEItemStack;

+import static gregtech.api.block.machines.BlockMachine.getMetaTileEntity;
+

 public class DualityInterface implements IGridTickable, IStorageMonitorable, IInventoryDestination, IAEAppEngInventory, IConfigManagerHost, ICraftingProvider, IUpgradeableHost
 {
+	private int[] failedCraftTriesSlot = {0,0,0,0,0,0,0,0,0};

 	public static final int NUMBER_OF_STORAGE_SLOTS = 9;
 	public static final int NUMBER_OF_CONFIG_SLOTS = 9;
@@ -129,11 +135,11 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 	private final AppEngInternalInventory storage = new AppEngInternalInventory( this, NUMBER_OF_STORAGE_SLOTS );
 	private final AppEngInternalInventory patterns = new AppEngInternalInventory( this, NUMBER_OF_PATTERN_SLOTS );
 	private final MEMonitorPassThrough<IAEItemStack> items = new MEMonitorPassThrough<>( new NullInventory<IAEItemStack>(), AEApi.instance()
-			.storage()
-			.getStorageChannel( IItemStorageChannel.class ) );
+																																	.storage()
+																																	.getStorageChannel( IItemStorageChannel.class ) );
 	private final MEMonitorPassThrough<IAEFluidStack> fluids = new MEMonitorPassThrough<>( new NullInventory<IAEFluidStack>(), AEApi.instance()
-			.storage()
-			.getStorageChannel( IFluidStorageChannel.class ) );
+																																	   .storage()
+																																	   .getStorageChannel( IFluidStorageChannel.class ) );
 	private final UpgradeInventory upgrades;
 	private boolean hasConfig = false;
 	private int priority;
@@ -142,6 +148,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 	private IMEInventory<IAEItemStack> destination;
 	private int isWorking = -1;
 	private final Accessor accessor = new Accessor();
+	private GTCEInventoryAdaptor GTad;

 	public DualityInterface( final AENetworkProxy networkProxy, final IInterfaceHost ih )
 	{
@@ -430,14 +437,18 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 				this.requireWork[slot] = req.copy();
 				return;
 			}
-			else if( req.isSameType( stored ) ) // same type ( qty different? )!
+			else if( req.isSameType( stored ) ) // same type and quantity  )!
 			{
-				if( req.getStackSize() != stored.getCount() )
+				if( req.getStackSize() == stored.getCount() )
+				{
+					this.requireWork[slot] = null;
+				}
+				else                                // same type ( qty different? )!
 				{
 					this.requireWork[slot] = req.copy();
 					this.requireWork[slot].setStackSize( req.getStackSize() - stored.getCount() );
-					return;
 				}
+				return;
 			}
 			else
 			// Stored != null; dispose!
@@ -759,8 +770,17 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 		{
 			if( this.getInstalledUpgrades( Upgrades.CRAFTING ) > 0 && itemStack != null )
 			{
-				return this.craftingTracker.handleCrafting( x, itemStack.getStackSize(), itemStack, d, this.iHost.getTileEntity().getWorld(),
+				if (this.failedCraftTriesSlot[x] <= 0)
+				{
+					boolean crafted = this.craftingTracker.handleCrafting( x, itemStack.getStackSize(), itemStack, d, this.iHost.getTileEntity().getWorld(),
 						this.gridProxy.getGrid(), this.gridProxy.getCrafting(), this.mySource );
+
+					if (crafted) this.failedCraftTriesSlot[x] = 0;
+					else{
+						this.failedCraftTriesSlot[x] += 2;
+					}
+				}
+				this.failedCraftTriesSlot[x] -= 1;
 			}
 		}
 		catch( final GridAccessException e )
@@ -893,6 +913,20 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 		};
 	}

+	private static boolean invIsBlocked( InventoryAdaptor inv )
+	{
+		if( AEConfig.instance().isFeatureEnabled( AEFeature.INSANE_BLOCKING_MODE ) )
+		{
+			return !inv.simulateRemove( 1, ItemStack.EMPTY, null ).isEmpty();
+		}
+		else return inv.containsItems();
+	}
+
+	private static boolean invIsBlockedGTCE( GTCEInventoryAdaptor inv )
+	{
+		return ( !inv.canRemoveAllExceptCircuits() );
+	}
+
 	@Override
 	public boolean pushPattern( final ICraftingPatternDetails patternDetails, final InventoryCrafting table )
 	{
@@ -941,9 +975,20 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 			{
 				if( this.isBlocking() )
 				{
-					if( !ad.simulateRemove( 1, ItemStack.EMPTY, null ).isEmpty() )
+					if( te.getBlockType().getRegistryName().getResourceDomain().equals( "gregtech" ) )
 					{
-						continue;
+						GTad = GTCEInventoryAdaptor.getAdaptor( te, s.getOpposite() );
+						if( invIsBlockedGTCE( GTad ) )
+						{
+							continue;
+						}
+					}
+					else
+					{
+						if( invIsBlocked( ad ) )
+						{
+							continue;
+						}
 					}
 				}

@@ -992,17 +1037,28 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 				final InventoryAdaptor ad = InventoryAdaptor.getAdaptor( te, s.getOpposite() );
 				if( ad != null )
 				{
-					if( ad.simulateRemove( 1, ItemStack.EMPTY, null ).isEmpty() )
+					if( te.getBlockType().getRegistryName().getResourceDomain().equals( "gregtech" ) )
 					{
-						allAreBusy = false;
-						break;
+						GTad = GTCEInventoryAdaptor.getAdaptor( te, s.getOpposite() );
+						if( !invIsBlockedGTCE( GTad ) )
+						{
+							allAreBusy = false;
+							break;
+						}
+					}
+					else
+					{
+						if( !invIsBlocked( ad ) )
+						{
+							allAreBusy = false;
+							break;
+						}
+
 					}
 				}
 			}
-
 			busy = allAreBusy;
 		}
-
 		return busy;
 	}

@@ -1184,6 +1240,13 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 				final IBlockState directedBlockState = hostWorld.getBlockState( targ );
 				final Block directedBlock = directedBlockState.getBlock();
 				ItemStack what = new ItemStack( directedBlock, 1, directedBlock.getMetaFromState( directedBlockState ) );
+
+				if ( Loader.isModLoaded("gregtech") && directedBlock instanceof BlockMachine )
+				{
+					MetaTileEntity metaTileEntity = getMetaTileEntity(hostWorld, targ);
+					return metaTileEntity.getMetaFullName();
+				}
+
 				try
 				{
 					Vec3d from = new Vec3d( hostTile.getPos().getX() + 0.5, hostTile.getPos().getY() + 0.5, hostTile.getPos().getZ() + 0.5 );
@@ -0,0 +1,96 @@
+package appeng.helpers;
+
+import appeng.client.render.BlockPosHighlighter;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.client.renderer.BufferBuilder;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
+import net.minecraft.util.math.BlockPos;
+import net.minecraftforge.client.event.RenderWorldLastEvent;
+import org.lwjgl.opengl.GL11;
+
+// taken from McJty's McJtyLib
+
+public class HighlighterHandler
+{
+
+    public static void tick( RenderWorldLastEvent event ) {
+        renderHilightedBlock(event);
+    }
+
+    private static void renderHilightedBlock( RenderWorldLastEvent event ) {
+        BlockPos c = BlockPosHighlighter.getHilightedBlock();
+        if (c == null) {
+            return;
+        }
+        Minecraft mc = Minecraft.getMinecraft();
+        long time = System.currentTimeMillis();
+
+        if (time > BlockPosHighlighter.getExpireHilight()) {
+            BlockPosHighlighter.hilightBlock(null, -1);
+            return;
+        }
+
+        if (((time / 500) & 1) == 0) {
+            return;
+        }
+
+        EntityPlayerSP p = mc.player;
+        double doubleX = p.lastTickPosX + (p.posX - p.lastTickPosX) * event.getPartialTicks();
+        double doubleY = p.lastTickPosY + (p.posY - p.lastTickPosY) * event.getPartialTicks();
+        double doubleZ = p.lastTickPosZ + (p.posZ - p.lastTickPosZ) * event.getPartialTicks();
+
+        GlStateManager.pushMatrix();
+        GlStateManager.color(1.0f, 0, 0);
+        GlStateManager.glLineWidth(3);
+        GlStateManager.translate(-doubleX, -doubleY, -doubleZ);
+
+        GlStateManager.disableDepth();
+        GlStateManager.disableTexture2D();
+
+        Tessellator tessellator = Tessellator.getInstance();
+        BufferBuilder buffer = tessellator.getBuffer();
+        float mx = c.getX();
+        float my = c.getY();
+        float mz = c.getZ();
+        buffer.begin( GL11.GL_LINES, DefaultVertexFormats.POSITION_COLOR);
+        renderHighLightedBlocksOutline(buffer, mx, my, mz, 1.0f, 0.0f, 0.0f, 1.0f);
+
+        tessellator.draw();
+
+        GlStateManager.enableTexture2D();
+        GlStateManager.popMatrix();
+    }
+
+    public static void renderHighLightedBlocksOutline(BufferBuilder buffer, float mx, float my, float mz, float r, float g, float b, float a) {
+        buffer.pos(mx, my, mz).color(r, g, b, a).endVertex();
+        buffer.pos(mx + 1, my, mz).color(r, g, b, a).endVertex();
+        buffer.pos(mx, my, mz).color(r, g, b, a).endVertex();
+        buffer.pos(mx, my + 1, mz).color(r, g, b, a).endVertex();
+        buffer.pos(mx, my, mz).color(r, g, b, a).endVertex();
+        buffer.pos(mx, my, mz + 1).color(r, g, b, a).endVertex();
+        buffer.pos(mx + 1, my + 1, mz + 1).color(r, g, b, a).endVertex();
+        buffer.pos(mx, my + 1, mz + 1).color(r, g, b, a).endVertex();
+        buffer.pos(mx + 1, my + 1, mz + 1).color(r, g, b, a).endVertex();
+        buffer.pos(mx + 1, my, mz + 1).color(r, g, b, a).endVertex();
+        buffer.pos(mx + 1, my + 1, mz + 1).color(r, g, b, a).endVertex();
+        buffer.pos(mx + 1, my + 1, mz).color(r, g, b, a).endVertex();
+
+        buffer.pos(mx, my + 1, mz).color(r, g, b, a).endVertex();
+        buffer.pos(mx, my + 1, mz + 1).color(r, g, b, a).endVertex();
+        buffer.pos(mx, my + 1, mz).color(r, g, b, a).endVertex();
+        buffer.pos(mx + 1, my + 1, mz).color(r, g, b, a).endVertex();
+
+        buffer.pos(mx + 1, my, mz).color(r, g, b, a).endVertex();
+        buffer.pos(mx + 1, my, mz + 1).color(r, g, b, a).endVertex();
+        buffer.pos(mx + 1, my, mz).color(r, g, b, a).endVertex();
+        buffer.pos(mx + 1, my + 1, mz).color(r, g, b, a).endVertex();
+
+        buffer.pos(mx, my, mz + 1).color(r, g, b, a).endVertex();
+        buffer.pos(mx + 1, my, mz + 1).color(r, g, b, a).endVertex();
+        buffer.pos(mx, my, mz + 1).color(r, g, b, a).endVertex();
+        buffer.pos(mx, my + 1, mz + 1).color(r, g, b, a).endVertex();
+    }
+}
@@ -192,12 +192,11 @@ public class TickHandler
 				final Collection<CraftingJob> jobSet = this.craftingJobs.get( wte.world );
 				if( !jobSet.isEmpty() )
 				{
-					final int simTime = Math.max( 1, AEConfig.instance().getCraftingCalculationTimePerTick() / jobSet.size() );
 					final Iterator<CraftingJob> i = jobSet.iterator();
 					while( i.hasNext() )
 					{
 						final CraftingJob cj = i.next();
-						if( !cj.simulateFor( simTime ) )
+						if( !cj.simulateFor() )
 						{
 							i.remove();
 						}
@@ -62,7 +62,7 @@ public class GrinderRecipes
 			final ItemStack s2 = CTModule.toStack( secondary2Output );
 			if( !s2.isEmpty() )
 			{
-				builder.withFirstOptional( s2, secondary2Chance == null ? 1.0f : secondary2Chance );
+				builder.withSecondOptional( s2, secondary2Chance == null ? 1.0f : secondary2Chance );
 			}
 			CTModule.MODIFICATIONS.add( new Add( builder.build() ) );
 		}
@@ -0,0 +1,26 @@
+package appeng.integration.modules.gregtech;
+
+import appeng.util.inv.ItemSlot;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.EnumFacing;
+import net.minecraftforge.items.CapabilityItemHandler;
+import net.minecraftforge.items.IItemHandler;
+
+public abstract class GTCEInventoryAdaptor implements Iterable<ItemSlot>
+{
+    public static GTCEInventoryAdaptor getAdaptor(final TileEntity te, final EnumFacing d)
+    {
+        if (te != null && te.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, d))
+        {
+            // Attempt getting an IItemHandler for the given side via caps
+            IItemHandler itemHandler = te.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, d);
+            if (itemHandler != null)
+            {
+                return new GTCEItemHandler(itemHandler);
+            }
+        }
+        return null;
+    }
+
+    public abstract boolean canRemoveAllExceptCircuits();
+}
@@ -0,0 +1,57 @@
+package appeng.integration.modules.gregtech;
+
+import appeng.util.inv.ItemSlot;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.items.IItemHandler;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
+
+public class GTCEItemHandler extends GTCEInventoryAdaptor
+{
+    ArrayList<Integer> GTCElenses = new ArrayList<>(Arrays.asList(15085,15214,15092,15111,15113,15219,15218,15243,15244,15209,15117,15206,15216,15331,15212,15213,15154,15122,15157,15190,15247));
+    ArrayList<Integer> GTCEmolds = new ArrayList<>(Arrays.asList(32301,32303,32304,32305,32306,32307,32308,32309,32313,32314,32315,32317,32350,32351,32352,32353,32354,32355,32356,32358,32359,32360,32361,32363,32364,32365,32366,32367,32368,32369,32370,32371,32372,32373));
+    Item smallGearExtruderShape = Item.getByNameOrId("contenttweaker:smallgearextrudershape");
+    Item creativePortableTankMold = Item.getByNameOrId("contenttweaker:creativeportabletankmold");
+
+    protected final IItemHandler itemHandler;
+
+    public GTCEItemHandler(IItemHandler itemHandler)
+    {
+        this.itemHandler = itemHandler;
+    }
+
+    boolean isBlockableItem(ItemStack stack)
+    {
+        if ( stack.getItem() == Item.getByNameOrId("gregtech:meta_item_1") ) {
+            int metadata = stack.getItemDamage();
+            if ( metadata == 32766 || GTCElenses.contains(metadata) || GTCEmolds.contains(metadata)) {
+                return false;
+            }
+        }
+        if ( stack.getItem() == smallGearExtruderShape ) return false;
+        if ( stack.getItem() == creativePortableTankMold) return false;
+        return true;
+    }
+
+    @Override
+    public boolean canRemoveAllExceptCircuits()
+    {
+        int slots = this.itemHandler.getSlots();
+        for ( int slot = 0; slot < slots; slot++ ) {
+            ItemStack is = this.itemHandler.getStackInSlot(slot);
+            if ( is.isEmpty() || !isBlockableItem(is) ) continue;
+
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public Iterator<ItemSlot> iterator()
+    {
+        return null;
+    }
+}
@@ -48,7 +48,7 @@ class GrinderRecipeCategory implements IRecipeCategory<GrinderRecipeWrapper>, IR
 		this.localizedName = I18n.format( "tile.appliedenergistics2.grindstone.name" );

 		ResourceLocation location = new ResourceLocation( AppEng.MOD_ID, "textures/guis/grinder.png" );
-		this.background = guiHelper.createDrawable( location, 11, 16, 154, 64 );
+		this.background = guiHelper.createDrawable( location, 11, 16, 154, 70 );
 	}

 	@Override
@@ -23,15 +23,18 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;

+import appeng.client.gui.AEGuiHandler;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;

+import mezz.jei.config.Constants;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;

 import mezz.jei.api.IJeiRuntime;
 import mezz.jei.api.IModPlugin;
 import mezz.jei.api.IModRegistry;
+import mezz.jei.api.ISubtypeRegistry;
 import mezz.jei.api.recipe.IRecipeCategoryRegistration;
 import mezz.jei.api.recipe.VanillaRecipeCategoryUid;

@@ -54,6 +57,12 @@ import appeng.items.parts.ItemFacade;
@mezz.jei.api.JEIPlugin
 public class JEIPlugin implements IModPlugin
 {
+	@Override
+	public void registerItemSubtypes( ISubtypeRegistry subtypeRegistry )
+	{
+		final Optional<Item> maybeFacade = AEApi.instance().definitions().items().facade().maybeItem();
+		maybeFacade.ifPresent( subtypeRegistry::useNbtForSubtypes );
+	}

 	@Override
 	public void registerCategories( IRecipeCategoryRegistration registry )
@@ -84,7 +93,10 @@ public class JEIPlugin implements IModPlugin
 						VanillaRecipeCategoryUid.CRAFTING );
 		registry.getRecipeTransferRegistry()
 				.addRecipeTransferHandler( new RecipeTransferHandler<>( ContainerPatternTerm.class ),
-						VanillaRecipeCategoryUid.CRAFTING );
+						Constants.UNIVERSAL_RECIPE_TRANSFER_UID );
+
+		AEGuiHandler aeGuiHandler = new AEGuiHandler();
+		registry.addAdvancedGuiHandlers(aeGuiHandler);
 	}

 	private void registerDescriptions( IDefinitions definitions, IModRegistry registry )
@@ -196,7 +208,7 @@ public class JEIPlugin implements IModPlugin
 	{
 		Optional<Item> itemFacade = definitions.items().facade().maybeItem();
 		Optional<ItemStack> cableAnchor = definitions.parts().cableAnchor().maybeStack( 1 );
-		if( itemFacade.isPresent() && cableAnchor.isPresent() )
+		if( itemFacade.isPresent() && cableAnchor.isPresent() && AEConfig.instance().isFeatureEnabled( AEFeature.ENABLE_FACADE_CRAFTING ) )
 		{
 			registry.addRecipeRegistryPlugin( new FacadeRegistryPlugin( (ItemFacade) itemFacade.get(), cableAnchor.get() ) );
 		}
@@ -26,6 +26,11 @@ import java.util.Map;

 import javax.annotation.Nullable;

+import appeng.container.implementations.ContainerPatternTerm;
+import mezz.jei.api.recipe.VanillaRecipeCategoryUid;
+import mezz.jei.transfer.RecipeTransferErrorInternal;
+import mezz.jei.transfer.RecipeTransferErrorTooltip;
+import net.minecraft.client.resources.I18n;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.Container;
 import net.minecraft.inventory.Slot;
@@ -66,6 +71,29 @@ class RecipeTransferHandler<T extends Container> implements IRecipeTransferHandl
 	@Override
 	public IRecipeTransferError transferRecipe( T container, IRecipeLayout recipeLayout, EntityPlayer player, boolean maxTransfer, boolean doTransfer )
 	{
+		final String recipeType = recipeLayout.getRecipeCategory().getUid();
+
+		if (!recipeType.equals( VanillaRecipeCategoryUid.INFORMATION) && !recipeType.equals(VanillaRecipeCategoryUid.FUEL))
+		{
+			if( container instanceof ContainerPatternTerm )
+			{
+				if( !( (ContainerPatternTerm) container ).isCraftingMode() )
+				{
+					if( recipeType.equals( VanillaRecipeCategoryUid.CRAFTING ) )
+					{
+						return new RecipeTransferErrorTooltip( I18n.format( "gui.appliedenergistics2.CraftingPattern" ) );
+					}
+				}
+				else if( !recipeType.equals( VanillaRecipeCategoryUid.CRAFTING ) )
+				{
+					return new RecipeTransferErrorTooltip( I18n.format( "gui.appliedenergistics2.ProcessingPattern" ) );
+				}
+			}
+		}
+		else
+		{
+			return RecipeTransferErrorInternal.INSTANCE;
+		}

 		if( !doTransfer )
 		{
@@ -75,6 +103,8 @@ class RecipeTransferHandler<T extends Container> implements IRecipeTransferHandl
 		Map<Integer, ? extends IGuiIngredient<ItemStack>> ingredients = recipeLayout.getItemStacks().getGuiIngredients();

 		final NBTTagCompound recipe = new NBTTagCompound();
+		final NBTTagList outputs = new NBTTagList();
+

 		int slotIndex = 0;
 		for( Map.Entry<Integer, ? extends IGuiIngredient<ItemStack>> ingredientEntry : ingredients.entrySet() )
@@ -82,6 +112,13 @@ class RecipeTransferHandler<T extends Container> implements IRecipeTransferHandl
 			IGuiIngredient<ItemStack> ingredient = ingredientEntry.getValue();
 			if( !ingredient.isInput() )
 			{
+				ItemStack output = ingredient.getDisplayedIngredient();
+				if( output != null )
+				{
+					final NBTTagCompound tag = new NBTTagCompound();
+					output.writeToNBT( tag );
+					outputs.appendTag( tag );
+				}
 				continue;
 			}

@@ -130,6 +167,8 @@ class RecipeTransferHandler<T extends Container> implements IRecipeTransferHandl
 			slotIndex++;
 		}

+		recipe.setTag( "outputs", outputs );
+
 		try
 		{
 			NetworkHandler.instance().sendToServer( new PacketJEIRecipe( recipe ) );
@@ -56,7 +56,7 @@ public class ItemEncodedPattern extends AEBaseItem implements ICraftingPatternIt

 	public ItemEncodedPattern()
 	{
-		this.setMaxStackSize( 1 );
+		this.setMaxStackSize( 64 );
 	}

 	@Override
@@ -25,6 +25,7 @@ import net.minecraft.client.util.ITooltipFlag;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.ActionResult;
 import net.minecraft.util.EnumActionResult;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.EnumHand;
@@ -174,6 +175,9 @@ public class ToolMemoryCard extends AEBaseItem implements IMemoryCard
 			case SETTINGS_SAVED:
 				player.sendMessage( PlayerMessages.SavedSettings.get() );
 				break;
+			case SETTINGS_RESET:
+				player.sendMessage( PlayerMessages.ResetSettings.get() );
+				break;
 			default:
 		}
 	}
@@ -185,9 +189,7 @@ public class ToolMemoryCard extends AEBaseItem implements IMemoryCard
 		{
 			if( !w.isRemote )
 			{
-				final IMemoryCard mem = (IMemoryCard) player.getHeldItem( hand ).getItem();
-				mem.notifyUser( player, MemoryCardMessages.SETTINGS_CLEARED );
-				player.getHeldItem( hand ).setTagCompound( null );
+				this.clearCard( player, w, hand );
 			}
 			return EnumActionResult.SUCCESS;
 		}
@@ -197,9 +199,31 @@ public class ToolMemoryCard extends AEBaseItem implements IMemoryCard
 		}
 	}

+	@Override
+	public ActionResult<ItemStack> onItemRightClick( World w, EntityPlayer player, EnumHand hand )
+	{
+		if( player.isSneaking() )
+		{
+			if( !w.isRemote )
+			{
+				this.clearCard( player, w, hand );
+			}
+		}
+
+		return super.onItemRightClick( w, player, hand );
+
+	}
+
 	@Override
 	public boolean doesSneakBypassUse( final ItemStack itemstack, final IBlockAccess world, final BlockPos pos, final EntityPlayer player )
 	{
 		return true;
 	}
+
+	private void clearCard( final EntityPlayer player, final World w, final EnumHand hand )
+	{
+		final IMemoryCard mem = (IMemoryCard) player.getHeldItem( hand ).getItem();
+		mem.notifyUser( player, MemoryCardMessages.SETTINGS_CLEARED );
+		player.getHeldItem( hand ).setTagCompound( null );
+	}
 }
@@ -68,23 +68,24 @@ public class ToolEntropyManipulator extends AEBasePoweredItem implements IBlockT
 		this.coolDown = new HashMap<>();

 		this.coolDown.put( new InWorldToolOperationIngredient( Blocks.STONE.getDefaultState() ),
-				new InWorldToolOperationResult( new ItemStack( Blocks.COBBLESTONE ) ) );
+				new InWorldToolOperationResult( Blocks.COBBLESTONE.getDefaultState() ) );
 		this.coolDown.put( new InWorldToolOperationIngredient( Blocks.STONEBRICK.getDefaultState() ),
-				new InWorldToolOperationResult( new ItemStack( Blocks.STONEBRICK, 1, 2 ) ) );
-		this.coolDown.put( new InWorldToolOperationIngredient( Blocks.LAVA, true ), new InWorldToolOperationResult( new ItemStack( Blocks.OBSIDIAN ) ) );
+				new InWorldToolOperationResult( Blocks.STONEBRICK.getStateFromMeta( 2 ) ) );
+		this.coolDown.put( new InWorldToolOperationIngredient( Blocks.LAVA, true ), new InWorldToolOperationResult( Blocks.OBSIDIAN.getDefaultState() ) );
 		this.coolDown.put( new InWorldToolOperationIngredient( Blocks.FLOWING_LAVA, true ),
-				new InWorldToolOperationResult( new ItemStack( Blocks.OBSIDIAN ) ) );
-		this.coolDown.put( new InWorldToolOperationIngredient( Blocks.GRASS, true ), new InWorldToolOperationResult( new ItemStack( Blocks.DIRT ) ) );
+				new InWorldToolOperationResult( Blocks.OBSIDIAN.getDefaultState() ) );
+		this.coolDown.put( new InWorldToolOperationIngredient( Blocks.GRASS, true ), new InWorldToolOperationResult( Blocks.DIRT.getDefaultState() ) );

 		final List<ItemStack> snowBalls = new ArrayList<>();
 		snowBalls.add( new ItemStack( Items.SNOWBALL ) );
-		this.coolDown.put( new InWorldToolOperationIngredient( Blocks.FLOWING_WATER, true ), new InWorldToolOperationResult( ItemStack.EMPTY, snowBalls ) );
-		this.coolDown.put( new InWorldToolOperationIngredient( Blocks.WATER, true ), new InWorldToolOperationResult( new ItemStack( Blocks.ICE ) ) );
+		this.coolDown.put( new InWorldToolOperationIngredient( Blocks.FLOWING_WATER, true ), new InWorldToolOperationResult( null, snowBalls ) );
+		this.coolDown.put( new InWorldToolOperationIngredient( Blocks.WATER, true ), new InWorldToolOperationResult( Blocks.ICE.getDefaultState() ) );

-		this.heatUp.put( new InWorldToolOperationIngredient( Blocks.ICE.getDefaultState() ), new InWorldToolOperationResult( new ItemStack( Blocks.WATER ) ) );
+		this.heatUp.put( new InWorldToolOperationIngredient( Blocks.ICE.getDefaultState() ), new InWorldToolOperationResult( Blocks.WATER.getDefaultState() ) );
 		this.heatUp.put( new InWorldToolOperationIngredient( Blocks.FLOWING_WATER, true ), new InWorldToolOperationResult() );
 		this.heatUp.put( new InWorldToolOperationIngredient( Blocks.WATER, true ), new InWorldToolOperationResult() );
-		this.heatUp.put( new InWorldToolOperationIngredient( Blocks.SNOW, true ), new InWorldToolOperationResult( new ItemStack( Blocks.FLOWING_WATER ) ) );
+		this.heatUp.put( new InWorldToolOperationIngredient( Blocks.SNOW, true ),
+				new InWorldToolOperationResult( Blocks.FLOWING_WATER.getStateFromMeta( 7 ) ) );
 	}

 	private static class InWorldToolOperationIngredient
@@ -135,10 +136,9 @@ public class ToolEntropyManipulator extends AEBasePoweredItem implements IBlockT
 			r = this.heatUp.get( new InWorldToolOperationIngredient( state.getBlock(), true ) );
 		}

-		if( !r.getBlockItem().isEmpty() )
+		if( r.getBlockState() != null )
 		{
-			final Block blk = Block.getBlockFromItem( r.getBlockItem().getItem() );
-			w.setBlockState( pos, blk.getStateFromMeta( r.getBlockItem().getItemDamage() ), 3 );
+			w.setBlockState( pos, r.getBlockState(), 3 );
 		}
 		else
 		{
@@ -172,10 +172,9 @@ public class ToolEntropyManipulator extends AEBasePoweredItem implements IBlockT
 			r = this.coolDown.get( new InWorldToolOperationIngredient( state.getBlock(), true ) );
 		}

-		if( !r.getBlockItem().isEmpty() )
+		if( r.getBlockState() != null )
 		{
-			final Block blk = Block.getBlockFromItem( r.getBlockItem().getItem() );
-			w.setBlockState( pos, blk.getStateFromMeta( r.getBlockItem().getItemDamage() ), 3 );
+			w.setBlockState( pos, r.getBlockState(), 3 );
 		}
 		else
 		{
@@ -326,14 +325,13 @@ public class ToolEntropyManipulator extends AEBasePoweredItem implements IBlockT
 					w.playSound( p, pos.getX() + 0.5D, pos.getY() + 0.5D, pos.getZ() + 0.5D, SoundEvents.ITEM_FLINTANDSTEEL_USE, SoundCategory.PLAYERS, 1.0F,
 							itemRand.nextFloat() * 0.4F + 0.8F );

-					if( or.getBlockItem().isEmpty() )
+					if( or.getBlockState() == null )
 					{
 						w.setBlockState( pos, Platform.AIR_BLOCK.getDefaultState(), 3 );
 					}
 					else
 					{
-						final Block blk = Block.getBlockFromItem( or.getBlockItem().getItem() );
-						w.setBlockState( pos, blk.getStateFromMeta( or.getBlockItem().getItemDamage() ), 3 );
+						w.setBlockState( pos, or.getBlockState(), 3 );
 					}

 					if( or.getDrops() != null )
@@ -39,6 +39,7 @@ import appeng.api.util.IReadOnlyCollection;
 import appeng.core.worlddata.WorldData;
 import appeng.hooks.TickHandler;
 import appeng.util.ReadOnlyCollection;
+import appeng.me.cache.CraftingGridCache;


 public class Grid implements IGrid
@@ -219,7 +220,10 @@ public class Grid implements IGrid
 	@Override
 	public MENetworkEvent postEvent( final MENetworkEvent ev )
 	{
-		return this.eventBus.postEvent( this, ev );
+		CraftingGridCache.pauseRebuilds();
+		final MENetworkEvent ret = this.eventBus.postEvent( this, ev );
+		CraftingGridCache.unpauseRebuilds();
+		return ret;
 	}

 	@Override
@@ -55,6 +55,7 @@ import appeng.api.util.IReadOnlyCollection;
 import appeng.core.AELog;
 import appeng.core.worlddata.WorldData;
 import appeng.hooks.TickHandler;
+import appeng.me.cache.CraftingGridCache;
 import appeng.me.pathfinding.IPathItem;
 import appeng.util.IWorldCallable;
 import appeng.util.ReadOnlyCollection;
@@ -164,6 +165,8 @@ public class GridNode implements IGridNode, IPathItem
 	{
 		final Object tracker = new Object();

+		CraftingGridCache.pauseRebuilds();
+
 		Deque<GridNode> nextRun = new ArrayDeque<>();
 		nextRun.add( this );

@@ -203,6 +206,7 @@ public class GridNode implements IGridNode, IPathItem
 				}
 			}
 		}
+		CraftingGridCache.unpauseRebuilds();
 	}

 	@Override
@@ -114,6 +114,8 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper
 	private IStorageGrid storageGrid;
 	private IEnergyGrid energyGrid;
 	private boolean updateList = false;
+	private static int pauseRebuilds = 0;
+	private static Set<CraftingGridCache> rebuildNeeded = new HashSet<>();

 	public CraftingGridCache( final IGrid grid )
 	{
@@ -240,8 +242,34 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper
 		// nothing!
 	}

+	public static void pauseRebuilds()
+	{
+		pauseRebuilds++;
+	}
+
+	public static void unpauseRebuilds()
+	{
+		pauseRebuilds--;
+		if (pauseRebuilds == 0 && rebuildNeeded.size() > 0)
+		{
+			ImmutableSet<CraftingGridCache> needed = ImmutableSet.copyOf(rebuildNeeded);
+			rebuildNeeded.clear();
+			for ( CraftingGridCache cache: needed )
+			{
+				cache.updatePatterns();
+			}
+		}
+	}
+
 	private void updatePatterns()
 	{
+		// coalesce change events during a grid traversal to a single rebuild
+		if (pauseRebuilds != 0)
+		{
+			rebuildNeeded.add(this);
+			return;
+		}
+
 		final Map<IAEItemStack, ImmutableList<ICraftingPatternDetails>> oldItems = this.craftableItems;

 		// erase list.
@@ -576,15 +604,21 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper
 	@Override
 	public boolean isRequesting( final IAEItemStack what )
 	{
+		return this.requesting( what ) > 0;
+	}
+
+	@Override
+	public long requesting( IAEItemStack what )
+	{
+		long requested = 0;
+
 		for( final CraftingCPUCluster cluster : this.craftingCPUClusters )
 		{
-			if( cluster.isMaking( what ) )
-			{
-				return true;
-			}
+			final IAEItemStack stack = cluster.making( what );
+			requested += stack != null ? stack.getStackSize() : 0;
 		}

-		return false;
+		return requested;
 	}

 	public List<ICraftingMedium> getMediums( final ICraftingPatternDetails key )
@@ -139,9 +139,9 @@ public class NetworkMonitor<T extends IAEStack<T>> implements IMEMonitor<T>
 	@Override
 	public IItemList<T> getStorageList()
 	{
-		if( this.hasChanged )
+		if( hasChanged )
 		{
-			this.hasChanged = false;
+			hasChanged = false;
 			this.cachedList.resetStatus();
 			return this.getAvailableItems( this.cachedList );
 		}
@@ -47,6 +47,7 @@ public class TickManagerCache implements ITickManager
 	private final HashMap<IGridNode, TickTracker> sleeping = new HashMap<>();
 	private final HashMap<IGridNode, TickTracker> awake = new HashMap<>();
 	private final PriorityQueue<TickTracker> upcomingTicks = new PriorityQueue<>();
+
 	private long currentTick = 0;

 	public TickManagerCache( final IGrid g )
@@ -80,50 +81,52 @@ public class TickManagerCache implements ITickManager
 	public void onUpdateTick()
 	{
 		TickTracker tt = null;
+
 		try
 		{
 			this.currentTick++;
+
 			while( !this.upcomingTicks.isEmpty() )
 			{
 				tt = this.upcomingTicks.peek();
-				final int diff = (int) ( this.currentTick - tt.getLastTick() );
-				if( diff >= tt.getCurrentRate() )
+
+				// Stop once it reaches a TickTracker running at a later tick
+				if( tt.getNextTick() > this.currentTick )
 				{
-					// remove tt..
-					this.upcomingTicks.poll();
-					final TickRateModulation mod = tt.getGridTickable().tickingRequest( tt.getNode(), diff );
-
-					switch( mod )
-					{
-						case FASTER:
-							tt.setRate( tt.getCurrentRate() - 2 );
-							break;
-						case IDLE:
-							tt.setRate( tt.getRequest().maxTickRate );
-							break;
-						case SAME:
-							break;
-						case SLEEP:
-							this.sleepDevice( tt.getNode() );
-							break;
-						case SLOWER:
-							tt.setRate( tt.getCurrentRate() + 1 );
-							break;
-						case URGENT:
-							tt.setRate( 0 );
-							break;
-						default:
-							break;
-					}
-
-					if( this.awake.containsKey( tt.getNode() ) )
-					{
-						this.addToQueue( tt );
-					}
+					break;
 				}
-				else
+
+				this.upcomingTicks.poll();
+
+				final int diff = (int) ( this.currentTick - tt.getLastTick() );
+				final TickRateModulation mod = tt.getGridTickable().tickingRequest( tt.getNode(), diff );
+
+				switch( mod )
 				{
-					return; // done!
+					case FASTER:
+						tt.setCurrentRate( tt.getCurrentRate() - 2 );
+						break;
+					case IDLE:
+						tt.setCurrentRate( tt.getRequest().maxTickRate );
+						break;
+					case SAME:
+						break;
+					case SLEEP:
+						this.sleepDevice( tt.getNode() );
+						break;
+					case SLOWER:
+						tt.setCurrentRate( tt.getCurrentRate() + 1 );
+						break;
+					case URGENT:
+						tt.setCurrentRate( 0 );
+						break;
+					default:
+						break;
+				}
+
+				if( this.awake.containsKey( tt.getNode() ) )
+				{
+					this.addToQueue( tt );
 				}
 			}
 		}
@@ -255,6 +258,7 @@ public class TickManagerCache implements ITickManager
 			final TickTracker gt = this.sleeping.get( node );
 			this.sleeping.remove( node );
 			this.awake.put( node, gt );
+			this.upcomingTicks.remove( gt );
 			this.addToQueue( gt );

 			return true;
@@ -37,7 +37,6 @@ public class TickTracker implements Comparable<TickTracker>
 	private final TickingRequest request;
 	private final IGridTickable gt;
 	private final IGridNode node;
-	private final TickManagerCache host;

 	private final long LastFiveTicksTime = 0;

@@ -51,7 +50,6 @@ public class TickTracker implements Comparable<TickTracker>
 		this.node = node;
 		this.setCurrentRate( ( req.minTickRate + req.maxTickRate ) / 2 );
 		this.setLastTick( currentTick );
-		this.host = tickManagerCache;
 	}

 	public long getAvgNanos()
@@ -59,27 +57,25 @@ public class TickTracker implements Comparable<TickTracker>
 		return( this.LastFiveTicksTime / 5 );
 	}

-	public void setRate( final int rate )
-	{
-		this.setCurrentRate( rate );
-
-		if( this.getCurrentRate() < this.getRequest().minTickRate )
-		{
-			this.setCurrentRate( this.getRequest().minTickRate );
-		}
-
-		if( this.getCurrentRate() > this.getRequest().maxTickRate )
-		{
-			this.setCurrentRate( this.getRequest().maxTickRate );
-		}
-	}
-
 	@Override
 	public int compareTo( @Nonnull final TickTracker t )
 	{
-		final int nextTick = (int) ( ( this.getLastTick() - this.host.getCurrentTick() ) + this.getCurrentRate() );
-		final int ts_nextTick = (int) ( ( t.getLastTick() - this.host.getCurrentTick() ) + t.getCurrentRate() );
-		return nextTick - ts_nextTick;
+		int next = Long.compare( this.getNextTick(), t.getNextTick() );
+
+		if( next != 0 )
+		{
+			return next;
+		}
+
+		int last = Long.compare( this.getLastTick(), t.getLastTick() );
+
+		if( last != 0 )
+		{
+			return last;
+		}
+
+		return Integer.compare( this.getCurrentRate(), t.getCurrentRate() );
+
 	}

 	public void addEntityCrashInfo( final CrashReportCategory crashreportcategory )
@@ -111,7 +107,12 @@ public class TickTracker implements Comparable<TickTracker>

 	public void setCurrentRate( final int currentRate )
 	{
-		this.currentRate = currentRate;
+		this.currentRate = Math.min( this.getRequest().maxTickRate, Math.max( this.getRequest().minTickRate, currentRate ) );
+	}
+
+	public long getNextTick()
+	{
+		return this.lastTick + this.currentRate;
 	}

 	public long getLastTick()
@@ -28,7 +28,6 @@ import java.util.Map;
 import java.util.Map.Entry;

 import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;

 import net.minecraft.inventory.InventoryCrafting;
 import net.minecraft.item.ItemStack;
@@ -300,7 +299,7 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU

 					this.updateElapsedTime( what );
 					this.markDirty();
-					this.postCraftingStatusChange( is );
+					this.postCraftingStatusChange( what.copy().setStackSize( -what.getStackSize() ) );

 					if( this.finalOutput.equals( what ) )
 					{
@@ -332,6 +331,7 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU
 				what.decStackSize( is.getStackSize() );

 				is.setStackSize( 0 );
+				this.postCraftingStatusChange( insert.copy().setStackSize( -insert.getStackSize() ) );

 				if( this.finalOutput.equals( insert ) )
 				{
@@ -504,17 +504,16 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU
 					fuzz = fuzz.copy();
 					fuzz.setStackSize( g.getStackSize() );
 					final IAEItemStack ais = this.inventory.extractItems( fuzz, Actionable.SIMULATE, this.machineSrc );
-					final ItemStack is = ais == null ? ItemStack.EMPTY : ais.createItemStack();

-					if( !is.isEmpty() && is.getCount() == g.getStackSize() )
+					if (ais != null && ais.getStackSize() == g.getStackSize())
 					{
 						found = true;
 						break;
 					}
-					else if( !is.isEmpty() )
+					else if( ais != null )
 					{
 						g = g.copy();
-						g.decStackSize( is.getCount() );
+						g.decStackSize( ais.getStackSize() );
 					}
 				}

@@ -526,9 +525,8 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU
 			else
 			{
 				final IAEItemStack ais = this.inventory.extractItems( g.copy(), Actionable.SIMULATE, this.machineSrc );
-				final ItemStack is = ais == null ? ItemStack.EMPTY : ais.createItemStack();

-				if( is.isEmpty() || is.getCount() < g.getStackSize() )
+				if (ais == null || ais.getStackSize() < g.getStackSize())
 				{
 					return false;
 				}
@@ -556,7 +554,9 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU
 		this.myLastLink = null;
 		this.tasks.clear();

-		final ImmutableSet<IAEItemStack> items = ImmutableSet.copyOf( this.waitingFor );
+		// final ImmutableSet<IAEItemStack> items = ImmutableSet.copyOf( this.waitingFor );
+		final List<IAEItemStack> items = new ArrayList<>( this.waitingFor.size() );
+		this.waitingFor.forEach( stack -> items.add( stack.copy().setStackSize( -stack.getStackSize() ) ) );

 		this.waitingFor.resetStatus();

@@ -777,10 +777,6 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU

 							if( details.isCraftable() )
 							{
-								FMLCommonHandler.instance()
-										.firePlayerCraftingEvent( Platform.getPlayer( (WorldServer) this.getWorld() ),
-												details.getOutput( ic, this.getWorld() ), ic );
-
 								for( int x = 0; x < ic.getSizeInventory(); x++ )
 								{
 									final ItemStack output = Platform.getContainerItem( ic.getStackInSlot( x ) );
@@ -1117,7 +1113,7 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU
 				{
 					for( final IAEItemStack ais : t.getKey().getCondensedOutputs() )
 					{
-						if( ais.equals( is ) )
+						if( ais.isSameType( is ) )
 						{
 							is.setStackSize( is.getStackSize() + ais.getStackSize() * t.getValue().value );
 						}
@@ -1304,10 +1300,9 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU
 		return this.getCore().getWorld();
 	}

-	public boolean isMaking( final IAEItemStack what )
+	public IAEItemStack making( final IAEItemStack what )
 	{
-		final IAEItemStack wat = this.waitingFor.findPrecise( what );
-		return wat != null && wat.getStackSize() > 0;
+		return this.waitingFor.findPrecise( what );
 	}

 	public void breakCluster()
@@ -192,16 +192,29 @@ public abstract class AbstractCellInventory<T extends IAEStack<T>> implements IC
 		this.cellItems.resetStatus(); // clears totals and stuff.

 		final int types = (int) this.getStoredItemTypes();
+		boolean needsUpdate = false;

 		for( int slot = 0; slot < types; slot++ )
 		{
 			NBTTagCompound compoundTag = this.tagCompound.getCompoundTag( ITEM_SLOT_KEYS[slot] );
 			int stackSize = this.tagCompound.getInteger( ITEM_SLOT_COUNT_KEYS[slot] );
-			this.loadCellItem( compoundTag, stackSize );
+			needsUpdate |= !this.loadCellItem( compoundTag, stackSize );
+		}
+
+		if( needsUpdate )
+		{
+			this.saveChanges();
 		}
 	}

-	protected abstract void loadCellItem( NBTTagCompound compoundTag, int stackSize );
+	/**
+	 * Load a single item.
+	 *
+	 * @param compoundTag
+	 * @param stackSize
+	 * @return true when successfully loaded
+	 */
+	protected abstract boolean loadCellItem( NBTTagCompound compoundTag, int stackSize );

 	@Override
 	public IItemList<T> getAvailableItems( final IItemList<T> out )
@@ -253,7 +253,7 @@ public class BasicCellInventory<T extends IAEStack<T>> extends AbstractCellInven
 	}

 	@Override
-	protected void loadCellItem( NBTTagCompound compoundTag, int stackSize )
+	protected boolean loadCellItem( NBTTagCompound compoundTag, int stackSize )
 	{
 		// Now load the item stack
 		final T t;
@@ -263,7 +263,7 @@ public class BasicCellInventory<T extends IAEStack<T>> extends AbstractCellInven
 			if( t == null )
 			{
 				AELog.warn( "Removing item " + compoundTag + " from storage cell because the associated item type couldn't be found." );
-				return;
+				return false;
 			}
 		}
 		catch( Throwable ex )
@@ -271,7 +271,7 @@ public class BasicCellInventory<T extends IAEStack<T>> extends AbstractCellInven
 			if( AEConfig.instance().isRemoveCrashingItemsOnLoad() )
 			{
 				AELog.warn( ex, "Removing item " + compoundTag + " from storage cell because loading the ItemStack crashed." );
-				return;
+				return false;
 			}
 			throw ex;
 		}
@@ -282,5 +282,7 @@ public class BasicCellInventory<T extends IAEStack<T>> extends AbstractCellInven
 		{
 			this.cellItems.add( t );
 		}
+
+		return true;
 	}
 }
@@ -19,6 +19,7 @@
 package appeng.me.storage;


+import appeng.api.config.StorageFilter;
 import appeng.api.networking.security.IActionSource;
 import appeng.api.networking.ticking.TickRateModulation;

@@ -30,4 +31,8 @@ public interface ITickingMonitor

 	void setActionSource( IActionSource actionSource );

+	default void setMode( StorageFilter setting )
+	{
+
+	}
 }
@@ -26,6 +26,10 @@ import java.util.List;
 import java.util.Optional;
 import java.util.Random;

+import appeng.fluids.helper.IConfigurableFluidInventory;
+import appeng.fluids.parts.PartFluidLevelEmitter;
+import appeng.fluids.util.AEFluidInventory;
+import appeng.parts.automation.PartLevelEmitter;
 import com.google.common.base.Preconditions;

 import io.netty.buffer.ByteBuf;
@@ -43,6 +47,7 @@ import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
+import net.minecraftforge.fluids.capability.IFluidHandler;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 import net.minecraftforge.items.IItemHandler;
@@ -383,6 +388,26 @@ public abstract class AEBasePart implements IPart, IGridProxyable, IActionHost,
 			{
 				target.setStackInSlot( x, tmp.getStackInSlot( x ) );
 			}
+			if (this instanceof PartLevelEmitter ) {
+				final PartLevelEmitter partLevelEmitter = (PartLevelEmitter) this;
+				partLevelEmitter.setReportingValue(compound.getLong("reportingValue"));
+			}
+		}
+
+		if (this instanceof IConfigurableFluidInventory) {
+			final IFluidHandler tank = ((IConfigurableFluidInventory) this).getFluidInventoryByName("config");
+			if (tank instanceof AEFluidInventory ) {
+				final AEFluidInventory target = (AEFluidInventory) tank;
+				final AEFluidInventory tmp = new AEFluidInventory(null, target.getSlots());
+				tmp.readFromNBT(compound, "config");
+				for (int x = 0; x < tmp.getSlots(); x++) {
+					target.setFluidInSlot(x, tmp.getFluidInSlot(x));
+				}
+			}
+			if (this instanceof PartFluidLevelEmitter ) {
+				final PartFluidLevelEmitter partFluidLevelEmitter = (PartFluidLevelEmitter) this;
+				partFluidLevelEmitter.setReportingValue(compound.getLong("reportingValue"));
+			}
 		}
 	}

@@ -413,6 +438,21 @@ public abstract class AEBasePart implements IPart, IGridProxyable, IActionHost,
 		if( inv instanceof AppEngInternalAEInventory )
 		{
 			( (AppEngInternalAEInventory) inv ).writeToNBT( output, "config" );
+			if (this instanceof PartLevelEmitter) {
+				final PartLevelEmitter partLevelEmitter = (PartLevelEmitter) this;
+				output.setLong("reportingValue", partLevelEmitter.getReportingValue());
+			}
+		}
+
+		if (this instanceof IConfigurableFluidInventory) {
+			final IFluidHandler tank = ((IConfigurableFluidInventory) this).getFluidInventoryByName("config");
+			if (tank instanceof AEFluidInventory ) {
+				((AEFluidInventory) tank).writeToNBT(output, "config");
+			}
+			if (this instanceof PartFluidLevelEmitter) {
+				final PartFluidLevelEmitter partFluidLevelEmitter = (PartFluidLevelEmitter) this;
+				output.setLong("reportingValue", partFluidLevelEmitter.getReportingValue());
+			}
 		}

 		return output.hasNoTags() ? null : output;
@@ -70,6 +70,7 @@ import appeng.util.item.AEItemStack;

 public class PartExportBus extends PartSharedItemBus implements ICraftingRequester
 {
+	private final int[] failedCraftTriesSlot = {0,0,0,0,0,0,0,0,0};

 	public static final ResourceLocation MODEL_BASE = new ResourceLocation( AppEng.MOD_ID, "part/export_bus_base" );

@@ -149,13 +150,18 @@ public class PartExportBus extends PartSharedItemBus implements ICraftingRequest

 					final IAEItemStack ais = this.getConfig().getAEStackInSlot( slotToExport );

-					if( ais == null || this.itemToSend <= 0 || this.craftOnly() )
-					{
-						if( this.isCraftingEnabled() )
-						{
-							this.didSomething = this.craftingTracker.handleCrafting( slotToExport, this.itemToSend, ais, destination, this.getTile().getWorld(),
-									this.getProxy().getGrid(), cg, this.mySrc ) || this.didSomething;
+					if( ais == null || this.itemToSend <= 0 ) continue;
+
+					if ( this.craftOnly() ) {
+						if (this.failedCraftTriesSlot[x] <= 0) {
+
+							this.didSomething = this.craftingTracker.handleCrafting(slotToExport, this.itemToSend, ais, destination, this.getTile().getWorld(),
+									this.getProxy().getGrid(), cg, this.mySrc) || this.didSomething;
+
+							if (this.didSomething) this.failedCraftTriesSlot[x] = 0;
+							else this.failedCraftTriesSlot[x] += 2;
 						}
+						this.failedCraftTriesSlot[x] -= 1;
 						continue;
 					}

@@ -179,8 +185,15 @@ public class PartExportBus extends PartSharedItemBus implements ICraftingRequest

 					if( this.itemToSend == before && this.isCraftingEnabled() )
 					{
-						this.didSomething = this.craftingTracker.handleCrafting( slotToExport, this.itemToSend, ais, destination, this.getTile().getWorld(),
-								this.getProxy().getGrid(), cg, this.mySrc ) || this.didSomething;
+						if (this.failedCraftTriesSlot[x] <= 0) {
+
+							this.didSomething = this.craftingTracker.handleCrafting(slotToExport, this.itemToSend, ais, destination, this.getTile().getWorld(),
+									this.getProxy().getGrid(), cg, this.mySrc) || this.didSomething;
+
+							if (this.didSomething) this.failedCraftTriesSlot[x] = 0;
+							else this.failedCraftTriesSlot[x] += 2;
+						}
+						this.failedCraftTriesSlot[x] -= 1;
 					}
 				}

@@ -140,7 +140,7 @@ public class PartImportBus extends PartSharedItemBus implements IInventoryDestin
 	@Override
 	public TickingRequest getTickingRequest( final IGridNode node )
 	{
-		return new TickingRequest( TickRates.ImportBus.getMin(), TickRates.ImportBus.getMax(), this.getHandler() == null, false );
+		return new TickingRequest( TickRates.ImportBus.getMin(), TickRates.ImportBus.getMax(), this.isSleeping(), false );
 	}

 	@Override
@@ -26,6 +26,8 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;

+import appeng.api.config.Settings;
+import appeng.api.config.StorageFilter;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.items.IItemHandler;

@@ -57,12 +59,18 @@ class ItemHandlerAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<IAE
 	private final IItemHandler itemHandler;
 	private final IGridProxyable proxyable;
 	private final InventoryCache cache;
+	private StorageFilter mode;

 	ItemHandlerAdapter( IItemHandler itemHandler, IGridProxyable proxy )
 	{
 		this.itemHandler = itemHandler;
 		this.proxyable = proxy;
-		this.cache = new InventoryCache( this.itemHandler );
+		if( this.proxyable instanceof PartStorageBus )
+		{
+			PartStorageBus partStorageBus = (PartStorageBus) this.proxyable;
+			this.mode = ( (StorageFilter) partStorageBus.getConfigManager().getSetting( Settings.STORAGE_FILTER ) );
+		}
+		this.cache = new InventoryCache( this.itemHandler, this.mode );
 	}

 	@Override
@@ -134,21 +142,34 @@ class ItemHandlerAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<IAE
 				extracted = this.itemHandler.extractItem( i, remainingCurrentSlot, simulate );
 				if( !extracted.isEmpty() )
 				{
+					// In order to guard against broken IItemHandler implementations, we'll try to guess if the returned
+					// stack (especially in simulate mode) is the same that was returned by getStackInSlot. This is
+					// obviously not a precise science, but it would catch the previous Forge bug:
+					// https://github.com/MinecraftForge/MinecraftForge/pull/6580
+					if (extracted == stackInInventorySlot) {
+						extracted = extracted.copy();
+					}
+
 					if( extracted.getCount() > remainingCurrentSlot )
 					{
 						// Something broke. It should never return more than we requested...
 						// We're going to silently eat the remainder
-						AELog.warn( "Mod that provided item handler %1 is broken. Returned %2 items, even though we requested %3.",
-								this.itemHandler.getClass().getSimpleName(), extracted.getCount(), remainingCurrentSlot );
+						AELog.warn( "Mod that provided item handler %s is broken. Returned %s items while only requesting %d.",
+								this.itemHandler.getClass().getName(), extracted.toString(), remainingCurrentSlot );
 						extracted.setCount( remainingCurrentSlot );
 					}

-					// We're just gonna use the first stack we get our hands on as the template for the rest.
-					// In case some stupid itemhandler (aka forge) returns an internal state we have to do a second
-					// expensive copy again.
+					// Heuristic for simulation: looping in case of simulations is pointless, since the state of the
+					// underlying inventory does not change after a simulated extraction. To still support inventories
+					// that report stacks that are larger than maxStackSize, we use this heuristic
+					if (simulate && extracted.getCount() == extracted.getMaxStackSize()
+								&& remainingCurrentSlot > extracted.getMaxStackSize()) {
+						extracted.setCount(remainingCurrentSlot);
+					}
+
 					if( gathered.isEmpty() )
 					{
-						gathered = extracted.copy();
+						gathered = extracted;
 					}
 					else
 					{
@@ -157,7 +178,7 @@ class ItemHandlerAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<IAE
 					remainingCurrentSlot -= extracted.getCount();
 				}
 			}
-			while( !extracted.isEmpty() && remainingCurrentSlot > 0 );
+			while( !simulate && !extracted.isEmpty() && remainingCurrentSlot > 0 );

 			remainingSize -= stackSizeCurrentSlot - remainingCurrentSlot;

@@ -255,9 +276,11 @@ class ItemHandlerAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<IAE
 	{
 		private IAEItemStack[] cachedAeStacks = new IAEItemStack[0];
 		private final IItemHandler itemHandler;
+		private final StorageFilter mode;

-		public InventoryCache( IItemHandler itemHandler )
+		public InventoryCache( IItemHandler itemHandler, StorageFilter mode )
 		{
+			this.mode = mode;
 			this.itemHandler = itemHandler;
 		}

@@ -282,8 +305,14 @@ class ItemHandlerAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<IAE
 			{
 				// Save the old stuff
 				final IAEItemStack oldAeIS = this.cachedAeStacks[slot];
-				final ItemStack newIS = this.itemHandler.getStackInSlot( slot );
-
+				ItemStack newIS = this.itemHandler.getStackInSlot( slot );
+				if( this.mode == StorageFilter.EXTRACTABLE_ONLY && !newIS.isEmpty() )
+				{
+					if( this.itemHandler.extractItem( slot, 1, true ).isEmpty() )
+					{
+						newIS = ItemStack.EMPTY;
+					}
+				}
 				this.handlePossibleSlotChanges( slot, oldAeIS, newIS, changes );
 			}

@@ -0,0 +1,305 @@
+package appeng.parts.misc;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+
+import appeng.api.storage.IStorageChannel;
+
+import appeng.core.AELog;
+import com.jaquadro.minecraft.storagedrawers.api.capabilities.IItemRepository;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.NonNullList;
+
+import appeng.api.AEApi;
+import appeng.api.config.Actionable;
+import appeng.api.networking.security.IActionSource;
+import appeng.api.networking.storage.IBaseMonitor;
+import appeng.api.networking.ticking.TickRateModulation;
+import appeng.api.storage.IMEInventory;
+import appeng.api.storage.IMEMonitorHandlerReceiver;
+import appeng.api.storage.channels.IItemStorageChannel;
+import appeng.api.storage.data.IAEItemStack;
+import appeng.api.storage.data.IItemList;
+import appeng.me.GridAccessException;
+import appeng.me.helpers.IGridProxyable;
+import appeng.me.storage.ITickingMonitor;
+import appeng.util.item.AEItemStack;
+
+import javax.annotation.Nonnull;
+
+/**
+ * Wraps an Item Repository in such a way that it can be used as an IMEInventory for items.
+ * Used by the Storage Bus
+ */
+
+class ItemRepositoryAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<IAEItemStack>, ITickingMonitor
+{
+    private final Map<IMEMonitorHandlerReceiver<IAEItemStack>, Object> listeners = new HashMap<>();
+    private IActionSource mySource;
+    private final IItemRepository itemRepository;
+    private final IGridProxyable proxyable;
+    private final InventoryCache cache;
+
+
+    ItemRepositoryAdapter( IItemRepository itemRepository, IGridProxyable proxy )
+    {
+        this.itemRepository = itemRepository;
+        this.proxyable = proxy;
+        this.cache = new InventoryCache( this.itemRepository );
+    }
+
+    @Override
+    public IAEItemStack injectItems( IAEItemStack iox, Actionable type, IActionSource src )
+    {
+        ItemStack orgInput = iox.createItemStack();
+        ItemStack remaining = orgInput;
+
+        boolean simulate = ( type == Actionable.SIMULATE );
+
+        remaining = this.itemRepository.insertItem( remaining, simulate );
+
+        // At this point, we still have some items left...
+        if( remaining == orgInput )
+        {
+            // The stack remained unmodified, target inventory is full
+            return iox;
+        }
+
+        if( type == Actionable.MODULATE )
+        {
+            try
+            {
+                this.proxyable.getProxy().getTick().alertDevice( this.proxyable.getProxy().getNode() );
+            }
+            catch( GridAccessException ex )
+            {
+                // meh
+            }
+        }
+
+        return AEItemStack.fromItemStack( remaining );
+
+    }
+
+    @Override
+    public IAEItemStack extractItems( IAEItemStack request, Actionable mode, IActionSource src )
+    {
+        ItemStack requestedItemStack = request.createItemStack();
+        int remainingSize = requestedItemStack.getCount();
+
+        final boolean simulate = ( mode == Actionable.SIMULATE );
+
+        ItemStack extracted;
+        extracted = this.itemRepository.extractItem( requestedItemStack, remainingSize, simulate );
+
+        if( extracted.getCount() > remainingSize )
+        {
+            // Something broke. It should never return more than we requested...
+            // We're going to silently eat the remainder
+            AELog.warn( "Mod that provided item handler %s is broken. Returned %s items while only requesting %d.",
+                    this.itemRepository.getClass().getName(), extracted.toString(), remainingSize );
+            extracted.setCount( remainingSize );
+        }
+
+        if( !extracted.isEmpty() )
+        {
+            if( mode == Actionable.MODULATE )
+            {
+                try
+                {
+                    this.proxyable.getProxy().getTick().alertDevice( this.proxyable.getProxy().getNode() );
+                }
+                catch( GridAccessException ex )
+                {
+                    // meh
+                }
+            }
+
+            return AEItemStack.fromItemStack( extracted );
+        }
+
+        return null;
+    }
+
+    @Override
+    public IItemList<IAEItemStack> getAvailableItems( IItemList<IAEItemStack> out )
+    {
+        return this.cache.getAvailableItems( out );
+    }
+
+    @Override
+    public IStorageChannel<IAEItemStack> getChannel()
+    {
+        return AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class );
+    }
+
+    @Override
+    public void addListener( IMEMonitorHandlerReceiver<IAEItemStack> l, Object verificationToken )
+    {
+        this.listeners.put( l, verificationToken );
+    }
+
+    @Override
+    public void removeListener( IMEMonitorHandlerReceiver<IAEItemStack> l )
+    {
+        this.listeners.remove( l );
+    }
+
+    private void postDifference( Iterable<IAEItemStack> a )
+    {
+        final Iterator<Map.Entry<IMEMonitorHandlerReceiver<IAEItemStack>, Object>> i = this.listeners.entrySet().iterator();
+        while( i.hasNext() )
+        {
+            final Map.Entry<IMEMonitorHandlerReceiver<IAEItemStack>, Object> l = i.next();
+            final IMEMonitorHandlerReceiver<IAEItemStack> key = l.getKey();
+            if( key.isValid( l.getValue() ) )
+            {
+                key.postChange( this, a, this.mySource );
+            }
+            else
+            {
+                i.remove();
+            }
+        }
+    }
+
+    @Override
+    public TickRateModulation onTick()
+    {
+        {
+            List<IAEItemStack> changes = this.cache.update();
+            if( !changes.isEmpty() )
+            {
+                this.postDifference( changes );
+                return TickRateModulation.URGENT;
+            }
+            else
+            {
+                return TickRateModulation.SLOWER;
+            }
+        }
+    }
+
+    @Override
+    public void setActionSource( final IActionSource mySource )
+    {
+        this.mySource = mySource;
+    }
+
+    private static class InventoryCache
+    {
+        private IAEItemStack[] cachedAeStacks = new IAEItemStack[0];
+        private final IItemRepository iItemRepository;
+
+        public InventoryCache( IItemRepository iItemRepository )
+        {
+            this.iItemRepository = iItemRepository;
+        }
+
+        public IItemList<IAEItemStack> getAvailableItems( IItemList<IAEItemStack> out )
+        {
+            Arrays.stream( this.cachedAeStacks ).forEach( out::add );
+            return out;
+        }
+
+        public List<IAEItemStack> update()
+        {
+            final List<IAEItemStack> changes = new ArrayList<>();
+
+            List<IAEItemStack> out = this.iItemRepository.getAllItems().stream().map( s -> AEItemStack.fromItemStack( s.itemPrototype ).setStackSize( s.count ) ).collect(Collectors.toList() );
+
+            final int size = out.size();
+
+            // Make room for new slots
+            if( size > this.cachedAeStacks.length )
+            {
+                this.cachedAeStacks = Arrays.copyOf( this.cachedAeStacks, size );
+            }
+
+            for( int x = 0; x < size; x++ )
+            {
+                // Save the old stuff
+                final IAEItemStack oldAeIS = this.cachedAeStacks[x];
+                final IAEItemStack newIS = out.get( x );
+
+                this.handlePossibleSlotChanges( x, oldAeIS, newIS, changes );
+            }
+
+            // Handle cases where the number of slots actually is lower now than before
+            if( size < this.cachedAeStacks.length )
+            {
+                for( int x = 0; x < this.cachedAeStacks.length; x++ )
+                {
+                    final IAEItemStack aeStack = this.cachedAeStacks[x];
+
+                    if( aeStack != null )
+                    {
+                        final IAEItemStack a = aeStack.copy();
+                        a.setStackSize( -a.getStackSize() );
+                        changes.add( a );
+                    }
+                }
+
+                // Reduce the cache size
+                this.cachedAeStacks = Arrays.copyOf( this.cachedAeStacks, size );
+            }
+
+            return changes;
+        }
+
+        private void handlePossibleSlotChanges( int slot, IAEItemStack oldAeIS, IAEItemStack newIS, List<IAEItemStack> changes )
+        {
+            if( oldAeIS != null && oldAeIS.isSameType( newIS ) )
+            {
+                this.handleStackSizeChanged( slot, oldAeIS, newIS, changes );
+            }
+            else
+            {
+                this.handleItemChanged( slot, oldAeIS, newIS, changes );
+            }
+        }
+
+        private void handleStackSizeChanged( int slot, IAEItemStack oldAeIS, IAEItemStack newIS, List<IAEItemStack> changes )
+        {
+            // Still the same item, but amount might have changed
+            final long diff = newIS.getStackSize() - oldAeIS.getStackSize();
+
+            if( diff != 0 )
+            {
+                final IAEItemStack stack = oldAeIS.copy();
+                stack.setStackSize( newIS.getStackSize() );
+
+                this.cachedAeStacks[slot] = stack;
+
+                final IAEItemStack a = stack.copy();
+                a.setStackSize( diff );
+                changes.add( a );
+            }
+        }
+
+        private void handleItemChanged( int slot, IAEItemStack oldAeIS, IAEItemStack newIS, List<IAEItemStack> changes )
+        {
+            // Completely different item
+            this.cachedAeStacks[slot] =  newIS ;
+
+            // If we had a stack previously in this slot, notify the network about its disappearance
+            if( oldAeIS != null )
+            {
+                oldAeIS.setStackSize( -oldAeIS.getStackSize() );
+                changes.add( oldAeIS );
+            }
+
+            // Notify the network about the new stack. Note that this is null if newIS was null
+            if( this.cachedAeStacks[slot] != null )
+            {
+                changes.add( this.cachedAeStacks[slot] );
+            }
+        }
+    }
+}
@@ -23,6 +23,7 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Objects;

+import com.jaquadro.minecraft.storagedrawers.api.capabilities.IItemRepository;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -33,6 +34,8 @@ import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.IBlockAccess;
+import net.minecraftforge.common.capabilities.Capability;
+import net.minecraftforge.common.capabilities.CapabilityInject;
 import net.minecraftforge.items.CapabilityItemHandler;
 import net.minecraftforge.items.IItemHandler;

@@ -95,6 +98,8 @@ import appeng.util.prioritylist.PrecisePriorityList;

 public class PartStorageBus extends PartUpgradeable implements IGridTickable, ICellContainer, IMEMonitorHandlerReceiver<IAEItemStack>, IPriorityHost
 {
+	@CapabilityInject(IItemRepository.class)
+	public static Capability<IItemRepository> ITEM_REPOSITORY_CAPABILITY = null;

 	public static final ResourceLocation MODEL_BASE = new ResourceLocation( AppEng.MOD_ID, "part/storage_bus_base" );

@@ -395,6 +400,12 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC
 			return null;
 		}

+		// Check via cap for IItemRepository
+		IItemRepository handlerRepo = target.getCapability( ITEM_REPOSITORY_CAPABILITY, targetSide );
+		if( handlerRepo != null )
+		{
+			return new ItemRepositoryAdapter( handlerRepo, this );
+		}
 		// Check via cap for IItemHandler
 		IItemHandler handlerExt = target.getCapability( CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, targetSide );
 		if( handlerExt != null )
@@ -420,6 +431,13 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC
 			return Objects.hash( target, target.getCapability( Capabilities.STORAGE_MONITORABLE_ACCESSOR, targetSide ) );
 		}

+		final IItemRepository handlerRepo = target.getCapability( ITEM_REPOSITORY_CAPABILITY, targetSide );
+
+		if( handlerRepo != null )
+		{
+			return Objects.hash( target, handlerRepo, handlerRepo.getAllItems().size() );
+		}
+
 		final IItemHandler itemHandler = target.getCapability( CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, targetSide );

 		if( itemHandler != null )
@@ -466,6 +484,7 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC
 			{
 				this.monitor = (ITickingMonitor) inv;
 				this.monitor.setActionSource( new MachineSource( this ) );
+				this.monitor.setMode( (StorageFilter) this.getConfigManager().getSetting( Settings.STORAGE_FILTER ) );
 			}

 			if( inv != null )
@@ -336,15 +336,18 @@ public abstract class PartP2PTunnel<T extends PartP2PTunnel> extends PartBasicSt
 			}

 			final IMemoryCard mc = (IMemoryCard) is.getItem();
-			final NBTTagCompound data = new NBTTagCompound();
+			final NBTTagCompound data = mc.getData( is );
+			final short storedFrequency = data.getShort( "freq" );

 			short newFreq = this.getFrequency();
 			final boolean wasOutput = this.isOutput();
 			this.setOutput( false );

+			final boolean needsNewFrequency = wasOutput || this.getFrequency() == 0 || storedFrequency == newFreq;
+
 			try
 			{
-				if( wasOutput || this.getFrequency() == 0 )
+				if( needsNewFrequency )
 				{
 					newFreq = this.getProxy().getP2P().newFrequency();
 				}
@@ -373,7 +376,14 @@ public abstract class PartP2PTunnel<T extends PartP2PTunnel> extends PartBasicSt
 			data.setIntArray( "colorCode", colorCode );

 			mc.setMemoryCardContents( is, type + ".name", data );
-			mc.notifyUser( player, MemoryCardMessages.SETTINGS_SAVED );
+			if( needsNewFrequency )
+			{
+				mc.notifyUser( player, MemoryCardMessages.SETTINGS_RESET );
+			}
+			else
+			{
+				mc.notifyUser( player, MemoryCardMessages.SETTINGS_SAVED );
+			}
 			return true;
 		}
 		return false;
@@ -179,25 +179,29 @@ public class PartConversionMonitor extends AbstractPartMonitor
 			final IEnergySource energy = this.getProxy().getEnergy();
 			final IMEMonitor<IAEItemStack> cell = this.getProxy()
 					.getStorage()
-					.getInventory(
-							AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) );
+					.getInventory( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) );
+
 			if( allItems )
 			{
-				final IAEItemStack input = this.getDisplayed().copy();
-				IItemHandler inv = new PlayerMainInvWrapper( player.inventory );
-
-				for( int x = 0; x < inv.getSlots(); x++ )
+				if( this.getDisplayed() != null )
 				{
-					final ItemStack targetStack = inv.getStackInSlot( x );
-					if( input.equals( targetStack ) )
+					final IAEItemStack input = this.getDisplayed().copy();
+					IItemHandler inv = new PlayerMainInvWrapper( player.inventory );
+
+					for( int x = 0; x < inv.getSlots(); x++ )
 					{
-						final ItemStack canExtract = inv.extractItem( x, targetStack.getCount(), true );
-						if( !canExtract.isEmpty() )
+						final ItemStack targetStack = inv.getStackInSlot( x );
+						if( input.equals( targetStack ) )
 						{
-							input.setStackSize( canExtract.getCount() );
-							final IAEItemStack failedToInsert = Platform.poweredInsert( energy, cell, input, new PlayerSource( player, this ) );
-							inv.extractItem( x, failedToInsert == null ? canExtract.getCount() : canExtract.getCount() - (int) failedToInsert.getStackSize(),
-									false );
+							final ItemStack canExtract = inv.extractItem( x, targetStack.getCount(), true );
+							if( !canExtract.isEmpty() )
+							{
+								input.setStackSize( canExtract.getCount() );
+								final IAEItemStack failedToInsert = Platform.poweredInsert( energy, cell, input, new PlayerSource( player, this ) );
+								inv.extractItem( x,
+										failedToInsert == null ? canExtract.getCount() : canExtract.getCount() - (int) failedToInsert.getStackSize(),
+										false );
+							}
 						}
 					}
 				}
@@ -44,6 +44,9 @@ public class PartInterfaceTerminal extends AbstractPartDisplay
 	public static final IPartModel MODELS_OFF = new PartModel( MODEL_BASE, MODEL_OFF, MODEL_STATUS_OFF );
 	public static final IPartModel MODELS_ON = new PartModel( MODEL_BASE, MODEL_ON, MODEL_STATUS_ON );
 	public static final IPartModel MODELS_HAS_CHANNEL = new PartModel( MODEL_BASE, MODEL_ON, MODEL_STATUS_HAS_CHANNEL );
+	public String in = "";
+	public String out = "";
+	public boolean onlyInterfacesWithFreeSlots = false;

 	public PartInterfaceTerminal( final ItemStack is )
 	{
@@ -69,4 +72,8 @@ public class PartInterfaceTerminal extends AbstractPartDisplay
 		return this.selectModel( MODELS_OFF, MODELS_ON, MODELS_HAS_CHANNEL );
 	}

+	public void saveSearchStrings(String in, String out){
+		this.in = in;
+		this.out = out;
+	}
 }
@@ -46,7 +46,6 @@ public class Quad implements IVertexProducer, ISmartVertexConsumer
 	public CachedFormat format;

 	public int tintIndex = -1;
-	// TODO, sometimes this is null because people don't do models properly.
 	public EnumFacing orientation;
 	public boolean diffuseLighting = true;
 	public TextureAtlasSprite sprite;
@@ -130,6 +129,10 @@ public class Quad implements IVertexProducer, ISmartVertexConsumer
 			{
 				this.vertexIndex = 0;
 				this.full = true;
+				if(orientation == null)
+				{
+				    calculateOrientation(false);
+                }
 			}
 		}
 	}
@@ -195,31 +198,41 @@ public class Quad implements IVertexProducer, ISmartVertexConsumer
 			vec[1] = (float) MathHelper.clamp( vec[1], bb.minY, bb.maxY );
 			vec[2] = (float) MathHelper.clamp( vec[2], bb.minZ, bb.maxZ );
 		}
-
-		this.v1.set( this.vertices[3].vec );
-		this.t.set( this.vertices[1].vec );
-		this.v1.sub( this.t );
-
-		this.v2.set( this.vertices[2].vec );
-		this.t.set( this.vertices[0].vec );
-		this.v2.sub( this.t );
-
-		this.normal.cross( this.v2, this.v1 );
-		this.normal.normalize();
-
-		if( this.format.hasNormal )
-		{
-			for( Vertex vertex : this.vertices )
-			{
-				vertex.normal[0] = this.normal.x;
-				vertex.normal[1] = this.normal.y;
-				vertex.normal[2] = this.normal.z;
-				vertex.normal[3] = 0;
-			}
-		}
-		this.orientation = EnumFacing.getFacingFromVector( this.normal.x, this.normal.y, this.normal.z );
+		calculateOrientation(true);
 	}

+    /**
+     * Re-calculates the Orientation of this quad,
+     * optionally the normal vector.
+     *
+     * @param setNormal If the normal vector should be updated.
+     */
+	public void calculateOrientation( boolean setNormal )
+    {
+        this.v1.set( this.vertices[3].vec );
+        this.t.set( this.vertices[1].vec );
+        this.v1.sub( this.t );
+
+        this.v2.set( this.vertices[2].vec );
+        this.t.set( this.vertices[0].vec );
+        this.v2.sub( this.t );
+
+        this.normal.cross( this.v2, this.v1 );
+        this.normal.normalize();
+
+        if( this.format.hasNormal && setNormal)
+        {
+            for( Vertex vertex : this.vertices )
+            {
+                vertex.normal[0] = this.normal.x;
+                vertex.normal[1] = this.normal.y;
+                vertex.normal[2] = this.normal.z;
+                vertex.normal[3] = 0;
+            }
+        }
+        this.orientation = EnumFacing.getFacingFromVector( this.normal.x, this.normal.y, this.normal.z );
+    }
+
 	/**
 	 * Used to create a new quad complete copy of this one.
 	 *
@@ -28,6 +28,8 @@ import java.util.Map;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;

+import appeng.fluids.helper.IConfigurableFluidInventory;
+import appeng.fluids.util.AEFluidInventory;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;

@@ -41,6 +43,7 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
+import net.minecraftforge.fluids.capability.IFluidHandler;
 import net.minecraftforge.items.IItemHandler;

 import appeng.api.implementations.tiles.ISegmentedInventory;
@@ -398,6 +401,18 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile,
 				}
 			}
 		}
+
+		if (this instanceof IConfigurableFluidInventory ) {
+			final IFluidHandler tank = ((IConfigurableFluidInventory) this).getFluidInventoryByName("config");
+			if (tank instanceof AEFluidInventory) {
+				final AEFluidInventory target = (AEFluidInventory) tank;
+				final AEFluidInventory tmp = new AEFluidInventory(null, target.getSlots());
+				tmp.readFromNBT(compound, "config");
+				for (int x = 0; x < tmp.getSlots(); x++) {
+					target.setFluidInSlot(x, tmp.getFluidInSlot(x));
+				}
+			}
+		}
 	}

 	/**
@@ -462,6 +477,13 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile,
 			}
 		}

+		if (this instanceof IConfigurableFluidInventory) {
+			final IFluidHandler tank = ((IConfigurableFluidInventory) this).getFluidInventoryByName("config");
+			if (tank instanceof AEFluidInventory ) {
+				((AEFluidInventory) tank).writeToNBT(output, "config");
+			}
+		}
+
 		return output.hasNoTags() ? null : output;
 	}

@@ -20,15 +20,18 @@ package appeng.tile.crafting;


 import java.io.IOException;
+import java.util.Optional;

 import io.netty.buffer.ByteBuf;

 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.EnumFacing;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;

+import appeng.api.AEApi;
 import appeng.api.implementations.tiles.IColorableTile;
 import appeng.api.storage.data.IAEItemStack;
 import appeng.api.util.AEColor;
@@ -183,4 +186,12 @@ public class TileCraftingMonitorTile extends TileCraftingTile implements IColora
 	{
 		this.updateList = updateList;
 	}
+
+	@Override
+	protected ItemStack getItemFromTile( final Object obj )
+	{
+		final Optional<ItemStack> is = AEApi.instance().definitions().blocks().craftingMonitor().maybeStack( 1 );
+
+		return is.orElseGet( () -> super.getItemFromTile( obj ) );
+	}
 }
@@ -42,6 +42,9 @@ public class TileCraftingStorageTile extends TileCraftingTile

 		switch( storage )
 		{
+			case 1:
+				is = blocks.craftingStorage1k().maybeStack( 1 );
+				break;
 			case 4:
 				is = blocks.craftingStorage4k().maybeStack( 1 );
 				break;
@@ -85,6 +85,10 @@ public class TileCraftingTile extends AENetworkTile implements IAEMultiBlock, IP
 		{
 			is = AEApi.instance().definitions().blocks().craftingAccelerator().maybeStack( 1 );
 		}
+		else
+		{
+			is = AEApi.instance().definitions().blocks().craftingUnit().maybeStack( 1 );
+		}

 		return is.orElseGet( () -> super.getItemFromTile( obj ) );
 	}
@@ -458,8 +458,6 @@ public class TileMolecularAssembler extends AENetworkInvTile implements IUpgrade
 			final ItemStack output = this.myPlan.getOutput( this.craftingInv, this.getWorld() );
 			if( !output.isEmpty() )
 			{
-				FMLCommonHandler.instance().firePlayerCraftingEvent( Platform.getPlayer( (WorldServer) this.getWorld() ), output, this.craftingInv );
-
 				this.pushOut( output.copy() );

 				for( int x = 0; x < this.craftingInv.getSizeInventory(); x++ )
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Salomão	c58bebc346	Fix gregtech tileentities showing up as unnamed or draconium lens	2021-03-07 23:59:39 -03:00
Salomão	97f11f0c61	Fix storage drawers showing up as nothing on interface terminal	2021-03-07 23:56:52 -03:00
Salomão	5c2fa72f95	mix pattern terminal multiplying items above maxitemstack size	2021-03-07 00:01:01 -03:00
Salomão	ebd8501301	fix inaccessible items setting in storage bus not being respected	2021-03-07 00:00:16 -03:00
Salomão	fa07247bd7	Revert "also shrink the fluid skiplist if the tanks change sizes" This reverts commit `892c919ee2`.	2021-03-04 23:08:08 -03:00
Salomão	95d25ddf47	Revert "Skip un-extractable slots." This reverts commit `e2e6f6e83f`.	2021-03-04 23:07:58 -03:00
Salomão	7a45e1faf4	Revert "rebuild skipslotlist if the the inventory grows or shrinks" This reverts commit `7796c6d4b6`.	2021-03-04 23:07:34 -03:00
Salomão	1f88494832	fix not being able to swap patterns on interface terminal	2021-03-03 09:57:02 -03:00
PrototypeTrousers	c629b4e0cf	Merge pull request #4 from Theisyat/AE2-Omnifactory Fixed 'Only show Empty' in Interface Terminal	2021-03-02 19:56:16 -03:00
PrototypeTrousers	65ca607134	Merge branch 'AE2-Omnifactory' into AE2-Omnifactory	2021-03-02 19:55:52 -03:00
Salomão	898c07ca01	fix toggling full interfaces hiding all interfaces	2021-03-02 18:45:14 -03:00
Theisyat	883c267aa8	Fixed Interface Terminal and Added Stuff Fixed 'Hide Full' Button First Free Molecular Assembler Button Added Button in Interface Terminal, which Searches for 'Molecular Assembler' and sets the Interface Terminal to only show Assemblers with free Slots.	2021-03-02 07:00:48 +01:00
Salomão	22cf913708	highlight interfaces from interface terminal.	2021-02-28 21:32:11 -03:00
Salomão	b4ba1af1ec	bind BlockPos of the interface on the list	2021-02-28 02:03:00 -03:00
Salomão	892c919ee2	also shrink the fluid skiplist if the tanks change sizes	2021-02-24 18:08:57 -03:00
Salomão	a65b3d2ceb	fix interface terminal GUI	2021-02-24 13:24:04 -03:00
Salomão	c826a3e24f	Add second search bar to Interface Terminal	2021-02-23 20:48:45 -03:00
Salomão	fc98505f22	even more JEI integration get ingredient from the crafting calculation GUIs	2021-02-22 22:33:05 -03:00
Salomão	ea54ccbcf5	More JEI integration	2021-02-22 18:35:46 -03:00
Salomão	7796c6d4b6	rebuild skipslotlist if the the inventory grows or shrinks	2021-02-22 14:33:06 -03:00
Salomão	e2e6f6e83f	Skip un-extractable slots.	2021-02-21 23:08:16 -03:00
Salomão	a7a1a87cd8	Holding SHIFT with an empty hand will increase the amount of items set on interfaces and on pattern terminal	2021-02-21 20:26:52 -03:00
Salomão	e50eb7965f	undo monitor ticking limit	2021-02-21 03:24:03 -03:00
Salomão	d25a8a53a2	fix IItemRepository insert and extraction	2021-02-21 02:24:50 -03:00
Salomão	92b48f01a2	do not use java equals to compare stacks	2021-02-20 21:18:20 -03:00
Salomão	42f0d37c44	Merge branch 'IItemRepository' into AE2-Omnifactory	2021-02-18 23:26:49 -03:00
Salomão	088a1827be	implement IItemRepository	2021-02-18 18:33:06 -03:00
Salomão	6a21968dab	add storagedrawers to the gradle deps	2021-02-17 12:30:07 -03:00
Salomão	7c5ff5322a	Fix JEI transfer fix. Typo correction.	2021-02-16 16:47:22 -03:00
Salomão	7834028459	Rebuild itemlist only once per tick re-enabled level-emitters update	2021-02-15 15:41:48 -03:00
Salomão	c43cbbef43	Switched JEI search to crafting terminal to fuzzy mode	2021-02-14 02:14:15 -03:00
Salomão	ead6274ca4	FIX JEI transfer not working correctly Missing on the crafting terminal	2021-02-13 21:48:37 -03:00
Salomão	f1c41bab3f	Implement MouseTweaks API can now set item quantities in pattern terminal and interfaces by right clicking with the same configured item	2021-02-12 20:26:21 -03:00
Salomão	12e74dc0de	Merge remote-tracking branch 'origin/AE2-Omnifactory' into AE2-Omnifactory	2021-02-11 23:07:43 -03:00
Salomão	c10088d907	Fill pattern with items from JEI Just Enough Energistics overrides this	2021-02-11 23:07:26 -03:00
PrototypeTrousers	a12d29c4a0	Update README.md	2021-02-09 18:58:08 -03:00
PrototypeTrousers	2227510acf	Update README.md	2021-02-09 18:55:22 -03:00
Salomão	97ae7e1f14	encoded patterns now stack up to 64	2021-02-08 22:14:37 -03:00
Salomão	fc119070b2	Actually copy level emitters set values	2021-01-15 17:41:40 -03:00
Salomão	82e3a95f11	fix memory card not saving fluids an level emitters	2021-01-12 18:24:05 -03:00
Salomão	e6998913e1	remove forced level emitters update remove unneeded itemStack creation.	2021-01-04 14:18:07 -03:00
Salomão	a3e69ce608	add hardcoded id range for molds and shapes for GTCE blocking mode	2020-12-08 22:42:04 -03:00
Salomão	ceef176a2a	remove time-based thread syncinc	2020-12-01 17:26:42 -03:00
Salomão	c2e2696707	Fix fuzzy search for items that have metadata > maxdamage	2020-12-01 17:25:52 -03:00
Salomão	4d6c61dfcb	backport e82093eec9459be3211564a83166455150c51259	2020-11-23 00:45:49 -03:00
Salomão	932141cc9e	backport b7ca98d1e24e5797a8e42ca861ae4187ab5839ec	2020-11-23 00:45:49 -03:00
Salomão	adf59774d4	Remove uneeded Forge Event Firing improves crafting calculation performance	2020-11-18 20:22:40 -03:00
Salomão	9c6668b0f7	disable "smart" button wasn't so smart	2020-11-13 17:42:41 -03:00
Salomão	1b7f11a12e	buttons work and set quantities properly	2020-11-12 23:27:56 -03:00
Salomão	3cf4f9122c	works..ish	2020-11-12 20:42:30 -03:00
Salomão	d97996070a	x2 button on the right place	2020-11-12 18:40:10 -03:00
Salomão	8a165bea09	ease punishment a bit	2020-10-28 19:50:57 -03:00
Salomão	f707f95373	Revert "undo penalties" This reverts commit `d6499c16b0`.	2020-10-28 19:49:23 -03:00
Salomão	b2a660ec9b	formating fixes	2020-10-28 17:50:40 -03:00
Salomão	d6499c16b0	undo penalties	2020-10-28 16:59:51 -03:00
Salomão	de3e0178a4	update forge and jei	2020-10-27 03:38:12 -03:00
Salomão	203522316c	more tweaks testing	2020-10-25 18:57:42 -03:00
Salomão	719ea5090b	move gtce blocking code out of generic item adaptor fixes crash with ae2 fluid crafting	2020-10-25 01:04:48 -03:00
Salomão	00e19d67a2	Tune punishment	2020-10-23 21:39:36 -03:00
Salomão	169f6393d1	move penalty up the chain	2020-10-22 11:24:16 -03:00
Salomão	12bf337238	Re-do Blocking mode logic	2020-10-21 15:44:43 -03:00
Salomão	3b544c2486	Merge remote-tracking branch 'PrototypeTrousers/AE2-Omnifactory' into AE2-Omnifactory	2020-10-20 23:52:18 -03:00
Salomão	660e17d167	Merge remote-tracking branch 'talchas/on-upstream' into AE2-Omnifactory	2020-10-20 23:52:11 -03:00
Salomão	b10246a67b	Merge remote-tracking branch 'talchas/on-upstream' into AE2-Omnifactory	2020-10-20 23:04:44 -03:00
Salomão	74362bb543	Merge branch 'ae2-interface-export-bus-fixes' into AE2-Omnifactory	2020-10-20 23:02:53 -03:00
Salomão	81df58afa5	dont try to re-request craft immediately, if we cant craft it now	2020-10-20 23:01:09 -03:00
Salomão	535289e694	Change interface behavior skip complete configured stacks postpone crafting job start	2020-10-20 14:30:08 -03:00
yueh	d730503378	Fixes #4388 : Ensure correct ticking priority order (#4393 )	2020-05-27 16:13:20 +02:00
yueh	f3349b0a2d	Fixes #4372 : Limit validated itemstack to a size of 1 (#4373 )	2020-05-07 11:49:00 +02:00
yueh	f667e9a5f0	Reduce lock time	2020-04-25 18:28:33 +02:00
Hinara	2c0a2975de	Fix #4114 (#4357 )	2020-04-25 18:05:14 +02:00
yueh	2e3d6b721a	Run daily after the initial cleanup is done	2020-03-30 11:00:43 +02:00
yueh	94e294f4e9	Remove redundant option	2020-03-27 21:28:55 +01:00
yueh	91620a0042	Handle issues and prs	2020-03-27 21:23:29 +01:00
yueh	ffc79b5494	Run workflow hourly	2020-03-27 19:43:09 +01:00
yueh	ce7c29d0ac	Create lock.yml	2020-03-27 18:06:46 +01:00
talchas	5ac8db41e7	option for a blocking mode that actually works	2020-02-06 18:13:31 -08:00
yueh	6ece190ac4	Fixes #4127 : Increase JEI box for grindstone recipes (#4270 )	2020-01-30 10:06:14 +01:00
yueh	00a596ea8f	Fixes #4268 : Disabled JEI facade recipe when disabled. (#4269 )	2020-01-30 09:35:45 +01:00
yueh	1fc1d5517d	Fixes #4213 : Prevent NPE when inserting via conversion monitor (#4265 )	2020-01-26 13:36:06 +01:00
yueh	d5fc7a5b21	Fixes #4256 : Cache AESharedItemStack#hashCode() (#4257 )	2020-01-16 13:22:42 +01:00
Rik Pronk	1f85d0f607	Fix CraftTweaker Grindstone second optional output (#4250 ) Fixes an issue where the CraftTweaker Grindstone integration registered the second optional output as first optional output	2020-01-16 10:57:18 +01:00
talchas	dfe5b82bda	Safer implementation of CraftingGridCache updatePatterns coalescing	2019-12-31 10:57:23 -08:00
talchas	c7f8f4249e	Avoid quadratic behavior from rebuilding the entire crafting cache for each interface visited. Instead rebuild it at most once per tick, like cpu clusters. This is particularly important when channels are disabled, since in that case even adding a cable visits every grid node.	2019-12-31 10:57:23 -08:00
ruifung	5efa6d6251	Update API JavaDocs for clarification (#4180 ) * Fix javadoc for IGridBlock.getMachineRepresentation() Javadoc should state proper semantics for that method, and telling people to return null there is a sure crash. #4178 * Update IPart interface javadoc. Update the javadoc to state that functional parts should not be allowed to be placed on dense cables.	2019-12-19 10:18:27 +01:00
Andrew Motz	4269a66a4b	Fix Typos in README.md (#4183 ) "Summery" to "Summary"	2019-12-19 10:16:59 +01:00
Chan, Danny	df2a7c1858	Add "cullface" into charged_quartz_ore.json (#4108 )	2019-08-07 10:08:05 +02:00
yueh	c483bd17f5	Fixes #4089 : Render cable core on straight lines of different types. (#4103 )	2019-07-23 21:12:17 +02:00
yueh	92536fceb4	Fixes #4090 Portable cell incorrect empty itemstack handling (#4093 )	2019-07-23 20:13:15 +02:00
yueh	ded71cb2bd	Fixes #4062 : Rounding error due to float precision. (#4064 )	2019-06-20 10:47:28 +02:00
yueh	41a4518c5b	Fixes #4005 : Persist cell after cleanup. (#4009 )	2019-04-21 22:30:45 +02:00
yueh	87643094c3	Fixes #3925 : Incorrect API JavaDoc (#4008 ) `IGridBlock#getMachineRepresentation()` must be non null.	2019-04-21 22:30:35 +02:00
yueh	8a4c9b58e6	Fixes #3911 : Incorrectly used string format. (#4007 )	2019-04-21 22:30:21 +02:00
InterPlay	5436e6bf08	Added support for fluids in pt-BR lang file (#3904 )	2019-04-21 13:20:57 +02:00
yueh	078112d97b	Disable modmaven due to build issues for now (#4011 )	2019-04-21 13:10:02 +02:00
yueh	46355a4e9b	Fixes #3899 : Put fluid interface into configured mode when needed. (#3903 )	2019-01-15 12:52:12 +01:00
yueh	eb389971a3	Fixes #3901 : Ensure fluid terminal respects reported stacksizes. (#3902 )	2019-01-15 12:52:00 +01:00
yueh	a38ebf7c4d	Fixes #3886 : Initialise sleeping import bus in pulse mode. (#3887 )	2018-12-26 23:28:17 +01:00
yueh	dfcba264f3	Fixes #3880 : Incorrect compare with empty itemstack. (#3882 )	2018-12-25 21:21:19 +01:00
yueh	d343ac47f5	Added CTM as actual soft dependency. (#3881 )	2018-12-25 21:21:08 +01:00
yueh	05db930a4e	Fixes #3821 : Unconfigured level emitter now report all fluids. (#3875 )	2018-12-24 14:44:40 +01:00
yueh	33bc0a6a3f	Fixes #3776 : Fixes dupe bug with cell upgrades. (#3874 )	2018-12-24 14:11:45 +01:00
yueh	f2f48a8d59	Fixes #3767 : Fluid Annihilation plane too strict about leftover (#3872 )	2018-12-23 23:33:15 +01:00
yueh	0f0af2349b	Fixes #3866 : Use blockstates to avoid the missing fluid block. (#3869 )	2018-12-23 22:42:25 +01:00
yueh	32a4fcab77	Fixes #3768 : Damageable items with nbt and without damage could crash. (#3867 )	2018-12-23 22:42:09 +01:00
yueh	a847a01d8a	Feature #3832 : Made onRequestChange() less ambiguous (#3833 )	2018-12-23 22:41:52 +01:00
yueh	ed643787df	Updated gradle scripts (#3871 ) Includes #3819	2018-12-23 22:41:11 +01:00
covers1624	524b26d2a2	Implement caching for facade item models.	2018-12-19 12:46:43 +01:00
covers1624	184b1f8efb	Guard against models providing quads with null orientations.	2018-12-19 12:46:43 +01:00
E. Kim	06cca13087	Update ko_kr.lang (#3674 )	2018-11-17 10:31:29 +01:00
徐晨曦	8e735e72ff	Update zh_cn.lang (#3570 )	2018-11-17 10:31:01 +01:00
yueh	d3dd137570	Fixes #3817 : Missing 1k Crafting Storage and Monitor from Network Status (#3818 )	2018-11-11 13:11:45 +01:00
yueh	78e1126c38	Fixes #3814 : IO Port no longer put to sleep on load when having work. (#3816 )	2018-11-11 11:52:13 +01:00
yueh	ebe3ff045d	Fixes #3811 : Display crafting unit as themself in the network monitor. (#3815 )	2018-11-11 11:52:03 +01:00
yueh	6291a545c3	Fixes #3793 : Limit filling fluid inventories to their max capacity. (#3794 )	2018-10-21 11:18:02 +02:00
yueh	99fd5a9d53	Fixes #3790 : Correctly handle fluids with NBT data. (#3791 )	2018-10-21 11:17:27 +02:00
yueh	416c7d2683	Input P2P tunnels can now be assigned a new frequency. (#3765 ) Shift right clicking an existing tunnel only allowed to copied the stored frequency. When shift right clicking now and the stored frequency being the same as already stored one, it will now create a new one and save it to the memory card. In other words doubling clicking will reset now, otherwise the old behaviour is still kept.	2018-10-21 11:17:01 +02:00
yueh	0c88d1e7ee	Fixes #3746 : Revert OreDict use for cable anchors. Blame Forge for crashes. (#3764 )	2018-10-06 00:02:41 +02:00
fscan	d88f550eb0	Switch to new IItemHandler (#3669 )	2018-10-04 20:39:06 +02:00
yueh	e21c59b326	Fixes #3146 : Prevent crash when GlassState is missing. (#3758 )	2018-10-04 19:33:10 +02:00
yueh	d8af8d26be	Updated to new Forge RB (#3760 )	2018-10-04 19:32:47 +02:00
yueh	02426bc101	Update bug_report.md Fixed missing *	2018-10-02 17:38:22 +02:00
yueh	11f8471772	Updated issue templates Updated bug report Added feature request	2018-10-01 13:12:44 +02:00
yueh	d35b720a16	Update issue templates (#3751 )	2018-10-01 13:00:07 +02:00
mezz	7a5b84c10a	Allow JEI to differentiate between different cable facades (#3750 )	2018-10-01 11:18:38 +02:00
covers1624	800860d4e6	Fixes #3747 : Fix issues with facade breaking textures. (#3748 )	2018-10-01 11:12:38 +02:00