Skip to content

Commit

Permalink
Merge branch 'mfu' of https://github.com/Vexatos/OpenComputers into m…
Browse files Browse the repository at this point in the history
…aster-MC1.7.10

# Conflicts:
#	src/main/resources/assets/opencomputers/lang/en_US.lang
  • Loading branch information
fnuecke committed Feb 3, 2017
2 parents a84b557 + 645ca3e commit 5105266
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@
The adapter allows [computers](../general/computer.md) to interact with blocks from vanilla Minecraft or other mods. Supported blocks adjacent to the adapter will show up as components in [computers](../general/computer.md) connected to the adapter.

In addition to this, the adapter provides a slot for a few select upgrades. For example, the [inventory controller upgrade](../item/inventoryControllerUpgrade.md) allows computers to query more information from an inventory adjacent to the adapter, similar to when the upgrade is installed in a device (such as a [robot](robot.md) or [drone](../item/drone.md)), and a [tank controller upgrade](../item/tankControllerUpgrade.md) provides similar functionality for fluid tanks next to the adapter.
Furthermore, you can insert a bound [MFU](../item/mfu.md) to interact with blocks a few spaces away.
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ Keep in mind that some of these may not be available, depending on the recipe se
* [Inventory Controller](inventoryControllerUpgrade.md)
* [Inventory Upgrade](inventoryUpgrade.md)
* [Leash Upgrade](leashUpgrade.md)
* [MFU](mfu.md)
* [Navigation Upgrade](navigationUpgrade.md)
* [Piston Upgrade](pistonUpgrade.md)
* [Sign Upgrade](signUpgrade.md)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,5 @@
The inventory controller upgrade provides extended inventory interaction to [robots](../block/robot.md) and [drones](drone.md). It allows the device to explicitly target slots in external inventories when dropping or sucking items. It also allows devices to read detailed information about item stacks. Lastly it provides [robots](../block/robot.md) with a means to change their equipped tool without external help.

This upgrade can also be placed in [adapters](../block/adapter.md), where it provides similar inspection methods for inventories adjacent to the [adapter](../block/adapter.md) as it does to the [robot](../block/robot.md). It does not allow the [adapter](../block/adapter.md) to move items into or out of inventories, however. This feature is only available to [robots](../block/robot.md) and [drones](drone.md).

See also: [Transposers](../block/transposer.md)
7 changes: 7 additions & 0 deletions src/main/resources/assets/opencomputers/doc/en_US/item/mfu.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# MFU

![You will never know the true meaning of this acronym.](oredict:oc:mfu)

This upgrade acts as a remote [adapter](../block/adapter.md). Click while sneaking onto any side of any block to bind it to a specific position. Then, place it into an adapter nearby (the range is very limited) and it will act as if the adapter was placed right next to the specific side you bound it to!

Keep in mind that keeping the remote adapter connection active uses energy.
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,5 @@
The tank controller upgrade is to fluid tanks what the [inventory controller upgrade](inventoryControllerUpgrade.md) is to normal inventories. It allows devices to query more detailed information about tanks inside and next to them.

This upgrade can also be installed in [adapters](../block/adapter.md), allowing [computers](../general/computer.md) connected to the [adapter](../block/adapter.md) to query information about the tanks adjacent to the [adapter](../block/adapter.md).

See also: [Transposers](../block/transposer.md)

0 comments on commit 5105266

Please sign in to comment.