Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10

This commit is contained in:
Florian Nücke 2016-07-13 18:30:22 +02:00
commit 16e020adf0

View File

@ -580,7 +580,7 @@ opencomputers {
# capacitor on the side of the converter.
converter: 1000.0
# The amount of energy each face of a distributor can story. This
# The amount of energy each face of a distributor can store. This
# allows connecting two power distributors directly. If the buffer
# capacity between the two distributors is zero, they won't be able
# to exchange energy. This basically controls the bandwidth. You can
@ -842,7 +842,7 @@ opencomputers {
# File system related settings, performance and and balancing.
filesystem {
# Whether persistent file systems such as disk drivers should be
# Whether persistent file systems such as disk drives should be
# 'buffered', and only written to disk when the world is saved. This
# applies to all hard drives. The advantage of having this enabled is that
# data will never go 'out of sync' with the computer's state if the game
@ -1488,8 +1488,8 @@ opencomputers {
# Extract the native library with Lua into the system's temporary
# directory instead of the game directory (e.g. /tmp on Linux). The
# default is to extract into the game directory, to avoid issues when
# the temporary directory is mounted as noexec (meaning the lib cannot)
# be loaded. There is also less of a chance of conflicts when running
# the temporary directory is mounted as noexec (meaning the lib cannot
# be loaded). There is also less of a chance of conflicts when running
# multiple servers or server and client on the same machine.
nativeInTmpDir: false