Merge branch 'OC1.6-MC1.7.10' of github.com:MightyPirates/OpenComputers into OC1.6-MC1.8.9

# Conflicts:
#	build.properties
#	src/main/scala/li/cil/oc/integration/tis3d/SerialInterfaceProviderAdapter.scala
This commit is contained in:
Florian Nücke 2016-04-16 16:24:00 +02:00
commit 07534fd54d
2 changed files with 1 additions and 8 deletions

View File

@ -2,7 +2,7 @@ minecraft.version=1.8.9
forge.version=11.15.1.1764
oc.version=1.6.0
oc.subversion=beta.1
oc.subversion=rc.1
ae2.version=rv2-beta-26
bc.version=7.0.9

View File

@ -1,7 +0,0 @@
# Adapter
![Freeeedooooooom!](block:OpenComputers:adapter)
The adapter's serial interface does not implement a hard-coded protocol. Instead, the protocol is defined by the software running on the computer controlling the adapter. Please refer to the component's API using an OpenComputers computer for specifics.
The adapter's serial interface has a small internal buffer for values passed along in either direction. Note that by default the adapter's serial interface does not read from the serial port. Reading has to be enabled from the component's API.