From 665d4d00c4bd7cb1b81ee6d97f10d7aa713aeec2 Mon Sep 17 00:00:00 2001 From: Rail Engineer #20 <37258405+tongkl1@users.noreply.github.com> Date: Wed, 16 May 2018 21:27:55 +0800 Subject: [PATCH 01/14] Update doc zh_CN files --- .../doc/zh_CN/block/hologram1.md | 10 +++------- .../opencomputers/doc/zh_CN/block/index.md | 20 +++++++++---------- .../opencomputers/doc/zh_CN/block/keyboard.md | 6 ++++-- .../doc/zh_CN/block/microcontroller.md | 7 +++---- .../doc/zh_CN/block/motionSensor.md | 7 +++---- .../doc/zh_CN/block/netSplitter.md | 9 ++++----- .../doc/zh_CN/block/powerConverter.md | 7 ++----- .../doc/zh_CN/block/powerDistributor.md | 4 ++-- .../opencomputers/doc/zh_CN/block/printer.md | 2 +- .../opencomputers/doc/zh_CN/block/rack.md | 6 ++++-- .../opencomputers/doc/zh_CN/block/raid.md | 14 +++++-------- .../opencomputers/doc/zh_CN/block/redstone.md | 11 ++++------ .../opencomputers/doc/zh_CN/block/relay.md | 14 +++++-------- .../opencomputers/doc/zh_CN/block/robot.md | 8 ++++---- .../opencomputers/doc/zh_CN/block/screen1.md | 19 +++++++++--------- .../doc/zh_CN/block/transposer.md | 8 ++++---- .../opencomputers/doc/zh_CN/block/waypoint.md | 11 ++++++---- 17 files changed, 75 insertions(+), 88 deletions(-) diff --git a/src/main/resources/assets/opencomputers/doc/zh_CN/block/hologram1.md b/src/main/resources/assets/opencomputers/doc/zh_CN/block/hologram1.md index c1cd02d222..1d9d36bc6a 100644 --- a/src/main/resources/assets/opencomputers/doc/zh_CN/block/hologram1.md +++ b/src/main/resources/assets/opencomputers/doc/zh_CN/block/hologram1.md @@ -1,11 +1,7 @@ -# 全息投影机 +# 全息投影仪 ![Is this the real life? Is this just fantasy?](oredict:oc:hologram1) -一个巨大的显示屏, i.e. 可以显示独立的三维图形,就是那种全息的3D，偏振光原理那种（高中课本会讲） +全息投影仪是一种立体显示装置, 可以显示一组三维像素, 这其中的每个立体像素（Voxel）都可以通过与投影仪相连的[电脑](../general/computer.md)单独设置. T2投影仪的分辨率和T1一样, 但是它支持三色显示, 而T1投影仪只支持单色. 三种颜色可以自定义（注：每个投影仪都可以单独设置三种颜色, 因此可以通过放置多个投影仪以显示多种颜色）. -2级显示屏, 分辨率不变但是支持电脑定制每个像素的颜色 - -可以被[扳手](../item/wrench.md)旋转 [, - -可以在范围内任意放缩显示 +用[螺丝刀扳手](../item/wrench.md)右击投影仪底部可以绕y轴旋转全息影像. 这么干可以省得你在软件里累死累活地实现旋转. 全系影像可以被放大或缩小到你想要的比例. \ No newline at end of file diff --git a/src/main/resources/assets/opencomputers/doc/zh_CN/block/index.md b/src/main/resources/assets/opencomputers/doc/zh_CN/block/index.md index ccfe5f6ec5..2e9898219f 100644 --- a/src/main/resources/assets/opencomputers/doc/zh_CN/block/index.md +++ b/src/main/resources/assets/opencomputers/doc/zh_CN/block/index.md @@ -1,6 +1,6 @@ # 方块 -本索引列出了OC全部的的方块 如果要找物品点[这里](../item/index.md). +本索引列出了OC全部的的方块 如果要找物品, 请点[这里](../item/index.md). 注意有些方块由于合成表的原因,可能不可用. @@ -13,28 +13,28 @@ ## 组件 ### 输入 / 输出 -* [全息投影机](hologram1.md) +* [全息投影仪](hologram1.md) * [键盘](keyboard.md) -* [屏幕](screen1.md) +* [显示器](screen1.md) ### 存储 -* [硬盘](diskDrive.md) +* [硬盘驱动器](diskDrive.md) * [磁盘阵列](raid.md) ### 扩展 * [适配器](adapter.md) * [扫描器](geolyzer.md) -* [运动探测器](motionSensor.md) +* [运动传感器](motionSensor.md) * [红石IO接口](redstone.md) * [转置器（注：直译）](transposer.md) * [路径点](waypoint.md) ## 组装 / 打印 -* [3D打印](print.md) +* [3D打印制品](print.md) * [3D打印机](printer.md) -* [组装器](assembler.md) +* [组装机](assembler.md) * [染色方块](chameliumBlock.md) -* [拆解器](disassembler.md) +* [拆解机](disassembler.md) ## 网络 * [线缆](cable.md) @@ -44,5 +44,5 @@ ## 电源管理 * [电容](capacitor.md) * [充电器](charger.md) -* [能源转换](powerConverter.md) -* [能源分发](powerDistributor.md) +* [能源转换器](powerConverter.md) +* [能源分配器](powerDistributor.md) diff --git a/src/main/resources/assets/opencomputers/doc/zh_CN/block/keyboard.md b/src/main/resources/assets/opencomputers/doc/zh_CN/block/keyboard.md index 8e39020233..18f585d345 100644 --- a/src/main/resources/assets/opencomputers/doc/zh_CN/block/keyboard.md +++ b/src/main/resources/assets/opencomputers/doc/zh_CN/block/keyboard.md @@ -1,5 +1,7 @@ -# Keyboard +# 键盘 ![QWERTY](oredict:oc:keyboard) -在[屏幕](screen1.md)上打字 , 或者嵌入 [机器人](robot.md) 和 [平板](../item/tablet.md). +往[显示器](screen1.md)里打字时你需要用到键盘, 不管它们是被放在世界中还是嵌入[机器人](robot.md)或[平板电脑](../item/tablet.md)中. + +要想使放置下来的键盘与[显示器](screen1.md)相连, 它必须放在[显示器](screen1.md)旁边且面对着[显示器](screen1.md), 或是直接放在[显示器](screen1.md)上面（管它哪个面）. 如果你点击[显示器](screen1.md), 发现它的GUI可以被打开了, 那就说明这块键盘算是连上去了. \ No newline at end of file diff --git a/src/main/resources/assets/opencomputers/doc/zh_CN/block/microcontroller.md b/src/main/resources/assets/opencomputers/doc/zh_CN/block/microcontroller.md index bcaf67e2dd..5f8460d4dc 100644 --- a/src/main/resources/assets/opencomputers/doc/zh_CN/block/microcontroller.md +++ b/src/main/resources/assets/opencomputers/doc/zh_CN/block/microcontroller.md @@ -1,8 +1,7 @@ -# Microcontroller +# 单片机 ![Don't belittle it.](block:OpenComputers:microcontroller) -单片机通过[单片机箱](../item/microcontrollerCase1.md) 在[组装机](assembler.md)组装. 相比电脑他们弱得多 , 但是便宜. 另外他们无法和外界物件交互. +单片机通过把[单片机箱](../item/microcontrollerCase1.md)放进[组装机](assembler.md)组装. 相比[电脑](../general/computer.md)他们弱得多, 但是便宜. 此外他们*无法*和外界物件交互. -单片机可以携带多种组件, 如 [CPU](../item/cpu1.md), [内存](../item/ram1.md), 扩展卡. 单片机无法携带[硬盘](../item/hdd1.md)只能烧入[E2PROM](../item/eeprom.md), -相比[机箱](case1.md)他们可以用一些特别的升级 比如[活塞升级](../item/pistonUpgrade.md). +单片机可以携带多种组件, 如 [CPU](../item/cpu1.md), [内存](../item/ram1.md), 以及扩展卡. 单片机无法携带[硬盘](../item/hdd1.md)只能烧入[EEPROM](../item/eeprom.md). 相比[机箱](case1.md)他们可以用一些特别的升级, 比如[活塞升级](../item/pistonUpgrade.md). diff --git a/src/main/resources/assets/opencomputers/doc/zh_CN/block/motionSensor.md b/src/main/resources/assets/opencomputers/doc/zh_CN/block/motionSensor.md index 0e409f4387..5985a8514d 100644 --- a/src/main/resources/assets/opencomputers/doc/zh_CN/block/motionSensor.md +++ b/src/main/resources/assets/opencomputers/doc/zh_CN/block/motionSensor.md @@ -1,7 +1,6 @@ -# Motion Sensor +# 运动传感器 ![Don't. Blink.](oredict:oc:motionSensor) -运动探测器允许 [电脑](../general/computer.md)探测生物. 如果生物移速快过阈值，将会向连接的电脑发出红石信号 [computers](../general/computer.md) -阈值可以在连接的电脑上用组件API调节 -探测范围8格, 不能有障碍物,生物走出范围或者连线上有障碍都会使得生物无法被探测。 +运动传感器允许 [电脑](../general/computer.md)探测生物. 如果生物移速快过阈值，传感器将向连接的[电脑](../general/computer.md)发射信号. 阈值可以在连接的电脑上用组件API调节. +探测范围8格, 不能有障碍物, 生物走出范围或者与传感器的连线上有障碍都会使得生物无法被探测. \ No newline at end of file diff --git a/src/main/resources/assets/opencomputers/doc/zh_CN/block/netSplitter.md b/src/main/resources/assets/opencomputers/doc/zh_CN/block/netSplitter.md index 55e32f7d73..7cfda6ad5f 100644 --- a/src/main/resources/assets/opencomputers/doc/zh_CN/block/netSplitter.md +++ b/src/main/resources/assets/opencomputers/doc/zh_CN/block/netSplitter.md @@ -1,9 +1,8 @@ -# Net Splitter +# VLAN分割器 ![*.net *.split](oredict:oc:netSplitter) -VLAN分割器能够让你控制子网的连接. 它不像 [中继器](relay.md) 或者 [能源转换](powerConverter.md) 那样直接连接相邻的子网. -每个边的连接都可以用扳手控制 (e.g. the [scrench](../item/wrench.md)). -接入红石信号之后, 所有连接反相. +VLAN分割器能够让你控制子网络间的连接. 它不像 [中继器](relay.md) 或者 [能源转换器](powerConverter.md) 那样把网络隔开, 而是直接连接相邻的子网. 也就是说, 组件会暴露给所有的电脑. +每个边的连接都可以用扳手控制 (比如说用[螺丝刀扳手](../item/wrench.md)). 接入红石信号之后, 所有连接将反相. -这个方块可以控制特定子网的连接. 使用[红石IO方块](redstone.md) 和 [红石卡](../item/redstoneCard1.md) 可以实现对他的自动化控制 +因此, 这个方块可以控制特定子网的连接. 使用[红石IO方块](redstone.md) 和 [红石卡](../item/redstoneCard1.md) 可以实现对他的自动化控制 \ No newline at end of file diff --git a/src/main/resources/assets/opencomputers/doc/zh_CN/block/powerConverter.md b/src/main/resources/assets/opencomputers/doc/zh_CN/block/powerConverter.md index 5a03b5f9da..8c9bdc6400 100644 --- a/src/main/resources/assets/opencomputers/doc/zh_CN/block/powerConverter.md +++ b/src/main/resources/assets/opencomputers/doc/zh_CN/block/powerConverter.md @@ -1,8 +1,5 @@ -# Power Converter +# 能源转换器 ![One of us? One of us!](oredict:oc:powerConverter) -能源转换器是最快捷的使用其他mod能源的办法了. -如果只是运行单台机器，那么不需要造这个东西。 如果你有一个只是偶尔使用的大电容你也不用做这个方块 -然而如果你想直接驱动[装配机](assembler.md) 或者 [充电机](charger.md), -这个东西往往比直接连接外部能源要给力 \ No newline at end of file +能源转换器是最快捷的使用其他mod能源的办法了. 如果只想运行一台电脑，那么你不需要造这个东西。 如果你有一个只是偶尔使用的大电容你也不用做这个方块. 然而如果你想给[装配机](assembler.md) 或者 [充电机](charger.md)这种电老虎直接供电, 这个东西往往比直接连接外部能源要给力. \ No newline at end of file diff --git a/src/main/resources/assets/opencomputers/doc/zh_CN/block/powerDistributor.md b/src/main/resources/assets/opencomputers/doc/zh_CN/block/powerDistributor.md index 79462fa99f..4b41882845 100644 --- a/src/main/resources/assets/opencomputers/doc/zh_CN/block/powerDistributor.md +++ b/src/main/resources/assets/opencomputers/doc/zh_CN/block/powerDistributor.md @@ -1,6 +1,6 @@ -# Power Distributor +# 能源分配器 ![Power to the masses.](oredict:oc:powerDistributor) 能源分配器能够将一个共享能源池(如[电容](capacitor.md))的能源分配出去, 使得子网络能够在不暴露元件的情况下分享能源 -它的作用是负载均衡，因此你会发现每个子网的能量供应都“差不多” \ No newline at end of file +它的工作原理是不断地平衡子网络中的能量，因此你会发现每个子网的能量供应相对一致（注：相对一致指的是耗能与供能成比例. 假设一个网络耗能是另一个的两倍, 那么能源分配器就会像前一个网络中分配两倍于后者的能量. 这也意味着这些网络往往会同时没电）. \ No newline at end of file diff --git a/src/main/resources/assets/opencomputers/doc/zh_CN/block/printer.md b/src/main/resources/assets/opencomputers/doc/zh_CN/block/printer.md index 2aa3f07f94..9f82f57c5e 100644 --- a/src/main/resources/assets/opencomputers/doc/zh_CN/block/printer.md +++ b/src/main/resources/assets/opencomputers/doc/zh_CN/block/printer.md @@ -1,4 +1,4 @@ -# 3D Printer +# 3D打印机 ![2D printing is so yesteryear.](oredict:oc:printer) diff --git a/src/main/resources/assets/opencomputers/doc/zh_CN/block/rack.md b/src/main/resources/assets/opencomputers/doc/zh_CN/block/rack.md index 9fbd629a52..c54230e029 100644 --- a/src/main/resources/assets/opencomputers/doc/zh_CN/block/rack.md +++ b/src/main/resources/assets/opencomputers/doc/zh_CN/block/rack.md @@ -1,6 +1,8 @@ #机架 + ![Free housing.](oredict:oc:rack) -机架中可以存放各种电脑，如服务器，终端服务器等，组件之间可以通过GUI设定他们的连接关系。如果服务器里面安装了网卡等组件，那么机架里面的服务器也是可以互联的，但是他们只能用来传递消息，而不能直接互相看到。你的程序不能直接探测到一个机柜里面的其他设备 +一个机架可以挂载至多四个可挂载组件, 如[服务器](../item/server1.md), [终端服务器](../item/terminalServer.md) and [挂载硬盘](../item/diskDriveMountable.md). 可挂载组件的连接可以在机架GUI内设置. 特别地, 如果[服务器](../item/server1.md)装了[网卡](../item/lanCard.md)等支持网络的组件, 机架GUI内会有一个"仅网络通信连接"供其使用. 这种连接的线在主连接下面, 比主连接细一点. 它们只传递网络信号, 而主连接在此之上还支持组件控制（注：截至2018/5/15翻译时, 主连接并不能传递网络信号, 文中的"还"应属编写疏忽）. 所有的内部连接都必须是一个可挂载组件/电脑组件与机架的某一面的连接. 如果你想把多个组件连到一起, 请把它们连到同一根总线上. -机架里有一条总线，如果要让组件互相可见，那么就连接到总线上。 \ No newline at end of file +机架同时集成了[中继器](relay.md) and [能源分配器](powerDistributor.md). 可以在其GUI里设置其是否像中继器一样工作. 如果是, 总线间将互相连接. +（注：译者并未弄清此处中继器的功能, 请知情者帮忙补上, 感谢） \ No newline at end of file diff --git a/src/main/resources/assets/opencomputers/doc/zh_CN/block/raid.md b/src/main/resources/assets/opencomputers/doc/zh_CN/block/raid.md index bbeeff0b0e..a60c22543f 100644 --- a/src/main/resources/assets/opencomputers/doc/zh_CN/block/raid.md +++ b/src/main/resources/assets/opencomputers/doc/zh_CN/block/raid.md @@ -1,15 +1,11 @@ -# Raid +# 磁盘阵列 ![40 man instance.](oredict:oc:raid) -Raid箱提供了[硬盘](../item/hdd1.md)的磁盘阵列功能，如同现实的RAID0一样，通过多块磁盘并发写入同时提高了效率和容量 +Raid箱提供了[硬盘](../item/hdd1.md)的磁盘阵列功能,如同现实的RAID0一样,通过多块磁盘并发写入同时提高了效率和容量. 将三块硬盘放入Raid即可组成单个完整的文件系统. 组合的文件系统拥有所有硬盘容量之和的大小并且所有相连的电脑均可以访问RAID. - 组合的文件系统拥有所有硬盘容量之和的大小并且所有相连的电脑均可以访问RAID +当且仅当3个以上的磁盘被放进RAID控制器时,这块些磁盘会被看作一块,每块磁盘的大小可以不同. -当且仅当3个以上的磁盘被放进RAID控制器时，这块些磁盘会被看作一块，允许每块磁盘大小不同 +注意,当你向RAID里加硬盘的时候原来的盘数据会全部丢失掉,而从RAID移除一块硬盘也会直接导致整个RAID损坏. 把拿出来的硬盘加回去也不会拯救这个悲剧,RAID会被重新初始化为空的磁盘. -注意当你加入RAID的时候原来的盘数据会全部丢失掉，而从RAID移除一块硬盘也会直接导致整个RAID损坏 - -加回去也不会拯救这个事实，RAID会被重新初始化为空的磁盘 - -挖掉RAID方块则不会丢失数据，相应的磁盘可以被重新放到一个新的RAID里面继续用 \ No newline at end of file +挖掉RAID方块则不会丢失数据,你可以直接把它放下来接着用. \ No newline at end of file diff --git a/src/main/resources/assets/opencomputers/doc/zh_CN/block/redstone.md b/src/main/resources/assets/opencomputers/doc/zh_CN/block/redstone.md index 0b2c4594de..80deb4126b 100644 --- a/src/main/resources/assets/opencomputers/doc/zh_CN/block/redstone.md +++ b/src/main/resources/assets/opencomputers/doc/zh_CN/block/redstone.md @@ -1,12 +1,9 @@ -# Redstone I/O +# 红石I/O接口 ![Hi Red.](oredict:oc:redstone) -红石IO方块可以被用来远程读取和发射红石信号. 他就像1级和2级[红石卡](../item/redstoneCard1.md)的杂交品: +红石IO接口可以被用来远程读取和发射红石信号. 他就像1级和2级[红石卡](../item/redstoneCard1.md)的杂交品: 它可以收发简单的红石信号, 也可以收发集束线缆的信号, 但是无法收发无线红石信号. -可以收发简单的信号也可以收发信号群, 但是无法收发无线红石信号 +当你调用这个方块的component时你要提供方向, 这时候你要提供全局方向, 比如说`sides.north`, `sides.east`等等. -When providing a side to the methods of the component exposed by this block, the directions are the global principal directions, i.e. it is recommended to use `sides.north`, `sides.east` and so on. - -如[红石卡](../item/redstoneCard1.md), 当红石变化的时候，这个方块会向连接的[电脑](../general/computer.md) 发送信号，（模拟或者信号束）.也可以用来唤醒连接的[电脑](../general/computer.md) -如果达到一定的强度可以直接把电脑开机 +类似于[红石卡](../item/redstoneCard1.md), 当红石变化的时候，这个方块会向连接的[电脑](../general/computer.md) 发送信号（模拟红石信号或者集束红石信号都可以）. 它也可以唤醒连接的[电脑](../general/computer.md), 只要输入信号超过了自启的阈值. \ No newline at end of file diff --git a/src/main/resources/assets/opencomputers/doc/zh_CN/block/relay.md b/src/main/resources/assets/opencomputers/doc/zh_CN/block/relay.md index e883684eb4..6fb8ea3043 100644 --- a/src/main/resources/assets/opencomputers/doc/zh_CN/block/relay.md +++ b/src/main/resources/assets/opencomputers/doc/zh_CN/block/relay.md @@ -1,17 +1,13 @@ -# Relay +# 中继器 ![Building bridges.](oredict:oc:relay) -中继器允许子网间发送消息,而不把组件暴露给其他网络的[电脑](../general/computer.md).通常来说,把组件限制在本地网络是个好主意,如果被不怀好意的熊控制了你的机器人,那么你家就完蛋了. +中继器允许子网间发送消息,而不把组件暴露给其他网络的[电脑](../general/computer.md).通常来说,把组件限制在本地网络是个好主意,不然的话可能会串线,或者是组件过多,导致电脑宕机. -可避免电脑链接到错误的屏幕,或者避免组件崩溃(可能崩掉电脑,并使之无法启动). +中继器可以安装[无线网卡](../item/wlanCard1.md),以发送无线消息.其他装了无线网卡的中继器可接受无限消息并转发,此外无限消息也可以被有无线网卡的[电脑](../general/computer.md)收到. -中继器可以安装[无线网卡](../item/wlanCard1.md),发送无线消息.其他的中继器可接受并转发,或者是被有无线网卡的电脑收到. +中继器还可以安装[连接卡](../item/linkedCard.md).在这种情况中,消息会额外地被送到连接卡的另一端. 这种操作照常耗能,确保中继器有充足的能源. -中继器也可以安装[连接卡](../item/linkedCard.md).消息被转发到链接卡的信道里面, 记得保持中继器能源. - -中继器不会记下包的路径,因此请避免网络环路(现实中将触发广播风暴,全网瘫痪).由于中继器资源不是无限的,过于频繁的发包将会导致丢包. - -你也可以通过升级来加速转发速度. +中继器*不会*记下包的路径,因此请避免网络环路(现实中将触发广播风暴,全网瘫痪).由于中继器的缓存不是无限的,过于频繁的发包将会导致丢包. 升级中继器可以提高它们转发包裹的能力,并增大包裹队列的容量. 包只会被转发有限次数(TTL),当TTL降为0时,包会被自动丢弃,缺省的TTL是5,每转发一次减去1. diff --git a/src/main/resources/assets/opencomputers/doc/zh_CN/block/robot.md b/src/main/resources/assets/opencomputers/doc/zh_CN/block/robot.md index 2bfe69c45e..7a186cd371 100644 --- a/src/main/resources/assets/opencomputers/doc/zh_CN/block/robot.md +++ b/src/main/resources/assets/opencomputers/doc/zh_CN/block/robot.md @@ -1,9 +1,9 @@ -# Robot +# 机器人 ![His name was Tobor.](block:OpenComputers:robot) -机器人不像 [电脑](../general/computer.md), 他们是可以像一个玩家一样去和世界交互的. 不过它们不能直接和其他设备交互! 如果需要和 [电脑](../general/computer.md) 和其他机器人通讯, 那么用[无线网卡](../item/wlanCard1.md), 或者通过[红石卡](../item/redstoneCard1.md)实现更底层的协议去通信. +机器人不像 [电脑](../general/computer.md), 他们可以像一个玩家一样和世界交互. 不过它们不能其他设备直接交互! 如果需要和 [电脑](../general/computer.md) 和其他机器人通讯, 请使用[无线网卡](../item/wlanCard1.md), 或者通过[红石卡](../item/redstoneCard1.md)实现更底层的协议来通信. -机器人通过将任意等级[机箱](case1.md) 放入 [组装机](assembler.md)制作的. 更高规格的[机箱](case1.md) 可以做出更复杂的机器人. 机器人的复杂度会显示在 [组装机](assembler.md)，复杂度取决于携带和安装的卡片和扩展数量; 级别越高，数量越多，越复杂，达到一定程度组装机将罢工. +机器人可以通过将任意等级[机箱](case1.md) 放入 [组装机](assembler.md)来制作. 更高规格的[机箱](case1.md) 可以做出更复杂的机器人,因为它们能装更高级的CPU. 机器人的复杂度会显示在 [组装机](assembler.md)里,复杂度取决于安装的卡片和扩展数量; 级别越高,复杂度越高,如果过于复杂,组装机将罢工. -机器人可以放入各种升级来加强. 包括 [物品栏升级](../item/inventoryUpgrade.md) [物品栏控制器](../item/inventoryControllerUpgrade.md) [储罐升级](../item/tankUpgrade.md), [导航升级](../item/navigationUpgrade.md)等. 卡和扩展都可以在机器人运行时热替换. 机器人也可以安装软驱来插软盘, 用来安装 [openOS](../general/openOS.md)(你也可以在组装的时候就带上预装系统的硬盘). +机器人可以放入各种升级来实现各种功能. 这包括 [物品栏升级](../item/inventoryUpgrade.md) [物品栏控制器](../item/inventoryControllerUpgrade.md) [储罐升级](../item/tankUpgrade.md), [导航升级](../item/navigationUpgrade.md)等. 卡和扩展都可以在机器人运行时热替换. 机器人也可以安装软驱来插软盘, 可以用来安装 [openOS](../general/openOS.md)(你也可以在组装的时候就带上预装系统的硬盘). diff --git a/src/main/resources/assets/opencomputers/doc/zh_CN/block/screen1.md b/src/main/resources/assets/opencomputers/doc/zh_CN/block/screen1.md index b21cf68f4e..d632fbdb7d 100644 --- a/src/main/resources/assets/opencomputers/doc/zh_CN/block/screen1.md +++ b/src/main/resources/assets/opencomputers/doc/zh_CN/block/screen1.md @@ -1,20 +1,21 @@ -# Screens +# 显示器 ![See this?](oredict:oc:screen1) -显示屏需要和显卡一起使用, 使得电脑能够显示文本.不同型号的屏幕能够显示不同的东西, 比如不同的分辨率和色深. 从低分单色屏到高分256色屏幕,可用分辨率取决于最差的那个配件. +显示器需要和[显卡](../item/graphicsCard1.md)组合使用, 使[电脑](../general/computer.md)能够显示文本.不同型号的屏幕的显示能力不同, 比如说它们有不同的分辨率和色深. 差的显示屏分辨率极低, 只支持单色显示,而高端显示器则支持高分辨率和至多256钟颜色。 -当使用T1显卡和T3屏幕时,仅T1的分辨率和色深可用,反之亦然.但是T3显卡的运行速度会快些 +可用分辨率取决于显示器和显卡中较差的那个. 当使用[T1显卡](../item/graphicsCard1.md)和[T3显示屏](screen3.md)时, 你将只能使用T1显卡的分辨率和色深, 反之亦然, 但是T3显卡的运行速度会快些（见[显卡](../item/graphicsCard1.md)）. -屏幕可以相邻放置组成多方块屏幕,需要朝向一样. 旋转的上下方向也一致. 可以通过手上的确定屏幕旋转方向.屏幕大小对分辨率无影响. +屏幕可以相邻放置组成多方块屏幕, 它们的朝向必须一致. 旋转方向也要一致. 手里拿着屏幕时, 可以通过屏幕顶上的箭头确定屏幕旋转方向. -可以通过染色,控制哪两块屏幕可以连接,手持染料右键即可,染料不会消耗掉. 屏幕在敲下来以后仍然保持他的颜色. 不同色不会连一起,同色不同型也不会. +屏幕大小对分辨率无影响. 可以通过染色来控制哪两块屏幕可以连接. 手持染料右键即可, 染料不会消耗. 屏幕在敲下来以后仍然保持颜色. 不同色不会连一起, 同色不同型也不会. -T2和T3屏支持鼠标. 屏幕会响应点击事件(只会在有键盘的时候或者是按下蹲的时候打开),在屏幕没有键盘的时候,蹲下是唯一操作办法.注意是否打开屏幕是可以通过组件API控制的. +T2和T3屏支持鼠标“触控”. 在屏幕的GUI里右击（只有当[键盘](keyboard.md)连接到屏幕上时才能打开GUI）或是按住Shift右击都可以触发. 如果屏幕上没有[键盘](keyboard.md), 那么你就不需要按住Shift, 直接右击屏幕即可. 注意,按住Shift或是不按, 然后右击屏幕, 触发的操作可以通过与屏幕相连的[电脑](../general/computer.md)控制. T3屏幕甚至可以获取更加精确的点击坐标, 只要从screen组件里开启就可以了. 这样你可以知道你按的是上半个字符还是下半个. 当你用特殊的Unicode字符模拟更高的像素时这可能很有用. -T3可以配置为接受更高的点击精度,这可以让人判定是点击上半个字符还是下半个,可以用来模拟更高分辨率的屏幕. +不同等级显示器的分辨率和色深如下： + +T1: 50x16, 单色 -分辨率如下： -T1: 50x16, 单色. T2: 80x25, 16色 + T3: 160x50, 256色 \ No newline at end of file diff --git a/src/main/resources/assets/opencomputers/doc/zh_CN/block/transposer.md b/src/main/resources/assets/opencomputers/doc/zh_CN/block/transposer.md index 4582918358..8c31d6c2be 100644 --- a/src/main/resources/assets/opencomputers/doc/zh_CN/block/transposer.md +++ b/src/main/resources/assets/opencomputers/doc/zh_CN/block/transposer.md @@ -1,9 +1,9 @@ -# Transposer +# 转置器 ![Such a poser.](oredict:oc:transposer) -转置器连接了红石控制的漏斗和[机器人](robot.md), 允许 [电脑](../general/computer.md)-控制液体和物品在相邻方块转移. +转置器解决了由红石控制的漏斗和[机器人](robot.md)二者分裂的局面. 它使得通过 [电脑](../general/computer.md)-控制液体和物品在相邻方块转移变为可能. -*本方块不自带物品栏.* +*本方块没有内置物品栏.* -本方块具有探测容器物品的能力 +除了移动物品,它还可以获悉相邻容器里有什么东西,就和装了[物品管理升级](../item/inventoryControllerUpgrade.md)的[适配器](adapter.md) 的功能一样. 此外,液体容器也可以, 类似于安装了[液管管理升级](../item/tankControllerUpgrade.md)的[适配器](adapter.md). \ No newline at end of file diff --git a/src/main/resources/assets/opencomputers/doc/zh_CN/block/waypoint.md b/src/main/resources/assets/opencomputers/doc/zh_CN/block/waypoint.md index 05020db668..1e391bd174 100644 --- a/src/main/resources/assets/opencomputers/doc/zh_CN/block/waypoint.md +++ b/src/main/resources/assets/opencomputers/doc/zh_CN/block/waypoint.md @@ -1,6 +1,9 @@ -# Waypoint +# 路径点 !["This way!" - "No, that way!"](oredict:oc:waypoint) -路径点重点不在本身,而是如何使用. 导航升级可以探测路径点, 因此安装了这种升级的设备就可以通过它导航. 这在对机器人和无人机写高度可重用的程序时很有用. -注意!导航升级报告的路径点位置,指的是路径点方块的正面,相邻的方块(粒子效果指示). 因此你可以把他放在箱子的边上或者上方, 通过将路径点看作“箱子上方”,而不必在你的程序里面旋转路点坐标。 -一个路点有两个属性:一个是收到的红石信号强度, 一个是可编辑的标签. 它是32长度字符串,可以在连接路点的设备上进行编辑,它告诉我们路点该如何使用 \ No newline at end of file + +路径点本身没什么用,但可以被其它设备使用. 导航升级可以探测路径点, 因此安装了这种升级的设备就可以通过它导航. 这在对机器人和无人机写高度可重复利用的程序时很有用. + +注意：导航升级报告的路径点位置,指的是路径点方块正对着的方块(粒子效果指示的那个方块). 因此你可以把它放在箱子的边上或者上方, 并将路径点视为“箱子上方”,而不必在你的程序里面对路径点的坐标进行修正（如旋转）。 + +查询路径点时会得到两个属性:一个是它当前收到的红石信号强度, 一个是可编辑的标签（名称）. 标签是一个32字符长的字符串,可以在其GUI里,或是通过waypoint组件进行编辑. 装有导航升级的设备就可以根据这两项属性判断该如何处理它们. 比如,一个物品分拣程序可以将所有高红石电平的路径点看做输入端,而将低电平的看做输出端。 \ No newline at end of file From 060f77da9959a4db865b8d66c853fadbf41b91d7 Mon Sep 17 00:00:00 2001 From: Rail Engineer #20 <37258405+tongkl1@users.noreply.github.com> Date: Thu, 17 May 2018 20:08:19 +0800 Subject: [PATCH 02/14] A --- .../assets/opencomputers/doc/zh_CN/block/diskDrive.md | 5 +++++ .../assets/opencomputers/doc/zh_CN/block/geolyzer.md | 7 ++++--- .../assets/opencomputers/doc/zh_CN/block/index.md | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/resources/assets/opencomputers/doc/zh_CN/block/diskDrive.md b/src/main/resources/assets/opencomputers/doc/zh_CN/block/diskDrive.md index c34bde088f..3cada89546 100644 --- a/src/main/resources/assets/opencomputers/doc/zh_CN/block/diskDrive.md +++ b/src/main/resources/assets/opencomputers/doc/zh_CN/block/diskDrive.md @@ -13,3 +13,8 @@ 在没有网卡的时候这是非常有用的数据传输方式了 可以 通过shift（蹲） + 右键，可以不打开软驱GUI装卸软盘 +The disk drive can be used to read [floppy disks](../item/floppy.md) using a [computer](../general/computer.md) connected to the disk drive. This is useful to get started, since the lower tier [computer cases](case1.md) do not have a built-in floppy slot, and you'll need an operating system to boot up the [computer](../general/computer.md). An [OpenOS](../general/openOS.md) disk can be crafted using an empty [floppy disk](../item/floppy.md) and a [manual](../item/manual.md). + +It can also be installed in [robots](robot.md) to allow inserting [floppy disks](../item/floppy.md) into the [robot](robot.md). This can be very useful since the only other way to transfer data to and from a robot is using networking - for example using [network cards](../item/lanCard.md). + +[Disks](../item/floppy.md) can be inserted and removed without opening the disk drive's GUI by sneak-activating the disk drive (shift-right click) with the [floppy disk](../item/floppy.md) in hand. diff --git a/src/main/resources/assets/opencomputers/doc/zh_CN/block/geolyzer.md b/src/main/resources/assets/opencomputers/doc/zh_CN/block/geolyzer.md index f639ea6d95..3d90503f62 100644 --- a/src/main/resources/assets/opencomputers/doc/zh_CN/block/geolyzer.md +++ b/src/main/resources/assets/opencomputers/doc/zh_CN/block/geolyzer.md @@ -1,5 +1,6 @@ -# 地图扫描机 +# 地质分析仪 ![Xray](oredict:oc:geolyzer) -让电脑具有扫描周边地形的能力，会把周边的方块硬度分布描述出来，可以生成一个能够在[全息投影机](hologram1.md)显示出来的地图，并描绘方块硬度分布，因此某种程度上用好了就是矿追。 -由于可能有奇怪的干扰，理论来说经常要多次扫描才能确认。它可以被作为升级安装在机器人和平板电脑上面，扫描消耗电池的能量。 +通过分析方块大体的硬度, [电脑](../general/computer.md)使用地质分析仪来扫描分析仪周边的地形. 在为[全息投影仪](hologram1.md)生成周边环境的地图时它会很有用. 此外它也可以用于探测潜在的有价值的方块（矿物一般而言比泥土和石头硬）. 地质分析仪扫描出来的结果有一定的噪音（失真），且随距离增加失真度会越来越高. 理论上, 进行多次扫描（然后求平均值）可以较准确地确定方块的硬度. + +地质分析仪也可以作为升级插件装在[机器人](robot.md) and [平板电脑](../item/tablet.md)上, 使得它们能够进行环境扫描. 扫描会消耗能量, 因此过度使用将耗尽它们的能量. \ No newline at end of file diff --git a/src/main/resources/assets/opencomputers/doc/zh_CN/block/index.md b/src/main/resources/assets/opencomputers/doc/zh_CN/block/index.md index 2e9898219f..9b76e5cb1c 100644 --- a/src/main/resources/assets/opencomputers/doc/zh_CN/block/index.md +++ b/src/main/resources/assets/opencomputers/doc/zh_CN/block/index.md @@ -23,7 +23,7 @@ ### 扩展 * [适配器](adapter.md) -* [扫描器](geolyzer.md) +* [地质分析仪](geolyzer.md) * [运动传感器](motionSensor.md) * [红石IO接口](redstone.md) * [转置器（注：直译）](transposer.md) From 275afe4c36c92b8a4c46ec851e9efa57e7c44190 Mon Sep 17 00:00:00 2001 From: Rail Engineer #20 <37258405+tongkl1@users.noreply.github.com> Date: Fri, 18 May 2018 11:55:49 +0800 Subject: [PATCH 03/14] a --- .../opencomputers/doc/zh_CN/block/case1.md | 34 +++++++++++++++++++ .../doc/zh_CN/block/chameliumBlock.md | 3 ++ .../opencomputers/doc/zh_CN/block/charger.md | 12 +++---- .../doc/zh_CN/block/disassembler.md | 8 +++-- .../doc/zh_CN/block/diskDrive.md | 17 ++-------- .../opencomputers/doc/zh_CN/block/geolyzer.md | 3 +- 6 files changed, 52 insertions(+), 25 deletions(-) diff --git a/src/main/resources/assets/opencomputers/doc/zh_CN/block/case1.md b/src/main/resources/assets/opencomputers/doc/zh_CN/block/case1.md index 9b58a8a11f..224009cfff 100644 --- a/src/main/resources/assets/opencomputers/doc/zh_CN/block/case1.md +++ b/src/main/resources/assets/opencomputers/doc/zh_CN/block/case1.md @@ -33,3 +33,37 @@ T4的可放配件： - 2x T3 [内存](../item/ram5.md) - 2xT3 [硬盘](../item/hdd3.md) - 1x [软盘](../item/floppy.md) + +Computer cases come in three different tiers, which limits the components that can be inserted into them. An additional tier also exists for use in creative mode only. Computer cases can also be placed inside an [assembler](assembler.md) to build [robots](robot.md). + +The maximum tier of the component that can be inserted into any slot of a computer case can be seen as a small roman numeral in the corner of a tier-limited slot. A tier 2 slot can take a tier 1 component, for instance. + +The tier 1 case can house up to and including the following components: +- 2x tier 1 expansion cards (such as [graphics cards](../item/graphicsCard1.md), [network cards](../item/lanCard.md), etc) +- 1x tier 1 [CPU](../item/cpu1.md) +- 2x tier 1 [RAM](../item/ram1.md) +- 1x tier 1 [HDD](../item/hdd1.md) + +The tier 2 case can house up to and including the following components: +- 1x tier 1 Expansion card (such as [graphics cards](../item/graphicsCard1.md), [network cards](../item/lanCard.md), etc) +- 1x tier 2 Expansion card +- 1x tier 2 [CPU](../item/cpu2.md) +- 2x tier 2 [RAM](../item/ram3.md) +- 1x tier 1 [HDD](../item/hdd1.md) +- 1x tier 2 [HDD](../item/hdd2.md) + +The tier 3 case can house up to and including the following components: +- 1x tier 3 Expansion card (such as [graphics cards](../item/graphicsCard1.md), [network cards](../item/lanCard.md), etc) +- 2x tier 2 Expansion card +- 1x tier 3 [CPU](../item/cpu3.md) +- 2x tier 3 [RAM](../item/ram5.md) +- 1x tier 2 [HDD](../item/hdd2.md) +- 1x tier 3 [HDD](../item/hdd3.md) +- 1x [floppy disk](../item/floppy.md) + +The tier 4 (Creative) case can house the following components: +- 3x tier 3 Expansion cards (such as [graphics cards](../item/graphicsCard1.md), [network cards](../item/lanCard.md), etc) +- 1x tier 3 [CPU](../item/cpu3.md) +- 2x tier 3 [RAM](../item/ram5.md) +- 2x tier 3 [HDD](../item/hdd3.md) +- 1x [floppy disk](../item/floppy.md) diff --git a/src/main/resources/assets/opencomputers/doc/zh_CN/block/chameliumBlock.md b/src/main/resources/assets/opencomputers/doc/zh_CN/block/chameliumBlock.md index b34abc2bb9..8476207e24 100644 --- a/src/main/resources/assets/opencomputers/doc/zh_CN/block/chameliumBlock.md +++ b/src/main/resources/assets/opencomputers/doc/zh_CN/block/chameliumBlock.md @@ -6,3 +6,6 @@ 可以被原版任意染色 +A few pieces of [chamelium](../item/chamelium.md) can be combined to provide a monochrome block for decorative purposes. Chamelium blocks can also be dyed with any of the 16 Minecraft colors. + +Using the Chamelium block as a texture for [3D prints](print.md) provides a clean white surface for applying tints. diff --git a/src/main/resources/assets/opencomputers/doc/zh_CN/block/charger.md b/src/main/resources/assets/opencomputers/doc/zh_CN/block/charger.md index b92f3b82e5..ce2f3941c3 100644 --- a/src/main/resources/assets/opencomputers/doc/zh_CN/block/charger.md +++ b/src/main/resources/assets/opencomputers/doc/zh_CN/block/charger.md @@ -1,13 +1,11 @@ -# 充电机 +# 充电器 ![All right, let's do this.](oredict:oc:charger) -充电机为移动的设备 [机器人](robot.md), [无人机](../item/drone.md) and [平板](../item/tablet.md)充能. 可以被红石激活。 +充电器能为移动的设备 [机器人](robot.md), [无人机](../item/drone.md)和[平板电脑](../item/tablet.md)充能. -充能速度被红石信号强度决定, 15强度最大. +只有当通入红石信号时充电器才会工作！只有当通入红石信号时充电器才会工作！只有当通入红石信号时充电器才会工作！重要的事情要说三遍！！！！！！ -这个逻辑可以被[扳手](../item/wrench.md)反转。 +充能速度由红石信号强度决定, 15强度时达到100%速度. 这个逻辑可以被[扳手](../item/wrench.md)反转. -当一个[平板](../item/tablet.md) 放入充电机后, 第一硬盘[hard drive](../item/hdd1.md) 也会被连接充电机的 [电脑](../general/computer.md)访问到 - -就像[软盘](../item/floppy.md)一样. 这允许在电脑和平板间传送数据。 +当一个[平板](../item/tablet.md) 放入充电器后, 充电器起到磁盘驱动器的作用, 即, 其第一硬盘[hard drive](../item/hdd1.md) 能够被连接充电器的 [电脑](../general/computer.md)访问到. 这允许在电脑和平板间传送数据. \ No newline at end of file diff --git a/src/main/resources/assets/opencomputers/doc/zh_CN/block/disassembler.md b/src/main/resources/assets/opencomputers/doc/zh_CN/block/disassembler.md index 75ed968441..bf49d3750d 100644 --- a/src/main/resources/assets/opencomputers/doc/zh_CN/block/disassembler.md +++ b/src/main/resources/assets/opencomputers/doc/zh_CN/block/disassembler.md @@ -1,7 +1,9 @@ -# 拆解器 +# 拆解机 ![Build it, tear it down.](oredict:oc:disassembler) -可以将大多数电脑拆成零件. 常用来回收不用的零件或者合错的东西，比如没有烧入系统或者程序的机器人 +拆解机可以把OpenComputers里的大多数物件拆成它们的原始部件. 大多数情况下它被用来回收老旧而无用的零件, 或是拆掉用不着或是装错了的设备（比如说忘了往[机器人](robot.md)里装[操作系统](../general/openOS.md)） -这会花费一些时间和能源，也可能被吞配件。 \ No newline at end of file +拆解花费的时间很长, 同时也很吃电. 拆解过程中每个产物有5%的几率损毁. + +将拆解机放在组装机旁边, 拆解的产物会直接弹到组装机里, 这一点在重装机器人的时候很有用. \ No newline at end of file diff --git a/src/main/resources/assets/opencomputers/doc/zh_CN/block/diskDrive.md b/src/main/resources/assets/opencomputers/doc/zh_CN/block/diskDrive.md index 3cada89546..385f2dd78a 100644 --- a/src/main/resources/assets/opencomputers/doc/zh_CN/block/diskDrive.md +++ b/src/main/resources/assets/opencomputers/doc/zh_CN/block/diskDrive.md @@ -2,19 +2,8 @@ ![Going round and round and...](oredict:oc:diskDrive) -用于读取[软盘](../item/floppy.md). 初期很有用，因为低级别的 [机箱](case1.md)没有软盘槽 +软盘驱动器用于读取[软盘](../item/floppy.md). 初期很有用，因为低级别的 [机箱](case1.md)没有内置的软盘槽, 而你需要操作系统如OpenOS，Plan9K，MineOS等，来启动[电脑](../general/computer.md). OpenOS的软盘可以用空[软盘](../item/floppy.md)和一本[OC手册](../item/manual.md)合成. -你还需要操作系统如OpenOS，Plan9K，MineOS等，来启动[电脑](../general/computer.md). +软盘驱动器也可以被安装在机器人[机器人](robot.md)里面来允许插入 [软盘](../item/floppy.md). 如果你没有给机器人装[网卡](../item/lanCard.md)的话, 这就是最有用也是唯一的数据传输方式了（什么？这你也没装？信不信我把你塞进打粉机）. -[OpenOS](../general/openOS.md) 安装盘可以用空的 [软盘](../item/floppy.md) 和[OC手册](../item/manual.md)合成. - -也可以被安装在机器人[robots](robot.md)里面来允许插入 [软盘](../item/floppy.md) - -在没有网卡的时候这是非常有用的数据传输方式了 - -可以 通过shift（蹲） + 右键，可以不打开软驱GUI装卸软盘 -The disk drive can be used to read [floppy disks](../item/floppy.md) using a [computer](../general/computer.md) connected to the disk drive. This is useful to get started, since the lower tier [computer cases](case1.md) do not have a built-in floppy slot, and you'll need an operating system to boot up the [computer](../general/computer.md). An [OpenOS](../general/openOS.md) disk can be crafted using an empty [floppy disk](../item/floppy.md) and a [manual](../item/manual.md). - -It can also be installed in [robots](robot.md) to allow inserting [floppy disks](../item/floppy.md) into the [robot](robot.md). This can be very useful since the only other way to transfer data to and from a robot is using networking - for example using [network cards](../item/lanCard.md). - -[Disks](../item/floppy.md) can be inserted and removed without opening the disk drive's GUI by sneak-activating the disk drive (shift-right click) with the [floppy disk](../item/floppy.md) in hand. +装入或取出[软盘](../item/floppy.md)时你也可以按住Shift右击驱动器, 这样做可以不打开GUI直接插入/拔出[软盘](../item/floppy.md). \ No newline at end of file diff --git a/src/main/resources/assets/opencomputers/doc/zh_CN/block/geolyzer.md b/src/main/resources/assets/opencomputers/doc/zh_CN/block/geolyzer.md index 3d90503f62..44da019bc1 100644 --- a/src/main/resources/assets/opencomputers/doc/zh_CN/block/geolyzer.md +++ b/src/main/resources/assets/opencomputers/doc/zh_CN/block/geolyzer.md @@ -1,6 +1,7 @@ # 地质分析仪 + ![Xray](oredict:oc:geolyzer) 通过分析方块大体的硬度, [电脑](../general/computer.md)使用地质分析仪来扫描分析仪周边的地形. 在为[全息投影仪](hologram1.md)生成周边环境的地图时它会很有用. 此外它也可以用于探测潜在的有价值的方块（矿物一般而言比泥土和石头硬）. 地质分析仪扫描出来的结果有一定的噪音（失真），且随距离增加失真度会越来越高. 理论上, 进行多次扫描（然后求平均值）可以较准确地确定方块的硬度. -地质分析仪也可以作为升级插件装在[机器人](robot.md) and [平板电脑](../item/tablet.md)上, 使得它们能够进行环境扫描. 扫描会消耗能量, 因此过度使用将耗尽它们的能量. \ No newline at end of file +地质分析仪也可以作为升级插件装在[机器人](robot.md)和[平板电脑](../item/tablet.md)上, 使得它们能够做扫描. 扫描会消耗能量, 因此不要过度使用. \ No newline at end of file From 36bbce7f776666d380fb92cb4600034785f48778 Mon Sep 17 00:00:00 2001 From: Rail Engineer #20 <37258405+tongkl1@users.noreply.github.com> Date: Fri, 18 May 2018 17:34:02 +0800 Subject: [PATCH 04/14] Update all the blocks in zh_CN Manual --- .../assets/opencomputers/doc/en_US/index.md | 2 +- .../opencomputers/doc/zh_CN/block/_robot.md | 11 ----- .../doc/zh_CN/block/accessPoint.md | 2 +- .../opencomputers/doc/zh_CN/block/adapter.md | 5 +- .../doc/zh_CN/block/assembler.md | 22 +++------ .../opencomputers/doc/zh_CN/block/cable.md | 7 ++- .../doc/zh_CN/block/capacitor.md | 10 ++-- .../opencomputers/doc/zh_CN/block/case1.md | 48 ++++--------------- .../doc/zh_CN/block/chameliumBlock.md | 8 +--- .../opencomputers/doc/zh_CN/block/charger.md | 2 +- .../doc/zh_CN/block/disassembler.md | 2 +- .../doc/zh_CN/block/diskDrive.md | 4 +- .../opencomputers/doc/zh_CN/block/geolyzer.md | 2 +- .../doc/zh_CN/block/hologram1.md | 2 +- .../opencomputers/doc/zh_CN/block/index.md | 2 +- .../opencomputers/doc/zh_CN/block/keyboard.md | 2 +- .../doc/zh_CN/block/motionSensor.md | 2 +- .../doc/zh_CN/block/powerConverter.md | 2 +- .../doc/zh_CN/block/powerDistributor.md | 2 +- .../opencomputers/doc/zh_CN/block/print.md | 4 +- .../opencomputers/doc/zh_CN/block/printer.md | 2 +- .../opencomputers/doc/zh_CN/block/rack.md | 4 +- .../opencomputers/doc/zh_CN/block/redstone.md | 2 +- .../opencomputers/doc/zh_CN/block/screen1.md | 15 +++--- .../opencomputers/doc/zh_CN/block/switch.md | 2 +- .../opencomputers/doc/zh_CN/block/waypoint.md | 4 +- .../assets/opencomputers/doc/zh_CN/index.md | 3 +- 27 files changed, 53 insertions(+), 120 deletions(-) delete mode 100644 src/main/resources/assets/opencomputers/doc/zh_CN/block/_robot.md diff --git a/src/main/resources/assets/opencomputers/doc/en_US/index.md b/src/main/resources/assets/opencomputers/doc/en_US/index.md index 2a7257acc5..c92e2fca7f 100644 --- a/src/main/resources/assets/opencomputers/doc/en_US/index.md +++ b/src/main/resources/assets/opencomputers/doc/en_US/index.md @@ -1,6 +1,6 @@ # OpenComputers Manual -OpenComputers is a mod that adds persistent, modular, and highly configurable [computers](general/computer.md), [servers](item/server1.md), [robots](block/robot.md), and [drones](item/drone.md) to the game. All devices can be programmed using Lua 5.2, allowing for systems with varying complexity depending on the usage. +OpenComputers is a mod that adds persistent, modular, and highly configurable [computers](general/computer.md), [servers](item/server1.md), [robots](block/robot.md), and [drones](item/drone.md) to the game. All devices can be programmed using Lua 5.3, allowing for systems with varying complexity depending on the usage. To learn about how to use the manual, check out [the page about the manual](item/manual.md) (that green text is a link, you can click it). diff --git a/src/main/resources/assets/opencomputers/doc/zh_CN/block/_robot.md b/src/main/resources/assets/opencomputers/doc/zh_CN/block/_robot.md deleted file mode 100644 index 94688890e1..0000000000 --- a/src/main/resources/assets/opencomputers/doc/zh_CN/block/_robot.md +++ /dev/null @@ -1,11 +0,0 @@ -# Robot -![His name was Tobor.](block:OpenComputers:robot) -和电脑不同 ,机器人可以如同实体那样在地图上移动，但机器人无法和外界组件交互，但！如果要和电脑或者其他机器人通讯,请安装 [无线网卡](../item/wlanCard1.md),或者是通过[红石卡](../item/redstoneCard1.md)收发红石信号建立底层的协议 - -把[任意机箱](case1.md)放进[组装机](assembler.md)就可以制作机器人. -高级的机箱由于有更高级的[CPU](../item/cpu1.md)，可以制造更复杂的机器人. 机器人的复杂度 (显示在 [组装机](assembler.md)GUI) 由槽内安装的组件和升级决定; -高级组件将会大大增加复杂度. 太复杂的情况下, 组装机会选择罢工 -多种升级可以扩展机器人的能力， 包括 [物品栏升级](../item/inventoryUpgrade.md) ， [物品栏控制升级](../item/inventoryControllerUpgrade.md) , [储罐升级](../item/tankUpgrade.md), -[导航升级](../item/navigationUpgrade.md)等等. [升级](../item/upgradeContainer1.md) 和 [卡](../item/cardContainer1.md) 可以被热插拔哦 -[软驱](diskDrive.md) 可以被作为机器人的组件，允许插入[软盘](../item/floppy.md)来安装openOS，当然你可以在组装的时候就丢一块安好系统的硬盘进去。 - \ No newline at end of file diff --git a/src/main/resources/assets/opencomputers/doc/zh_CN/block/accessPoint.md b/src/main/resources/assets/opencomputers/doc/zh_CN/block/accessPoint.md index 20589481a0..482a2c8ac1 100644 --- a/src/main/resources/assets/opencomputers/doc/zh_CN/block/accessPoint.md +++ b/src/main/resources/assets/opencomputers/doc/zh_CN/block/accessPoint.md @@ -2,7 +2,7 @@ ![AAA](oredict:oc:accessPoint) -*本方块是过时的，将会在未来版本被移除 请换用 [中继器](relay.md) 避免丢失 +*本方块已过时, 将会在未来版本被移除 请换用 [中继器](relay.md) 避免丢失 The access point is the wireless version of the [switch](switch.md). It can be used to separate subnetworks so that machines in them will not see [components](../general/computer.md) in other networks, while still allowing to send network messages to the machines in other networks. diff --git a/src/main/resources/assets/opencomputers/doc/zh_CN/block/adapter.md b/src/main/resources/assets/opencomputers/doc/zh_CN/block/adapter.md index a7ed7dd913..6ebdccd064 100644 --- a/src/main/resources/assets/opencomputers/doc/zh_CN/block/adapter.md +++ b/src/main/resources/assets/opencomputers/doc/zh_CN/block/adapter.md @@ -2,7 +2,6 @@ ![Now with 100% more everything.](oredict:oc:adapter) -允许 [电脑](../general/computer.md) 与原版和其他mod的方块交互. 相邻的支持方块将会在连接适配器的 [电脑](../general/computer.md) 显示 +适配器允许[电脑](../general/computer.md)与原版和其他mod的方块交互. 它支持的相邻方块将会在连接适配器的 [电脑](../general/computer.md)上显示. -适配器还有多种选择器升级.比如, the [物品控制器升级](../item/inventoryControllerUpgrade.md) 允许电脑从相邻适配器的方块中获取更详细的物品信息, 就像这个升级呗安装在设备里面一样 (比如[机器人](robot.md) or [无人机](../item/drone.md)), and a [储罐控制器升级](../item/tankControllerUpgrade.md) provides similar functionality for fluid tanks next to the adapter. -你还可以安装[MFU](../item/mfu.md) 来与更远的方块交互 +适配器还有个插槽, 可以插有限的几种升级. 比如, [物品控制器升级](../item/inventoryControllerUpgrade.md)允许电脑从与适配器相邻的方块中获取更详细的物品信息, 就像它安装在其它设备(比如[机器人](robot.md)或[无人机](../item/drone.md))里时一样, [储罐控制器升级](../item/tankControllerUpgrade.md)同理. 此外, 你还可以安装[MFU](../item/mfu.md) 来与更远的方块交互 \ No newline at end of file diff --git a/src/main/resources/assets/opencomputers/doc/zh_CN/block/assembler.md b/src/main/resources/assets/opencomputers/doc/zh_CN/block/assembler.md index 4ee32ca0f7..7f85bdc578 100644 --- a/src/main/resources/assets/opencomputers/doc/zh_CN/block/assembler.md +++ b/src/main/resources/assets/opencomputers/doc/zh_CN/block/assembler.md @@ -1,23 +1,13 @@ -# 组装器 +# 组装机 ![Harder, better, faster, stronger.](oredict:oc:assembler) -组装器用来制作更加复杂的物品, 如 [机器人](robot.md), [无人机](../item/drone.md) 和 [平板](../item/tablet.md). 需要大量能源来组装设备, 推荐使用[电容版](capacitor.md)供电. +组装机用来制作更加复杂的物品, 如 [机器人](robot.md), [无人机](../item/drone.md) 和 [平板电脑](../item/tablet.md). 组装机需要大量能源来组装设备, 因此推荐使用[电容](capacitor.md)供电. -将设备零件放入组装器来组装物品. 对于 [机器人](robot.md),需要 任意[机箱](case1.md) ; 对于[平板](../item/tablet.md), 需要[平板外壳](../item/tabletCase1.md). 像大多数OC物品栏那样, 部件可以被放入任意几个栏; 在物品栏悬停可以指示你有什么东西可以放进去. 有NEI的话，NEI也能显示合适的物品. 添加你希望成品能包含的配件. +制作过程：首先, 将设备的基础零件放入组装机. 对于[机器人](robot.md), 你需要需要放入[机箱](case1.md); 对于[平板](../item/tablet.md), 则需要[平板外壳](../item/tabletCase1.md). 像大多数OC物品栏那样, 部件可以被放入特定的几个槽; 在物品/槽上悬停鼠标, 游戏会高亮能够放进去的槽/物品. 有NEI的话, NEI也能显示合适的物品. 继续添加你希望装进去的配件. 尤其注意别忘了装操作系统, 或者是准备好安装系统的方法(以机器人为例, 你可以装一个[软盘驱动器](diskDrive.md)以便以后插[软盘](../item/floppy.md)). 大多数设备的[EEPROM](../item/eeprom.md)在组装完成后可以更换, 只要把该设备和一张新的[EEPROM](../item/eeprom.md)合成, 设备就会装上它. 原来的[EEPROM](../item/eeprom.md)会退还. -尤其注意你的操作系统, 或者你也可以选择一会再装(你可以为机器人安装[磁盘驱动器](diskDrive.md) 来使用 [软盘](../item/floppy.md) l). 对大多数设备来说 [E2PROM](../item/eeprom.md) 可以被再编程, +注意[机器人](robot.md)也可以装[屏幕](screen1.md). 你可以安装一个[T1屏幕](screen1.md), 否则你的机器人就没有屏幕; 还要安装[键盘](keyboard.md), 除非你不想/需要打字. 对于 [平板](../item/tablet.md), [屏幕](screen1.md)预装在[平板外壳](../item/tabletCase1.md)里面了, 但是你还是要安一个 [键盘](keyboard.md). -插入不同的 [E2PROM](../item/eeprom.md) 后. 已有的 [E2PROM](../item/eeprom.md)会归还到物品栏 +一切就位后, 按下开始, 设备会被组装并和充能. 记住, 组装完成后设备就*无法*修改了, 除非你选择[拆解](disassembler.md)(注意拆解有5%的损耗率). -注意[机器人](robot.md) 也可以有 [屏幕](screen1.md), 你可以安装一个[屏幕 (1级)](screen1.md)，这样可以敲入命令, - -也可以安放 [键盘](keyboard.md). 对于 [平板](../item/tablet.md), [屏幕](screen1.md)在[平板外壳](../item/tabletCase1.md)预装了, - -但是你还是要安一个 [键盘](keyboard.md) - -一切就位后，按下开始，设备会被组装，充能。记住，一旦组装就无法更改了，除非[拆解](disassembler.md)。 - -复杂度: 物品的级别决定了复杂度要求， 一级物品要求2复杂度，二级2，以此类推，箱子升级例外 - -此时复杂度为2倍箱子 (eg: a tier 2 [upgrade containers](../item/upgradeContainer1.md) requires 4 complexity, and likewise for [card containers](../item/cardContainer1.md)). +复杂度: 物件的等级决定了它要多少复杂度. T1物品消耗1复杂度, T2物品2, T3物品3. 插槽升级是个例外, 它消耗的复杂度是级数的两倍(比如说, 一个T2的[升级插槽](../item/upgradeContainer1.md)需要4点复杂度, [扩展卡插槽](../item/cardContainer1.md)同理). 如果复杂度超过了上限, 组装机将拒绝组装. \ No newline at end of file diff --git a/src/main/resources/assets/opencomputers/doc/zh_CN/block/cable.md b/src/main/resources/assets/opencomputers/doc/zh_CN/block/cable.md index 94f4ccf224..d3c426e6a5 100644 --- a/src/main/resources/assets/opencomputers/doc/zh_CN/block/cable.md +++ b/src/main/resources/assets/opencomputers/doc/zh_CN/block/cable.md @@ -2,9 +2,8 @@ ![Salad.](oredict:oc:cable) -连接[电脑](../general/computer.md) 和机器, +连接[电脑](../general/computer.md)和机器. -可以被任意染料染色，之后只和同色或缺省的灰色连接 - -可以有效防止乱走线 +可以被任意染料染色, 染色后的线缆只和同色或默认灰色的线缆连接. 这可以有效提高布线效率而无需覆盖板. +如果必要的话, 线缆支持Forge MultiPart或者Immibis Microblocks的覆盖板. [3D打印制品](print.md)也兼容Forge MultiPart, 所以如果你想的话可以3D打印覆盖板. \ No newline at end of file diff --git a/src/main/resources/assets/opencomputers/doc/zh_CN/block/capacitor.md b/src/main/resources/assets/opencomputers/doc/zh_CN/block/capacitor.md index 0b49ec111d..7bd61b4b43 100644 --- a/src/main/resources/assets/opencomputers/doc/zh_CN/block/capacitor.md +++ b/src/main/resources/assets/opencomputers/doc/zh_CN/block/capacitor.md @@ -2,12 +2,8 @@ ![It's over 9000.](oredict:oc:capacitor) -存储了网络需要的能源, 作为能源缓存.不像那种把其他能源转换过来的mod ([能源转换器](powerConverter.md)), +电容是能源缓存, 存储了网络需要的能源.与那种把其他能源转换过来的mod ([能源转换器](powerConverter.md))不同, 这种网络内的能源传输是即时的. 内部缓存对一些有巨量能需求的任务比较有用, 比如[组装](assembler.md)或者对设备(如[机器人](robot.md), [无人机](../item/drone.md))[充能](charger.md). -这个能源转化是即时的. 内部缓存对一些有大量需求的任务比较有用, 比如[组装](assembler.md) 或者 [充能](charger.md) 设备 如[机器人](robot.md) ， [无人机](../item/drone.md). +电容的存储效率随附近的电容总数递增. 比如说, 两个相邻的电容的存电量比分开的两个多. 所谓“相邻”的判定是2个方块距离, 且效率随着距离递减. -存储效率和附近的电容总数有关. 比如两个相邻的电容总是比分开的两个存的多. - -相邻的判定是2个方块距离, 然后效率随着距离递减. - -可以链接[能源分发器](powerDistributor.md)为网络上的设备供能。 \ No newline at end of file +电容可以连接[能源分配器](powerDistributor.md)为网络上的设备供能. \ No newline at end of file diff --git a/src/main/resources/assets/opencomputers/doc/zh_CN/block/case1.md b/src/main/resources/assets/opencomputers/doc/zh_CN/block/case1.md index 224009cfff..8bfe6718e4 100644 --- a/src/main/resources/assets/opencomputers/doc/zh_CN/block/case1.md +++ b/src/main/resources/assets/opencomputers/doc/zh_CN/block/case1.md @@ -2,15 +2,17 @@ ![Just in case.](oredict:oc:case1) -机箱有数个型号，越大的型号能放的配件越多 +机箱有三个型号, 每个型号对插入的组件有一定限制. T4机箱仅供创造使用. 把机箱放进[组装机](assembler.md)可以制作[机器人](robot.md). -T1的可放配件： +对机箱的任意一个槽, 能插入组件的级别不得超过该槽角落里的罗马数字. 插槽向下兼容, 比方说T2插槽照样可以插T1组件. + +T1机箱的可放配件： - 2X T1扩展卡 (如[显卡](../item/graphicsCard1.md), [网卡](../item/lanCard.md)) - 1x T1 [CPU](../item/cpu1.md) - 2x T1 [内存](../item/ram1.md) - 1x T1 [硬盘](../item/hdd1.md) -T2的可放配件： +T2机箱的可放配件： - 1x T1扩展卡 (如[显卡](../item/graphicsCard1.md), [网卡](../item/lanCard.md)) - 1x T2 扩展卡 - 1x T2 [CPU](../item/cpu2.md) @@ -18,7 +20,7 @@ T2的可放配件： - 1x T1 [硬盘](../item/hdd1.md) - 1x T2 [硬盘](../item/hdd2.md) -T3的可放配件： +T3机箱的可放配件： - 1x T3 扩展卡 (如[显卡](../item/graphicsCard1.md), [网卡](../item/lanCard.md)) - 2x T2 扩展卡 - 1x T3 [CPU](../item/cpu3.md) @@ -27,43 +29,9 @@ T3的可放配件： - 1x T3 [硬盘](../item/hdd3.md) - 1x [软盘](../item/floppy.md) -T4的可放配件： +T4(创造)机箱的可放配件： - 3x T3 扩展卡 (如[显卡](../item/graphicsCard1.md), [网卡](../item/lanCard.md)) - 1x T3 [CPU](../item/cpu3.md) - 2x T3 [内存](../item/ram5.md) - 2xT3 [硬盘](../item/hdd3.md) -- 1x [软盘](../item/floppy.md) - -Computer cases come in three different tiers, which limits the components that can be inserted into them. An additional tier also exists for use in creative mode only. Computer cases can also be placed inside an [assembler](assembler.md) to build [robots](robot.md). - -The maximum tier of the component that can be inserted into any slot of a computer case can be seen as a small roman numeral in the corner of a tier-limited slot. A tier 2 slot can take a tier 1 component, for instance. - -The tier 1 case can house up to and including the following components: -- 2x tier 1 expansion cards (such as [graphics cards](../item/graphicsCard1.md), [network cards](../item/lanCard.md), etc) -- 1x tier 1 [CPU](../item/cpu1.md) -- 2x tier 1 [RAM](../item/ram1.md) -- 1x tier 1 [HDD](../item/hdd1.md) - -The tier 2 case can house up to and including the following components: -- 1x tier 1 Expansion card (such as [graphics cards](../item/graphicsCard1.md), [network cards](../item/lanCard.md), etc) -- 1x tier 2 Expansion card -- 1x tier 2 [CPU](../item/cpu2.md) -- 2x tier 2 [RAM](../item/ram3.md) -- 1x tier 1 [HDD](../item/hdd1.md) -- 1x tier 2 [HDD](../item/hdd2.md) - -The tier 3 case can house up to and including the following components: -- 1x tier 3 Expansion card (such as [graphics cards](../item/graphicsCard1.md), [network cards](../item/lanCard.md), etc) -- 2x tier 2 Expansion card -- 1x tier 3 [CPU](../item/cpu3.md) -- 2x tier 3 [RAM](../item/ram5.md) -- 1x tier 2 [HDD](../item/hdd2.md) -- 1x tier 3 [HDD](../item/hdd3.md) -- 1x [floppy disk](../item/floppy.md) - -The tier 4 (Creative) case can house the following components: -- 3x tier 3 Expansion cards (such as [graphics cards](../item/graphicsCard1.md), [network cards](../item/lanCard.md), etc) -- 1x tier 3 [CPU](../item/cpu3.md) -- 2x tier 3 [RAM](../item/ram5.md) -- 2x tier 3 [HDD](../item/hdd3.md) -- 1x [floppy disk](../item/floppy.md) +- 1x [软盘](../item/floppy.md) \ No newline at end of file diff --git a/src/main/resources/assets/opencomputers/doc/zh_CN/block/chameliumBlock.md b/src/main/resources/assets/opencomputers/doc/zh_CN/block/chameliumBlock.md index 8476207e24..49b87dcdd5 100644 --- a/src/main/resources/assets/opencomputers/doc/zh_CN/block/chameliumBlock.md +++ b/src/main/resources/assets/opencomputers/doc/zh_CN/block/chameliumBlock.md @@ -2,10 +2,6 @@ ![So... blank.](oredict:oc:chameliumBlock) -几篇[印刷电路板](../item/chamelium.md) 可以被变成特殊装饰用途的有色方块. +几片[染色材料](../item/chamelium.md)可以合成特殊装饰用途的单色方块. 染色方块可以用Minecraft原版的16种染料任意染色. -可以被原版任意染色 - -A few pieces of [chamelium](../item/chamelium.md) can be combined to provide a monochrome block for decorative purposes. Chamelium blocks can also be dyed with any of the 16 Minecraft colors. - -Using the Chamelium block as a texture for [3D prints](print.md) provides a clean white surface for applying tints. +从染色方块上为[3D打印制品](print.md)提取的纹理是纯白色的平面, 可用于进一步染色. \ No newline at end of file diff --git a/src/main/resources/assets/opencomputers/doc/zh_CN/block/charger.md b/src/main/resources/assets/opencomputers/doc/zh_CN/block/charger.md index ce2f3941c3..431b46aa99 100644 --- a/src/main/resources/assets/opencomputers/doc/zh_CN/block/charger.md +++ b/src/main/resources/assets/opencomputers/doc/zh_CN/block/charger.md @@ -2,7 +2,7 @@ ![All right, let's do this.](oredict:oc:charger) -充电器能为移动的设备 [机器人](robot.md), [无人机](../item/drone.md)和[平板电脑](../item/tablet.md)充能. +充电器能为移动设备 [机器人](robot.md), [无人机](../item/drone.md)和[平板电脑](../item/tablet.md)充能. 只有当通入红石信号时充电器才会工作！只有当通入红石信号时充电器才会工作！只有当通入红石信号时充电器才会工作！重要的事情要说三遍！！！！！！ diff --git a/src/main/resources/assets/opencomputers/doc/zh_CN/block/disassembler.md b/src/main/resources/assets/opencomputers/doc/zh_CN/block/disassembler.md index bf49d3750d..acfef4579d 100644 --- a/src/main/resources/assets/opencomputers/doc/zh_CN/block/disassembler.md +++ b/src/main/resources/assets/opencomputers/doc/zh_CN/block/disassembler.md @@ -2,7 +2,7 @@ ![Build it, tear it down.](oredict:oc:disassembler) -拆解机可以把OpenComputers里的大多数物件拆成它们的原始部件. 大多数情况下它被用来回收老旧而无用的零件, 或是拆掉用不着或是装错了的设备（比如说忘了往[机器人](robot.md)里装[操作系统](../general/openOS.md)） +拆解机可以把OpenComputers里的大多数物件拆成它们的原始部件. 大多数情况下它被用来回收老旧而无用的零件, 或是拆掉用不着或是装错了的设备(比如说忘了往[机器人](robot.md)里装[操作系统](../general/openOS.md)) 拆解花费的时间很长, 同时也很吃电. 拆解过程中每个产物有5%的几率损毁. diff --git a/src/main/resources/assets/opencomputers/doc/zh_CN/block/diskDrive.md b/src/main/resources/assets/opencomputers/doc/zh_CN/block/diskDrive.md index 385f2dd78a..946cd5a111 100644 --- a/src/main/resources/assets/opencomputers/doc/zh_CN/block/diskDrive.md +++ b/src/main/resources/assets/opencomputers/doc/zh_CN/block/diskDrive.md @@ -2,8 +2,8 @@ ![Going round and round and...](oredict:oc:diskDrive) -软盘驱动器用于读取[软盘](../item/floppy.md). 初期很有用，因为低级别的 [机箱](case1.md)没有内置的软盘槽, 而你需要操作系统如OpenOS，Plan9K，MineOS等，来启动[电脑](../general/computer.md). OpenOS的软盘可以用空[软盘](../item/floppy.md)和一本[OC手册](../item/manual.md)合成. +软盘驱动器用于读取[软盘](../item/floppy.md). 初期很有用, 因为低级别的 [机箱](case1.md)没有内置的软盘槽, 而你需要操作系统如OpenOS, Plan9K, MineOS等, 来启动[电脑](../general/computer.md). OpenOS的软盘可以用空[软盘](../item/floppy.md)和一本[OC手册](../item/manual.md)合成. -软盘驱动器也可以被安装在机器人[机器人](robot.md)里面来允许插入 [软盘](../item/floppy.md). 如果你没有给机器人装[网卡](../item/lanCard.md)的话, 这就是最有用也是唯一的数据传输方式了（什么？这你也没装？信不信我把你塞进打粉机）. +软盘驱动器也可以被安装在机器人[机器人](robot.md)里面来允许插入 [软盘](../item/floppy.md). 如果你没有给机器人装[网卡](../item/lanCard.md)的话, 这就是最有用也是唯一的数据传输方式了(什么？这你也没装？信不信我把你塞进打粉机). 装入或取出[软盘](../item/floppy.md)时你也可以按住Shift右击驱动器, 这样做可以不打开GUI直接插入/拔出[软盘](../item/floppy.md). \ No newline at end of file diff --git a/src/main/resources/assets/opencomputers/doc/zh_CN/block/geolyzer.md b/src/main/resources/assets/opencomputers/doc/zh_CN/block/geolyzer.md index 44da019bc1..50a17581b7 100644 --- a/src/main/resources/assets/opencomputers/doc/zh_CN/block/geolyzer.md +++ b/src/main/resources/assets/opencomputers/doc/zh_CN/block/geolyzer.md @@ -2,6 +2,6 @@ ![Xray](oredict:oc:geolyzer) -通过分析方块大体的硬度, [电脑](../general/computer.md)使用地质分析仪来扫描分析仪周边的地形. 在为[全息投影仪](hologram1.md)生成周边环境的地图时它会很有用. 此外它也可以用于探测潜在的有价值的方块（矿物一般而言比泥土和石头硬）. 地质分析仪扫描出来的结果有一定的噪音（失真），且随距离增加失真度会越来越高. 理论上, 进行多次扫描（然后求平均值）可以较准确地确定方块的硬度. +通过分析方块大体的硬度, [电脑](../general/computer.md)使用地质分析仪来扫描分析仪周边的地形. 在为[全息投影仪](hologram1.md)生成周边环境的地图时它会很有用. 此外它也可以用于探测潜在的有价值的方块(矿物一般而言比泥土和石头硬). 地质分析仪扫描出来的结果有一定的噪音(失真), 且随距离增加失真度会越来越高. 理论上, 进行多次扫描(然后求平均值)可以较准确地确定方块的硬度. 地质分析仪也可以作为升级插件装在[机器人](robot.md)和[平板电脑](../item/tablet.md)上, 使得它们能够做扫描. 扫描会消耗能量, 因此不要过度使用. \ No newline at end of file diff --git a/src/main/resources/assets/opencomputers/doc/zh_CN/block/hologram1.md b/src/main/resources/assets/opencomputers/doc/zh_CN/block/hologram1.md index 1d9d36bc6a..df0699693c 100644 --- a/src/main/resources/assets/opencomputers/doc/zh_CN/block/hologram1.md +++ b/src/main/resources/assets/opencomputers/doc/zh_CN/block/hologram1.md @@ -2,6 +2,6 @@ ![Is this the real life? Is this just fantasy?](oredict:oc:hologram1) -全息投影仪是一种立体显示装置, 可以显示一组三维像素, 这其中的每个立体像素（Voxel）都可以通过与投影仪相连的[电脑](../general/computer.md)单独设置. T2投影仪的分辨率和T1一样, 但是它支持三色显示, 而T1投影仪只支持单色. 三种颜色可以自定义（注：每个投影仪都可以单独设置三种颜色, 因此可以通过放置多个投影仪以显示多种颜色）. +全息投影仪是一种立体显示装置, 可以显示一组三维像素, 这其中的每个立体像素(Voxel)都可以通过与投影仪相连的[电脑](../general/computer.md)单独设置. T2投影仪的分辨率和T1一样, 但是它支持三色显示, 而T1投影仪只支持单色. 三种颜色可以自定义(注：每个投影仪都可以单独设置三种颜色, 因此可以通过放置多个投影仪以显示多种颜色). 用[螺丝刀扳手](../item/wrench.md)右击投影仪底部可以绕y轴旋转全息影像. 这么干可以省得你在软件里累死累活地实现旋转. 全系影像可以被放大或缩小到你想要的比例. \ No newline at end of file diff --git a/src/main/resources/assets/opencomputers/doc/zh_CN/block/index.md b/src/main/resources/assets/opencomputers/doc/zh_CN/block/index.md index 9b76e5cb1c..9563b629c9 100644 --- a/src/main/resources/assets/opencomputers/doc/zh_CN/block/index.md +++ b/src/main/resources/assets/opencomputers/doc/zh_CN/block/index.md @@ -26,7 +26,7 @@ * [地质分析仪](geolyzer.md) * [运动传感器](motionSensor.md) * [红石IO接口](redstone.md) -* [转置器（注：直译）](transposer.md) +* [转置器(注：直译)](transposer.md) * [路径点](waypoint.md) ## 组装 / 打印 diff --git a/src/main/resources/assets/opencomputers/doc/zh_CN/block/keyboard.md b/src/main/resources/assets/opencomputers/doc/zh_CN/block/keyboard.md index 18f585d345..a521d0606c 100644 --- a/src/main/resources/assets/opencomputers/doc/zh_CN/block/keyboard.md +++ b/src/main/resources/assets/opencomputers/doc/zh_CN/block/keyboard.md @@ -4,4 +4,4 @@ 往[显示器](screen1.md)里打字时你需要用到键盘, 不管它们是被放在世界中还是嵌入[机器人](robot.md)或[平板电脑](../item/tablet.md)中. -要想使放置下来的键盘与[显示器](screen1.md)相连, 它必须放在[显示器](screen1.md)旁边且面对着[显示器](screen1.md), 或是直接放在[显示器](screen1.md)上面（管它哪个面）. 如果你点击[显示器](screen1.md), 发现它的GUI可以被打开了, 那就说明这块键盘算是连上去了. \ No newline at end of file +要想使放置下来的键盘与[显示器](screen1.md)相连, 它必须放在[显示器](screen1.md)旁边且面对着[显示器](screen1.md), 或是直接放在[显示器](screen1.md)上面(管它哪个面). 如果你点击[显示器](screen1.md), 发现它的GUI可以被打开了, 那就说明这块键盘算是连上去了. \ No newline at end of file diff --git a/src/main/resources/assets/opencomputers/doc/zh_CN/block/motionSensor.md b/src/main/resources/assets/opencomputers/doc/zh_CN/block/motionSensor.md index 5985a8514d..73d402b79f 100644 --- a/src/main/resources/assets/opencomputers/doc/zh_CN/block/motionSensor.md +++ b/src/main/resources/assets/opencomputers/doc/zh_CN/block/motionSensor.md @@ -2,5 +2,5 @@ ![Don't. Blink.](oredict:oc:motionSensor) -运动传感器允许 [电脑](../general/computer.md)探测生物. 如果生物移速快过阈值，传感器将向连接的[电脑](../general/computer.md)发射信号. 阈值可以在连接的电脑上用组件API调节. +运动传感器允许 [电脑](../general/computer.md)探测生物. 如果生物移速快过阈值, 传感器将向连接的[电脑](../general/computer.md)发射信号. 阈值可以在连接的电脑上用组件API调节. 探测范围8格, 不能有障碍物, 生物走出范围或者与传感器的连线上有障碍都会使得生物无法被探测. \ No newline at end of file diff --git a/src/main/resources/assets/opencomputers/doc/zh_CN/block/powerConverter.md b/src/main/resources/assets/opencomputers/doc/zh_CN/block/powerConverter.md index 8c9bdc6400..3847f0e44e 100644 --- a/src/main/resources/assets/opencomputers/doc/zh_CN/block/powerConverter.md +++ b/src/main/resources/assets/opencomputers/doc/zh_CN/block/powerConverter.md @@ -2,4 +2,4 @@ ![One of us? One of us!](oredict:oc:powerConverter) -能源转换器是最快捷的使用其他mod能源的办法了. 如果只想运行一台电脑，那么你不需要造这个东西。 如果你有一个只是偶尔使用的大电容你也不用做这个方块. 然而如果你想给[装配机](assembler.md) 或者 [充电机](charger.md)这种电老虎直接供电, 这个东西往往比直接连接外部能源要给力. \ No newline at end of file +能源转换器是最快捷的使用其他mod能源的办法了. 如果只想运行一台电脑, 那么你不需要造这个东西. 如果你有一个只是偶尔使用的大电容你也不用做这个方块. 然而如果你想给[装配机](assembler.md) 或者 [充电机](charger.md)这种电老虎直接供电, 这个东西往往比直接连接外部能源要给力. \ No newline at end of file diff --git a/src/main/resources/assets/opencomputers/doc/zh_CN/block/powerDistributor.md b/src/main/resources/assets/opencomputers/doc/zh_CN/block/powerDistributor.md index 4b41882845..0617ea105a 100644 --- a/src/main/resources/assets/opencomputers/doc/zh_CN/block/powerDistributor.md +++ b/src/main/resources/assets/opencomputers/doc/zh_CN/block/powerDistributor.md @@ -3,4 +3,4 @@ ![Power to the masses.](oredict:oc:powerDistributor) 能源分配器能够将一个共享能源池(如[电容](capacitor.md))的能源分配出去, 使得子网络能够在不暴露元件的情况下分享能源 -它的工作原理是不断地平衡子网络中的能量，因此你会发现每个子网的能量供应相对一致（注：相对一致指的是耗能与供能成比例. 假设一个网络耗能是另一个的两倍, 那么能源分配器就会像前一个网络中分配两倍于后者的能量. 这也意味着这些网络往往会同时没电）. \ No newline at end of file +它的工作原理是不断地平衡子网络中的能量, 因此你会发现每个子网的能量供应相对一致(注：相对一致指的是耗能与供能成比例. 假设一个网络耗能是另一个的两倍, 那么能源分配器就会像前一个网络中分配两倍于后者的能量. 这也意味着这些网络往往会同时没电). \ No newline at end of file diff --git a/src/main/resources/assets/opencomputers/doc/zh_CN/block/print.md b/src/main/resources/assets/opencomputers/doc/zh_CN/block/print.md index b97f3e45d0..5073d0d25c 100644 --- a/src/main/resources/assets/opencomputers/doc/zh_CN/block/print.md +++ b/src/main/resources/assets/opencomputers/doc/zh_CN/block/print.md @@ -6,6 +6,6 @@ 可以通过放入 [3D打印机](printer.md)进行回收. 可以重用一点用来打印的 [油墨](../item/chamelium.md). 打印的颜料是不会回收的. -长按shift（默认的OC扩展tip）,将会显示出当前打印制品的激活状态. +长按shift(默认的OC扩展tip),将会显示出当前打印制品的激活状态. -兼容Forge Multipart. 在他们不碰撞，且单个方块的形状数量不超出上限时,可以被放入单个方块的空间，比如火炬，拉杆，线缆等. +兼容Forge Multipart. 在他们不碰撞, 且单个方块的形状数量不超出上限时,可以被放入单个方块的空间, 比如火炬, 拉杆, 线缆等. diff --git a/src/main/resources/assets/opencomputers/doc/zh_CN/block/printer.md b/src/main/resources/assets/opencomputers/doc/zh_CN/block/printer.md index 9f82f57c5e..73f2c96bce 100644 --- a/src/main/resources/assets/opencomputers/doc/zh_CN/block/printer.md +++ b/src/main/resources/assets/opencomputers/doc/zh_CN/block/printer.md @@ -7,7 +7,7 @@ 用OPPM来设置打印机更方便. 一旦安装 (`oppm install oppm`), 确保你有 [因特网卡](../item/internetCard.md),并执行以下命令: `oppm install print3d-examples` -示例将会在 `/usr/share/models/` 以.3dm的扩展名存在. 阅读示例文件以获取打印选项的信息, 尤其是这个 `example.3dm`. 你也可以通过安装了网卡的计算机，用wget从OpenProgram下载`print3d` and `print3d-examples`. +示例将会在 `/usr/share/models/` 以.3dm的扩展名存在. 阅读示例文件以获取打印选项的信息, 尤其是这个 `example.3dm`. 你也可以通过安装了网卡的计算机, 用wget从OpenProgram下载`print3d` and `print3d-examples`. 要打印模型, 需要通过 [电脑](../general/computer.md)配置打印机. 如果设置了循环打印, 开始任务后电脑就可以搬走了. 你还需要提供 [墨盒](../item/inkCartridge.md) , [油墨](../item/chamelium.md) 作为打印材料. 油墨用量和3D打印大小有关, 墨水取决于表面积. diff --git a/src/main/resources/assets/opencomputers/doc/zh_CN/block/rack.md b/src/main/resources/assets/opencomputers/doc/zh_CN/block/rack.md index c54230e029..bf69bf412b 100644 --- a/src/main/resources/assets/opencomputers/doc/zh_CN/block/rack.md +++ b/src/main/resources/assets/opencomputers/doc/zh_CN/block/rack.md @@ -2,7 +2,7 @@ ![Free housing.](oredict:oc:rack) -一个机架可以挂载至多四个可挂载组件, 如[服务器](../item/server1.md), [终端服务器](../item/terminalServer.md) and [挂载硬盘](../item/diskDriveMountable.md). 可挂载组件的连接可以在机架GUI内设置. 特别地, 如果[服务器](../item/server1.md)装了[网卡](../item/lanCard.md)等支持网络的组件, 机架GUI内会有一个"仅网络通信连接"供其使用. 这种连接的线在主连接下面, 比主连接细一点. 它们只传递网络信号, 而主连接在此之上还支持组件控制（注：截至2018/5/15翻译时, 主连接并不能传递网络信号, 文中的"还"应属编写疏忽）. 所有的内部连接都必须是一个可挂载组件/电脑组件与机架的某一面的连接. 如果你想把多个组件连到一起, 请把它们连到同一根总线上. +一个机架可以挂载至多四个可挂载组件, 如[服务器](../item/server1.md), [终端服务器](../item/terminalServer.md) and [挂载硬盘](../item/diskDriveMountable.md). 可挂载组件的连接可以在机架GUI内设置. 特别地, 如果[服务器](../item/server1.md)装了[网卡](../item/lanCard.md)等支持网络的组件, 机架GUI内会有一个"仅网络通信连接"供其使用. 这种连接的线在主连接下面, 比主连接细一点. 它们只传递网络信号, 而主连接在此之上还支持组件控制(注：截至2018/5/15翻译时, 主连接并不能传递网络信号, 文中的"还"应属编写疏忽). 所有的内部连接都必须是一个可挂载组件/电脑组件与机架的某一面的连接. 如果你想把多个组件连到一起, 请把它们连到同一根总线上. 机架同时集成了[中继器](relay.md) and [能源分配器](powerDistributor.md). 可以在其GUI里设置其是否像中继器一样工作. 如果是, 总线间将互相连接. -（注：译者并未弄清此处中继器的功能, 请知情者帮忙补上, 感谢） \ No newline at end of file +(注：译者并未弄清此处中继器的功能, 请知情者帮忙补上, 感谢) \ No newline at end of file diff --git a/src/main/resources/assets/opencomputers/doc/zh_CN/block/redstone.md b/src/main/resources/assets/opencomputers/doc/zh_CN/block/redstone.md index 80deb4126b..6123490c3a 100644 --- a/src/main/resources/assets/opencomputers/doc/zh_CN/block/redstone.md +++ b/src/main/resources/assets/opencomputers/doc/zh_CN/block/redstone.md @@ -6,4 +6,4 @@ 当你调用这个方块的component时你要提供方向, 这时候你要提供全局方向, 比如说`sides.north`, `sides.east`等等. -类似于[红石卡](../item/redstoneCard1.md), 当红石变化的时候，这个方块会向连接的[电脑](../general/computer.md) 发送信号（模拟红石信号或者集束红石信号都可以）. 它也可以唤醒连接的[电脑](../general/computer.md), 只要输入信号超过了自启的阈值. \ No newline at end of file +类似于[红石卡](../item/redstoneCard1.md), 当红石变化的时候, 这个方块会向连接的[电脑](../general/computer.md) 发送信号(模拟红石信号或者集束红石信号都可以). 它也可以唤醒连接的[电脑](../general/computer.md), 只要输入信号超过了自启的阈值. \ No newline at end of file diff --git a/src/main/resources/assets/opencomputers/doc/zh_CN/block/screen1.md b/src/main/resources/assets/opencomputers/doc/zh_CN/block/screen1.md index d632fbdb7d..89d979a809 100644 --- a/src/main/resources/assets/opencomputers/doc/zh_CN/block/screen1.md +++ b/src/main/resources/assets/opencomputers/doc/zh_CN/block/screen1.md @@ -2,20 +2,17 @@ ![See this?](oredict:oc:screen1) -显示器需要和[显卡](../item/graphicsCard1.md)组合使用, 使[电脑](../general/computer.md)能够显示文本.不同型号的屏幕的显示能力不同, 比如说它们有不同的分辨率和色深. 差的显示屏分辨率极低, 只支持单色显示,而高端显示器则支持高分辨率和至多256钟颜色。 +显示器需要和[显卡](../item/graphicsCard1.md)组合使用, 使[电脑](../general/computer.md)能够显示文本.不同型号的屏幕的显示能力不同, 比如说它们有不同的分辨率和色深. 差的显示屏分辨率极低, 只支持单色显示,而高端显示器则支持高分辨率和至多256钟颜色. -可用分辨率取决于显示器和显卡中较差的那个. 当使用[T1显卡](../item/graphicsCard1.md)和[T3显示屏](screen3.md)时, 你将只能使用T1显卡的分辨率和色深, 反之亦然, 但是T3显卡的运行速度会快些（见[显卡](../item/graphicsCard1.md)）. +可用分辨率取决于显示器和显卡中较差的那个. 当使用[T1显卡](../item/graphicsCard1.md)和[T3显示屏](screen3.md)时, 你将只能使用T1显卡的分辨率和色深, 反之亦然, 但是T3显卡的运行速度会快些(见[显卡](../item/graphicsCard1.md)). 屏幕可以相邻放置组成多方块屏幕, 它们的朝向必须一致. 旋转方向也要一致. 手里拿着屏幕时, 可以通过屏幕顶上的箭头确定屏幕旋转方向. 屏幕大小对分辨率无影响. 可以通过染色来控制哪两块屏幕可以连接. 手持染料右键即可, 染料不会消耗. 屏幕在敲下来以后仍然保持颜色. 不同色不会连一起, 同色不同型也不会. -T2和T3屏支持鼠标“触控”. 在屏幕的GUI里右击（只有当[键盘](keyboard.md)连接到屏幕上时才能打开GUI）或是按住Shift右击都可以触发. 如果屏幕上没有[键盘](keyboard.md), 那么你就不需要按住Shift, 直接右击屏幕即可. 注意,按住Shift或是不按, 然后右击屏幕, 触发的操作可以通过与屏幕相连的[电脑](../general/computer.md)控制. T3屏幕甚至可以获取更加精确的点击坐标, 只要从screen组件里开启就可以了. 这样你可以知道你按的是上半个字符还是下半个. 当你用特殊的Unicode字符模拟更高的像素时这可能很有用. +T2和T3屏支持鼠标“触控”. 在屏幕的GUI里右击(只有当[键盘](keyboard.md)连接到屏幕上时才能打开GUI)或是按住Shift右击都可以触发. 如果屏幕上没有[键盘](keyboard.md), 那么你就不需要按住Shift, 直接右击屏幕即可. 注意,按住Shift或是不按, 然后右击屏幕, 触发的操作可以通过与屏幕相连的[电脑](../general/computer.md)控制. T3屏幕甚至可以获取更加精确的点击坐标, 只要从screen组件里开启就可以了. 这样你可以知道你按的是上半个字符还是下半个. 当你用特殊的Unicode字符模拟更高的像素时这可能很有用. 不同等级显示器的分辨率和色深如下： - -T1: 50x16, 单色 - -T2: 80x25, 16色 - -T3: 160x50, 256色 \ No newline at end of file +- T1: 50x16, 单色 +- T2: 80x25, 16色 +- T3: 160x50, 256色 \ No newline at end of file diff --git a/src/main/resources/assets/opencomputers/doc/zh_CN/block/switch.md b/src/main/resources/assets/opencomputers/doc/zh_CN/block/switch.md index da055b4af1..991883588e 100644 --- a/src/main/resources/assets/opencomputers/doc/zh_CN/block/switch.md +++ b/src/main/resources/assets/opencomputers/doc/zh_CN/block/switch.md @@ -2,7 +2,7 @@ ![Building bridges.](oredict:oc:switch) -*本方块过期了，请换用中继器 +*本方块过期了, 请换用中继器 The switch can be used to allow different subnetworks to send network messages to each other, without exposing components to [computers](../general/computer.md) in other networks. Keeping components local is usually a good idea, to avoid [computers](../general/computer.md) using the wrong [screen](screen1.md) or to avoid component overflows to happen (causing [computers](../general/computer.md) to crash and refuse to boot up). diff --git a/src/main/resources/assets/opencomputers/doc/zh_CN/block/waypoint.md b/src/main/resources/assets/opencomputers/doc/zh_CN/block/waypoint.md index 1e391bd174..7857231b34 100644 --- a/src/main/resources/assets/opencomputers/doc/zh_CN/block/waypoint.md +++ b/src/main/resources/assets/opencomputers/doc/zh_CN/block/waypoint.md @@ -4,6 +4,6 @@ 路径点本身没什么用,但可以被其它设备使用. 导航升级可以探测路径点, 因此安装了这种升级的设备就可以通过它导航. 这在对机器人和无人机写高度可重复利用的程序时很有用. -注意：导航升级报告的路径点位置,指的是路径点方块正对着的方块(粒子效果指示的那个方块). 因此你可以把它放在箱子的边上或者上方, 并将路径点视为“箱子上方”,而不必在你的程序里面对路径点的坐标进行修正（如旋转）。 +注意：导航升级报告的路径点位置,指的是路径点方块正对着的方块(粒子效果指示的那个方块). 因此你可以把它放在箱子的边上或者上方, 并将路径点视为“箱子上方”,而不必在你的程序里面对路径点的坐标进行修正(如旋转). -查询路径点时会得到两个属性:一个是它当前收到的红石信号强度, 一个是可编辑的标签（名称）. 标签是一个32字符长的字符串,可以在其GUI里,或是通过waypoint组件进行编辑. 装有导航升级的设备就可以根据这两项属性判断该如何处理它们. 比如,一个物品分拣程序可以将所有高红石电平的路径点看做输入端,而将低电平的看做输出端。 \ No newline at end of file +查询路径点时会得到两个属性:一个是它当前收到的红石信号强度, 一个是可编辑的标签(名称). 标签是一个32字符长的字符串,可以在其GUI里,或是通过waypoint组件进行编辑. 装有导航升级的设备就可以根据这两项属性判断该如何处理它们. 比如,一个物品分拣程序可以将所有高红石电平的路径点看做输入端,而将低电平的看做输出端. \ No newline at end of file diff --git a/src/main/resources/assets/opencomputers/doc/zh_CN/index.md b/src/main/resources/assets/opencomputers/doc/zh_CN/index.md index 637c571de2..10ead9b871 100644 --- a/src/main/resources/assets/opencomputers/doc/zh_CN/index.md +++ b/src/main/resources/assets/opencomputers/doc/zh_CN/index.md @@ -1,8 +1,7 @@ -# OpenComputers Manual +# OpenComputers使用手册 OpenComputers 是一个持久化，模块化，高度可定制化的mod，在游戏中提供了 [电脑](general/computer.md), [服务器](item/server1.md), [机器人](block/robot.md), 和 [无人机](item/drone.md) .所有设备均可通过LUA5.2编写程序, 实现各种复杂的系统. -可能有的地方会因为省略的原因,说话有一点歧义,因为这个mod显示手册的时候,埋藏了操蛋的bug,英文状态下没问题,中文句子一长,这货就卡死了,还是经过几个小时的debug才发现的! 通过 [关于手册](item/manual.md)学习mod (绿字是链接，可点击). From 32dad1601a48e907127b65309dd2f1c285bc1a58 Mon Sep 17 00:00:00 2001 From: Rail Engineer #20 <37258405+tongkl1@users.noreply.github.com> Date: Fri, 18 May 2018 18:24:33 +0800 Subject: [PATCH 05/14] A --- .../assets/opencomputers/doc/zh_CN/index.md | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/src/main/resources/assets/opencomputers/doc/zh_CN/index.md b/src/main/resources/assets/opencomputers/doc/zh_CN/index.md index 10ead9b871..62cab9d1d5 100644 --- a/src/main/resources/assets/opencomputers/doc/zh_CN/index.md +++ b/src/main/resources/assets/opencomputers/doc/zh_CN/index.md @@ -1,9 +1,8 @@ # OpenComputers使用手册 -OpenComputers 是一个持久化，模块化，高度可定制化的mod，在游戏中提供了 [电脑](general/computer.md), [服务器](item/server1.md), [机器人](block/robot.md), 和 [无人机](item/drone.md) .所有设备均可通过LUA5.2编写程序, 实现各种复杂的系统. +OpenComputers这个mod向游戏加入了连续性的(persistent只能这么翻译了QAQ), 模块化的, 高度可定制化的[电脑](general/computer.md), [服务器](item/server1.md), [机器人](block/robot.md), 和[无人机](item/drone.md). 所有设备均可通过LUA 5.3编写程序, 以便根据用途改变系统的复杂程度. - -通过 [关于手册](item/manual.md)学习mod (绿字是链接，可点击). +通过[关于手册](item/manual.md)了解如何使用本手册(绿字是链接, 可点击). ## 内容 @@ -14,11 +13,11 @@ OpenComputers 是一个持久化，模块化，高度可定制化的mod，在游 - [机器人](block/robot.md) - [无人机](item/drone.md) -### 软件和程序编写 +### 软件与编程 - [OpenOS](general/openOS.md) - [Lua](general/lua.md) -### 方块和物品 +### 方块与物品 - [物品](item/index.md) - [方块](block/index.md) @@ -27,12 +26,16 @@ OpenComputers 是一个持久化，模块化，高度可定制化的mod，在游 ## 概要 -如上文所说, 电脑可以持久化的存储自己的状态, 意味着运行的 [电脑](general/computer.md) 即使在所属区块被卸载时也能保持住自己的状态. 也就是说当玩家离开 [电脑](general/computer.md)所在的区块, 或者退出后, [电脑](general/computer.md) 将会记住离开前最后一刻的状态， 并在区块被加载后重新从断电恢复运转[电脑](general/computer.md). 特性 不包括[平板](item/tablet.md). +如上文所说, 电脑的工作是连续性的, 运行中的[电脑](general/computer.md)即使在所属区块被卸载也能保持自己的状态. 也就是说当玩家离开 [电脑](general/computer.md)所在的区块, 或者退出后, [电脑](general/computer.md) 将会记住离开前的状态，并在区块被加载后从断点恢复运转. 这项特性特性对[平板电脑](item/tablet.md)不适用. + +所有的设备都是模块化的，可以用多种组件组装, 正如现实的[电脑](general/computer.md)一般. 喜欢动手的玩家能够不断将他的设备打造成理想的样子. 只要你想，设备甚至可以在不满意的时候被[拆卸](block/disassembler.md)和重组. [电脑](general/computer.md)和[服务器](item/server1.md)的组件可以通过GUI热插拔。 + +OpenComputers的设备与许多mod兼容. 通过[适配器](block/adapter.md), 或是[机器人](block/robot.md)和[无人机](item/drone.md)的某些升级组件, OC可以操控很多方块和实体. OC支持一大堆能量单位, 包括但不限于： RF, EU, MJ, AE2能源, 甚至是因式分解mod的电荷. -所有的设备高度模块化，可以用多种材料制作, 正如现实的 [电脑](general/computer.md) . 善于发现的玩家能够不断将他的设备打造成理想的样子. 只要想，设备甚至在设计不满意的时候可以被 [拆卸](block/disassembler.md) 并重组. 对于 [电脑](general/computer.md) 和 [服务器](item/server1.md), 设备可以被通过GUI热插拔。 +OC的设备各有所长, 但也各有一些限制. [电脑](general/computer.md)是最基本的设备, 也是许多对比的基准. 它能够做到大多数事情, 也可以访问周围6个面的组件. [服务器](item/server1.md) 可以通过 [组件总线](item/componentBus1.md)连接更多的设备 (不论是内部的连接还是外部的), 但是服务器只能被安装在[机架](block/rack.md), 且只能被从[机架](block/rack.md)的一侧被访问到. 从哪一侧访问可以在[机架](block/rack.md)的GUI里设置. [单片机](block/microcontroller.md)功能十分有限, 因为他们不能装[硬盘](item/hdd1.md)和也不能用外置存储([软盘驱动器](block/diskDrive.md)), 这意味着它们无法安装[OpenOS](general/openOS.md). 但[单片机](block/microcontroller.md)有一个装[EEPROM](item/eeprom.md)的槽, 因此可以用一种极其精简的“操作系统”完成有限的工作. -OpenComputers 与多个mod兼容，不论是方块还是实体。(通过 [适配器](block/adapter.md), 或者对 [机器人](block/robot.md) 和 [无人机](item/drone.md)进行适当的升级). 多个mod均可以用来为这些电脑供能, 包括但不限于以下： RF,EU, MJ,AE2能源 甚至是因式分解mod的能量. +[机器人](block/robot.md)是可移动的 [电脑](general/computer.md), 可以与世界交互 (但无法和外部OC方块交互). 不像 [电脑](general/computer.md), [机器人](block/robot.md) 一经建造，内部的部件就不能再被改变或者移除. 为了解决这个问题, [机器人](block/robot.md)可以预装[升级插槽](item/upgradeContainer1.md)或者[扩展卡插槽](item/cardContainer1.md), 以允许热插拔. [OpenOS](general/openOS.md)可以通过装一个[硬盘](block/diskDrive.md)在[机器人](block/robot.md)上安装, 也允许插入 [软盘](item/floppy.md) disks, 或者插入预装了OpenOS的硬盘. 重设机器人需要将机器人[拆解](block/disassembler.md) . [无人机](item/drone.md)是阉割版机器人 [robots](block/robot.md). 他们只有少量物品栏，移动方式也和机器人不同, 像[单片机](block/microcontroller.md)一样安不上操作系统, [无人机](item/drone.md) 可以被插入预编程的 [E2PROM](item/eeprom.md)). 大部分情况下, [机器人](block/robot.md) 和 [无人机](item/drone.md) 使用相同的配件和更新; 然而, 这些东西在无人机和机器人的表现不统一, [物品栏升级](item/inventoryUpgrade.md) 每次只提供四个物品栏, 最多8个, [机器人](block/robot.md) 可以携带最多四个，每个提供16个物品的 [物品栏升级](item/inventoryUpgrade.md) -虽说有些限制，OC mod依然提供了大量的可能性. [电脑](general/computer.md) 是基础, 能够做到大多数事情, CPU是核心. [电脑](general/computer.md) 可以访问周围6个面的组件. [服务器](item/server1.md) 可以通过 [总线](item/componentBus1.md)链接更多设备 (内部或外部互联), ; 但是服务器只能被安装在[机架](block/rack.md), 他只能被从[机架](block/rack.md)的一侧被访问到, 访问的侧可以被从 [机架](block/rack.md) GUI设定. [单片机](block/microcontroller.md) 功能十分受限 (比起普通的[电脑](general/computer.md))， 因为他们只有可怜的存储[硬盘](item/hdd1.md) 和外置存储 [软盘驱动器](block/diskDrive.md) , 意味着通常的 [OpenOS](general/openOS.md) 无法被安装到 [单片机](block/microcontroller.md). [单片机](block/microcontroller.md)只有一个 [E2PROM](item/eeprom.md)槽, 只能被编程为执行有限的简单任务. +[Robots](block/robot.md) are moving [computers](general/computer.md), and are able to interact with the world (but cannot interact with external OpenComputers blocks). Unlike [computers](general/computer.md), once a robot is built, the components inside the [robot](block/robot.md) cannot be removed. To circumvent this limitation, [robots](block/robot.md) may be built with [upgrade](item/upgradeContainer1.md) or [card](item/cardContainer1.md) containers, allowing for on-the-fly swapping of cards or upgrades, if needed. [OpenOS](general/openOS.md) can be installed on [robots](block/robot.md) by placing a [disk drive](block/diskDrive.md) in a container slot, which will allow insertion of [floppy](item/floppy.md) disks, or by placing a [hard drive](item/hdd1.md) with [OpenOS](general/openOS.md) pre-installed in one of the [hard drive](item/hdd1.md) slots. To fully reconfigure a [robot](block/robot.md), it will need to be [disassembled](block/disassembler.md) first. [Drones](item/drone.md) are limited versions of [robots](block/robot.md). They move differently, contain fewer inventory slots, and lack an operating system (similarly to [microcontrollers](block/microcontroller.md), [drones](item/drone.md) can be configured with a programmed [EEPROM](item/eeprom.md) for a limited set of tasks). For the most part, [robots](block/robot.md) and [drones](item/drone.md) share the same upgrades and components; however, upgrades behave differently in [drones](item/drone.md), such as [inventory upgrades](item/inventoryUpgrade.md) only providing 4 slots per upgrade, for a total of 8 slots, while [robots](block/robot.md) are capable of taking more [inventory upgrades](item/inventoryUpgrade.md) (total of 4) as well as getting more slots per upgrade (16 slots per upgrade). -[机器人](block/robot.md) 是移动的 [电脑](general/computer.md), 可以与世界交互 (但无法和外部电脑方块交互).不像 [电脑](general/computer.md), [机器人](block/robot.md) 一经建造，内部的部件就不能再被改变或者去除. 为了解决这个问题, [机器人](block/robot.md) 可以被 [升级](item/upgradeContainer1.md) 或者 [卡片](item/cardContainer1.md) 插入, 允许热升级或者插拔卡片. [OpenOS](general/openOS.md) 可以在 [机器人](block/robot.md) 上面通过放一个[硬盘](block/diskDrive.md) 安装, 也允许插入 [软盘](item/floppy.md) disks, 或者插入预装了OpenOS的硬盘. 重设机器人需要将机器人[拆解](block/disassembler.md) . [无人机](item/drone.md)是阉割版机器人 [robots](block/robot.md). 他们只有少量物品栏，移动方式也和机器人不同, 像[单片机](block/microcontroller.md)一样安不上操作系统, [无人机](item/drone.md) 可以被插入预编程的 [E2PROM](item/eeprom.md)). 大部分情况下, [机器人](block/robot.md) 和 [无人机](item/drone.md) 使用相同的配件和更新; 然而, 这些东西在无人机和机器人的表现不统一, [物品栏升级](item/inventoryUpgrade.md) 每次只提供四个物品栏, 最多8个, [机器人](block/robot.md) 可以携带最多四个，每个提供16个物品的 [物品栏升级](item/inventoryUpgrade.md) +This manual contains detailed information regarding all blocks and items, how to set up different types of systems and devices, as well as an introduction to Lua programming. From 1527983ec4981bf755a9cf8b517b4309a0aeaa54 Mon Sep 17 00:00:00 2001 From: Rail Engineer #20 <37258405+tongkl1@users.noreply.github.com> Date: Sat, 19 May 2018 14:48:10 +0800 Subject: [PATCH 06/14] A --- .../opencomputers/doc/zh_CN/general/computer.md | 11 +++++++---- .../resources/assets/opencomputers/doc/zh_CN/index.md | 6 ++---- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/main/resources/assets/opencomputers/doc/zh_CN/general/computer.md b/src/main/resources/assets/opencomputers/doc/zh_CN/general/computer.md index c506795561..1e9cfa0264 100644 --- a/src/main/resources/assets/opencomputers/doc/zh_CN/general/computer.md +++ b/src/main/resources/assets/opencomputers/doc/zh_CN/general/computer.md @@ -1,9 +1,12 @@ # Computers -电脑通过组合不同的材料， [方块](../block/index.md) 和组件制造. 你最少需要一个机箱，一个屏幕，一块键盘，一个cpu，内存若干，一块E2PROM。 +电脑由几种不同的[方块](../block/index.md)和组件构成. 最最简单的电脑包括一个[机箱](../block/case1.md), 一个[显示器](../block/screen1.md), 以及一块[键盘](../block/keyboard.md). [机箱](../block/case1.md)和[显示器](../block/screen1.md)有多个等级, 每一级的功效都有所不同, 这样的分级也增大了计算机系统的可变性. 为了使[显示器](../block/screen1.md)能被打开, 那块[键盘](../block/keyboard.md)必须紧邻[显示器](../block/screen1.md)(不管是放在显示器前面还是直接贴在上面). -低级别机箱需要一个[软驱]来读[软盘](../item/floppy.md)(../block/diskDrive.md)。 第一次运行需要一个[OpenOS](openOS.md) [软盘](../item/floppy.md)来安装操作系统到[硬盘](../item/hdd1.md)，一旦安装到硬盘，那么软盘就不需要插在机器里面了. 附加软件也经常以软盘形式出现，如开放式电脑包管理器OPPM的软盘就可以从地牢翻出来。 +做完这几件事后, 你就可以往[机箱](../block/case1.md)里塞组件了. 这里说的“组件”包括[CPU](../item/cpu1.md), [内存(RAM)](../item/ram1.md), [硬盘(HDD)](../item/hdd1.md), [图形处理器/显卡](../item/graphicsCard1.md)(用来启用屏幕), [网卡](../item/lanCard.md)(负责网络通信), 等等等等. 这么一大堆组件使得你可以及其灵活地定制用于特定目的的系统. -最后就是要给电脑接电源了，本mod兼容大多数电源，不论是EU还是RF还是什么奇怪的，大部分方块可以被直接供电 -对于大型电脑网络，推荐使用[能源转换器](../block/powerConverter.md)供电，并以[能源分发器](../block/powerDistributor.md)分发 \ No newline at end of file + +Lower tier computers also require a [disk drive](../block/diskDrive.md), which takes a [floppy](../item/floppy.md) disk. An [OpenOS](openOS.md) [floppy](../item/floppy.md) disk is needed for booting up the computer for the first time, and is used to install the operating system to the [HDD](../item/hdd1.md). Once installed to the [HDD](../item/hdd1.md), the [floppy](../item/floppy.md) disk is no longer necessary. Additional software is also available as [floppy](../item/floppy.md) disks (such as Open Programs Package Manager, or OPPM) and are obtained from dungeon loot. + +The final step necessary is to provide the computer with a power source. OpenComputers is compatible with most major power-providing mods, and many blocks can be powered directly. You can see which blocks can be connected to external power by checking if their tooltip contains an entry about the block's power conversion speed. +For a larger network with multiple computers, a [power converter](../block/powerConverter.md) (converts different mod's power to OC's internal Energy type), [power distributor](../block/powerDistributor.md) (distributes power to different computers on the network), and [capacitor](../block/capacitor.md) (power storage for the network) can be used to connect different computers on the network using [cables](../block/cable.md). \ No newline at end of file diff --git a/src/main/resources/assets/opencomputers/doc/zh_CN/index.md b/src/main/resources/assets/opencomputers/doc/zh_CN/index.md index 62cab9d1d5..48c3b10aa8 100644 --- a/src/main/resources/assets/opencomputers/doc/zh_CN/index.md +++ b/src/main/resources/assets/opencomputers/doc/zh_CN/index.md @@ -34,8 +34,6 @@ OpenComputers的设备与许多mod兼容. 通过[适配器](block/adapter.md), OC的设备各有所长, 但也各有一些限制. [电脑](general/computer.md)是最基本的设备, 也是许多对比的基准. 它能够做到大多数事情, 也可以访问周围6个面的组件. [服务器](item/server1.md) 可以通过 [组件总线](item/componentBus1.md)连接更多的设备 (不论是内部的连接还是外部的), 但是服务器只能被安装在[机架](block/rack.md), 且只能被从[机架](block/rack.md)的一侧被访问到. 从哪一侧访问可以在[机架](block/rack.md)的GUI里设置. [单片机](block/microcontroller.md)功能十分有限, 因为他们不能装[硬盘](item/hdd1.md)和也不能用外置存储([软盘驱动器](block/diskDrive.md)), 这意味着它们无法安装[OpenOS](general/openOS.md). 但[单片机](block/microcontroller.md)有一个装[EEPROM](item/eeprom.md)的槽, 因此可以用一种极其精简的“操作系统”完成有限的工作. -[机器人](block/robot.md)是可移动的 [电脑](general/computer.md), 可以与世界交互 (但无法和外部OC方块交互). 不像 [电脑](general/computer.md), [机器人](block/robot.md) 一经建造，内部的部件就不能再被改变或者移除. 为了解决这个问题, [机器人](block/robot.md)可以预装[升级插槽](item/upgradeContainer1.md)或者[扩展卡插槽](item/cardContainer1.md), 以允许热插拔. [OpenOS](general/openOS.md)可以通过装一个[硬盘](block/diskDrive.md)在[机器人](block/robot.md)上安装, 也允许插入 [软盘](item/floppy.md) disks, 或者插入预装了OpenOS的硬盘. 重设机器人需要将机器人[拆解](block/disassembler.md) . [无人机](item/drone.md)是阉割版机器人 [robots](block/robot.md). 他们只有少量物品栏，移动方式也和机器人不同, 像[单片机](block/microcontroller.md)一样安不上操作系统, [无人机](item/drone.md) 可以被插入预编程的 [E2PROM](item/eeprom.md)). 大部分情况下, [机器人](block/robot.md) 和 [无人机](item/drone.md) 使用相同的配件和更新; 然而, 这些东西在无人机和机器人的表现不统一, [物品栏升级](item/inventoryUpgrade.md) 每次只提供四个物品栏, 最多8个, [机器人](block/robot.md) 可以携带最多四个，每个提供16个物品的 [物品栏升级](item/inventoryUpgrade.md) +[机器人](block/robot.md)是可移动的 [电脑](general/computer.md), 可以与世界交互 (但无法和外部OC方块交互). 不像 [电脑](general/computer.md), [机器人](block/robot.md) 一经建造，内部的部件就不能再被改变或者移除. 为了解决这个问题, [机器人](block/robot.md)可以预装[升级插槽](item/upgradeContainer1.md)或者[扩展卡插槽](item/cardContainer1.md), 以允许热插拔. [OpenOS](general/openOS.md)可以通过装入预装了OpenOS的[硬盘](block/diskDrive.md)安装, 也可以装个[软盘驱动器](block/diskDrive.md)以便插入[软盘](item/floppy.md)安装. 重新配置机器人需要将其[拆解](block/disassembler.md) . [无人机](item/drone.md)是阉割版的[机器人](block/robot.md). 他们只有寥寥几个物品栏, 移动方式也和机器人不同, 还像[单片机](block/microcontroller.md)一样安不上操作系统. [无人机](item/drone.md)可以使用预编程的[EEPROM](item/eeprom.md)). 大部分情况下, [机器人](block/robot.md)和[无人机](item/drone.md)使用相同的组件和升级插件; 然而, 这些东西在无人机和机器人的表现不一定一样, 比如, 在无人机上, [物品栏升级](item/inventoryUpgrade.md)每次只提供4个物品栏, 8个封顶, 而[机器人](block/robot.md)上的[物品栏升级](item/inventoryUpgrade.md)则每个提供16个物品栏, 64个封顶. -[Robots](block/robot.md) are moving [computers](general/computer.md), and are able to interact with the world (but cannot interact with external OpenComputers blocks). Unlike [computers](general/computer.md), once a robot is built, the components inside the [robot](block/robot.md) cannot be removed. To circumvent this limitation, [robots](block/robot.md) may be built with [upgrade](item/upgradeContainer1.md) or [card](item/cardContainer1.md) containers, allowing for on-the-fly swapping of cards or upgrades, if needed. [OpenOS](general/openOS.md) can be installed on [robots](block/robot.md) by placing a [disk drive](block/diskDrive.md) in a container slot, which will allow insertion of [floppy](item/floppy.md) disks, or by placing a [hard drive](item/hdd1.md) with [OpenOS](general/openOS.md) pre-installed in one of the [hard drive](item/hdd1.md) slots. To fully reconfigure a [robot](block/robot.md), it will need to be [disassembled](block/disassembler.md) first. [Drones](item/drone.md) are limited versions of [robots](block/robot.md). They move differently, contain fewer inventory slots, and lack an operating system (similarly to [microcontrollers](block/microcontroller.md), [drones](item/drone.md) can be configured with a programmed [EEPROM](item/eeprom.md) for a limited set of tasks). For the most part, [robots](block/robot.md) and [drones](item/drone.md) share the same upgrades and components; however, upgrades behave differently in [drones](item/drone.md), such as [inventory upgrades](item/inventoryUpgrade.md) only providing 4 slots per upgrade, for a total of 8 slots, while [robots](block/robot.md) are capable of taking more [inventory upgrades](item/inventoryUpgrade.md) (total of 4) as well as getting more slots per upgrade (16 slots per upgrade). - -This manual contains detailed information regarding all blocks and items, how to set up different types of systems and devices, as well as an introduction to Lua programming. +本手册包含了本mod一切物品和方块的详细(并不)信息, 以及搭建多种系统的教程. \ No newline at end of file From 4a9618ba623b3ad610cd5e7830253b1dc962ff31 Mon Sep 17 00:00:00 2001 From: Rail Engineer #20 <37258405+tongkl1@users.noreply.github.com> Date: Sat, 19 May 2018 16:34:52 +0800 Subject: [PATCH 07/14] Update computer.md --- .../assets/opencomputers/doc/zh_CN/general/computer.md | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/main/resources/assets/opencomputers/doc/zh_CN/general/computer.md b/src/main/resources/assets/opencomputers/doc/zh_CN/general/computer.md index 1e9cfa0264..24e294cc5e 100644 --- a/src/main/resources/assets/opencomputers/doc/zh_CN/general/computer.md +++ b/src/main/resources/assets/opencomputers/doc/zh_CN/general/computer.md @@ -2,11 +2,10 @@ 电脑由几种不同的[方块](../block/index.md)和组件构成. 最最简单的电脑包括一个[机箱](../block/case1.md), 一个[显示器](../block/screen1.md), 以及一块[键盘](../block/keyboard.md). [机箱](../block/case1.md)和[显示器](../block/screen1.md)有多个等级, 每一级的功效都有所不同, 这样的分级也增大了计算机系统的可变性. 为了使[显示器](../block/screen1.md)能被打开, 那块[键盘](../block/keyboard.md)必须紧邻[显示器](../block/screen1.md)(不管是放在显示器前面还是直接贴在上面). -做完这几件事后, 你就可以往[机箱](../block/case1.md)里塞组件了. 这里说的“组件”包括[CPU](../item/cpu1.md), [内存(RAM)](../item/ram1.md), [硬盘(HDD)](../item/hdd1.md), [图形处理器/显卡](../item/graphicsCard1.md)(用来启用屏幕), [网卡](../item/lanCard.md)(负责网络通信), 等等等等. 这么一大堆组件使得你可以及其灵活地定制用于特定目的的系统. +放下这几个方块后, 你就可以往[机箱](../block/case1.md)里塞组件了. 这里说的“组件”包括[CPU](../item/cpu1.md), [内存(RAM)](../item/ram1.md), [硬盘(HDD)](../item/hdd1.md), [图形处理器/显卡](../item/graphicsCard1.md)(用来启用屏幕), [网卡](../item/lanCard.md)(负责网络通信), 等等等等. 这一堆组件使得你可以及其灵活地定制用于特定目的的系统. +较低级(T1和T2机箱)的电脑还需要一个[软盘驱动器](../block/diskDrive.md)来插[软盘](../item/floppy.md). [OpenOS](openOS.md)[软盘](../item/floppy.md)是首次启动的必备品, 它也能用来在[硬盘](../item/hdd1.md)上装系统. 装完系统后你就可以把软盘扔一边去了. 有的[软盘](../item/floppy.md)可以在地牢里找到, 提供一些额外的软件(比如OPPM, 即Open Programs Package Manager). +最后一部是给电脑供电. OC兼容大多数主流能源, 而且许多方块接上电线就能直接使用. 只要某个物品的标签里显示了能源转化速率, 那个方块就能接受能量. -Lower tier computers also require a [disk drive](../block/diskDrive.md), which takes a [floppy](../item/floppy.md) disk. An [OpenOS](openOS.md) [floppy](../item/floppy.md) disk is needed for booting up the computer for the first time, and is used to install the operating system to the [HDD](../item/hdd1.md). Once installed to the [HDD](../item/hdd1.md), the [floppy](../item/floppy.md) disk is no longer necessary. Additional software is also available as [floppy](../item/floppy.md) disks (such as Open Programs Package Manager, or OPPM) and are obtained from dungeon loot. - -The final step necessary is to provide the computer with a power source. OpenComputers is compatible with most major power-providing mods, and many blocks can be powered directly. You can see which blocks can be connected to external power by checking if their tooltip contains an entry about the block's power conversion speed. -For a larger network with multiple computers, a [power converter](../block/powerConverter.md) (converts different mod's power to OC's internal Energy type), [power distributor](../block/powerDistributor.md) (distributes power to different computers on the network), and [capacitor](../block/capacitor.md) (power storage for the network) can be used to connect different computers on the network using [cables](../block/cable.md). \ No newline at end of file +如果你想要组一个多计算机网络, [能源转换器](../block/powerConverter.md)(专业能源接收装置), [能源分配器](../block/powerDistributor.md)(在多网络间分配能量)和[电容](../block/capacitor.md)(提供少量的能源缓存)会是你的得力助手. 你也需要了解一下[线缆](../block/cable.md), 以连接分隔开的设备. From 43df288e06b12427d9e8eb563cb20cd4858219d3 Mon Sep 17 00:00:00 2001 From: Rail Engineer #20 <37258405+tongkl1@users.noreply.github.com> Date: Sat, 19 May 2018 16:39:16 +0800 Subject: [PATCH 08/14] Update lua.md --- .../resources/assets/opencomputers/doc/zh_CN/general/lua.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/resources/assets/opencomputers/doc/zh_CN/general/lua.md b/src/main/resources/assets/opencomputers/doc/zh_CN/general/lua.md index 9df10cb183..5efa163b6a 100644 --- a/src/main/resources/assets/opencomputers/doc/zh_CN/general/lua.md +++ b/src/main/resources/assets/opencomputers/doc/zh_CN/general/lua.md @@ -1,5 +1,7 @@ # Lua +注：请访问[这里](http://ocdoc.cil.li/)以获取OC中编程的最详细内容. + [LUA编程手册](http://www.lua.org/manual/5.2/manual.html) 和 [LUA编程第一版](http://www.lua.org/pil/) 是学习基本功能并熟悉lua标准库的好帮手. [OpenOS](openOS.md) 尽可能准确的模拟标准库,当然有些许变化，比如某些高权限的debug库去掉了. 这些不同点写在了[这里](http://ocdoc.cil.li/api:non-standard-lua-libs). require命令用来在脚本里引用模块 @@ -10,6 +12,6 @@ require命令用来在脚本里引用模块 `rs.setOutput(require("sides").front, 15)` //将前方的红石信号强度设为15 所有标准库不需要用require引用 -重要：在Lua解释器的环境下请不要用local修饰符（脚本里面没有这个限制），这会在命令完成后将这个变量回收掉，你会发现你得不到任何变量，这是由于mod环境资源有限，不可能随时将库载入内存。 +重要：在Lua解释器的环境下请不要用local修饰符（脚本里面没有这个限制），这会在命令完成后将这个变量回收掉，你会发现你得不到任何变量，这是由于mod环境资源有限，不可能随时将库载入内存. -OpenOS提供了大量第三方库，从控制电脑连接的组件到机器人和无人机，有些库只有在相关卡安装后才能用，也就是说这些组件相当于包含了一个小型的只读文件系统 \ No newline at end of file +OpenOS提供了大量第三方库，从控制电脑连接的组件到机器人和无人机，有些库只有在相关卡安装后才能用，也就是说这些组件相当于包含了一个小型的只读文件系统. From 4711449cf3361602bb64a00674cdbec38d205f13 Mon Sep 17 00:00:00 2001 From: Rail Engineer #20 <37258405+tongkl1@users.noreply.github.com> Date: Sat, 19 May 2018 16:40:23 +0800 Subject: [PATCH 09/14] Update quickstart.md --- .../doc/zh_CN/general/quickstart.md | 57 ++++++++++++++++++- 1 file changed, 56 insertions(+), 1 deletion(-) diff --git a/src/main/resources/assets/opencomputers/doc/zh_CN/general/quickstart.md b/src/main/resources/assets/opencomputers/doc/zh_CN/general/quickstart.md index a76796d0dc..5b548a10e6 100644 --- a/src/main/resources/assets/opencomputers/doc/zh_CN/general/quickstart.md +++ b/src/main/resources/assets/opencomputers/doc/zh_CN/general/quickstart.md @@ -56,4 +56,59 @@ ok,做的很好,现在[机箱](../block/case1.md) 变成这样了: 之后就可以建造更复杂的 [电脑](computer.md), [服务器](../item/server1.md) ,用 [组装机](../block/assembler.md) 组装[机器人](../block/robot.md), [无人机](../item/drone.md), [单片机](../block/microcontroller.md) 和 [平板](../item/tablet.md). -Happy coding! \ No newline at end of file +Happy coding! + + + + + +# Getting Started + +Also know as "how to build your first computer". To get your first [computer](computer.md) to run, you will need to first set it up correctly. There are many different types of computers in OpenComputers, but let's start with the basic one: the standard computer. + +**Disclaimer**: this will be step-by-step, and also provide some information on how to look for issues yourself later on, so this is quite long. If you have never built a computer in real life, and/or are completely new to the mod, it is highly recommended you read through it all. + +First off, you will need a [computer case](../block/case1.md). This is the block which will contain all of the components, defining the behavior of the computer you are building. + +![A tier two computer case.](oredict:oc:case2) + +For example, you will need to choose what tier of [graphics card](../item/graphicsCard1.md) you wish to use, if you need a [network card](../item/lanCard.md), a [redstone card](../item/redstoneCard1.md) or, if you're just playing around in creative mode, maybe even a [debug card](../item/debugCard.md). + +When you open the [computer case](../block/case1.md)'s GUI, you will see a few slots to the right. The number of slots, and what tier of component can be placed into them (indicated by the small roman numeral in the slot) depends on the tier of the case itself. +![GUI of a tier two computer case.](opencomputers:doc/img/configuration_case1.png) +In their empty state, [computer cases](../block/case1.md) are pretty useless. You can try to power up your [computer](computer.md) now, but it'll immediately print an error message to your chat log, and make its dissatisfaction heard by beeping at you. Good thing the error message is telling you what you can do to fix this situation: it requires energy. Connect your [computer](computer.md) to some power, either directly or via a [power converter](../block/powerConverter.md). + +When you try to start it now, it will tell you that you need a [CPU](../item/cpu1.md). These come in different tiers - a trend you will notice is present throughout OpenComputers. For [CPUs](../item/cpu1.md), higher tiers mean more components at a time, as well as faster execution. So pick a tier, and put it in your [computer case](../block/case1.md). + +Next up you will be asked to insert some [memory (RAM)](../item/ram1.md). Notice that the beep code is different now: long-short. Higher tiers of [memory (RAM)](../item/ram1.md) mean more memory available to the programs running on your [computer](computer.md). To run [OpenOS](openOS.md), which is the goal of this introduction, you will want to use at least two tier 1 [memory (RAM)](../item/ram1.md) sticks. + +We're making good progress here. By now your [computer case](../block/case1.md) will look somewhat like this: +![Partially configured computer.](opencomputers:doc/img/configuration_case2.png) +And behold, turning it on now does not print any more error messages! But alas, it still doesn't do much. At least it beeps twice now. That means the actual execution of the [computer](computer.md) failed. In other words: it technically runs! This is where a very useful tool comes into play: the [analyzer](../item/analyzer.md). This tool allows inspecting many of OpenComputers' blocks, as well as some blocks from other mods. To use it on the [computer](computer.md), use the [analyzer](../item/analyzer.md) on the case while sneaking. + +You should now see the error that caused the [computer](computer.md) to crash: +`no bios found; install configured EEPROM` + +The emphasis here is on *configured*. Crafting an [EEPROM](../item/eeprom.md) is pretty simple. To configure it, you will usually use a [computer](computer.md) - but that's a little difficult right now, so we're going to use a recipe to craft a configured "Lua BIOS" [EEPROM](../item/eeprom.md). The standard recipe is an [EEPROM](../item/eeprom.md) plus a [manual](../item/manual.md). Put the configured [EEPROM](../item/eeprom.md) into your [computer](computer.md), aaaand. + +Nope. Still nothing. But we know what to do: player uses [analyzer](../item/analyzer.md), it's super effective! Now we have a different error message: +`no bootable medium found; file not found` + +Well then. That means the BIOS is working. It's just not finding a file system to boot from, such as a [floppy](../item/floppy.md) or [hard drive](../item/hdd1.md). The Lua BIOS in particular expects such a file system to furthermore contain a file named `init.lua` at root level. As with the [EEPROM](../item/eeprom.md), you usually write to file systems using a [computer](computer.md). You probably guessed it: we now need to craft our operating system disk. Take a blank [floppy disk](../item/floppy.md) and a [manual](../item/manual.md), craft them together, and you'll get an [OpenOS](openOS.md) disk. + +Now, if you used a tier 2 [computer case](../block/case2.md) as in the screenshots above, you'll have nowhere to place that floppy. If you have a tier 3 or creative [computer case](../block/case3.md), you can place the floppy right into the [case](../block/case1.md). Otherwise you'll need to place a [disk drive](../block/diskDrive.md) next to your case (or connect it via [cables](../block/cable.md)). Once your disk is in place, you know what to do. Press the power button. + +It lives! Or should, anyway. If it doesn't something went wrong, and you'll want to investigate using the [analyzer](../item/analyzer.md). But assuming it's running now, you're pretty much done. The hardest part is over. All that's left is to make it take input and show some output. + +To allow the [computer](computer.md) to show some output, you'll want to grab a [screen](../block/screen1.md) and a [graphics card](../item/graphicsCard1.md). +![No, it's not a flatscreen.](oredict:oc:screen2) + +Place the [screen](../block/screen1.md) adjacent to your [computer case](../block/case1.md), or, again, connect it using some [cable](../block/cable.md). Then place a [graphics card](../item/graphicsCard1.md) of your choice into the [computer case](../block/case1.md). You should now see a blinking cursor on the [screen](../block/screen1.md). Finally, place a [keyboard](../block/keyboard.md) either on the [screen](../block/screen1.md) itself, or in a way so that it faces the [screen](../block/screen1.md), to enable [keyboard](../block/keyboard.md) input. + +And with that, you're done. The [computer](computer.md) is up and running and ready for action. Try using it now! Type `lua` in the shell and press enter, and you'll be greeted with a bit of information on how to use the Lua interpreter. Here you can test basic Lua commands. For more information this topic see [the Lua page](lua.md). + +![It lives!](opencomputers:doc/img/configuration_done.png) + +Have fun building more complex [computers](computer.md), messing with [servers](../item/server1.md) and assembling [robots](../block/robot.md), [drones](../item/drone.md), [microcontrollers](../block/microcontroller.md) and [tablets](../item/tablet.md) in the [assembler](../block/assembler.md). + +Happy coding! From 26babe3d85c279fb7fd247970d47821137a78721 Mon Sep 17 00:00:00 2001 From: Rail Engineer #20 <37258405+tongkl1@users.noreply.github.com> Date: Sat, 19 May 2018 16:40:46 +0800 Subject: [PATCH 10/14] Update openOS.md From 1298748a4a62d7fe67c18ec791d494f7dddef772 Mon Sep 17 00:00:00 2001 From: Rail Engineer #20 <37258405+tongkl1@users.noreply.github.com> Date: Sat, 19 May 2018 16:48:45 +0800 Subject: [PATCH 11/14] Update quickstart.md --- .../doc/zh_CN/general/quickstart.md | 83 ++++--------------- 1 file changed, 14 insertions(+), 69 deletions(-) diff --git a/src/main/resources/assets/opencomputers/doc/zh_CN/general/quickstart.md b/src/main/resources/assets/opencomputers/doc/zh_CN/general/quickstart.md index 5b548a10e6..bfab58a44c 100644 --- a/src/main/resources/assets/opencomputers/doc/zh_CN/general/quickstart.md +++ b/src/main/resources/assets/opencomputers/doc/zh_CN/general/quickstart.md @@ -1,38 +1,38 @@ # 快速入门 -这篇文章叫做"如何组装第一台电脑". 为了使你的[电脑](computer.md)运作, 你要正确的设定他. 我们有多个档次的电脑, 但我们会从基础档开始. +这篇文章叫做"如何组装第一台电脑". 为了使你的[电脑](computer.md)运作, 你要正确的设定它. 我们有多个档次的电脑, 但我们会从基础档开始. -**Disclaimer**: 这是手把手的教程, 会告诉你后面出现问题要怎么处理, 因此这教程比较长. 如果现实中没有装机经历, 并且你是萌新, 那么请耐心读完. +**免责声明**: 这是手把手的教程, 会告诉你后面出现问题要怎么处理, 因此这教程比较长. 如果现实中没有装机经历, 并且你是萌新, 那么请耐心读完. 首先你需要一个[机箱](../block/case1.md). 这个方块将容纳你的电脑配件, 并定义你电脑的行为. ![A tier two computer case.](oredict:oc:case2) -比如你要挑一个适合你的 [显卡](../item/graphicsCard1.md)(GTX690,GTX1080,划掉), 还可能需要一个[网卡](../item/lanCard.md), 一块 [红石卡](../item/redstoneCard1.md) , 如果你是可以调创造的狗管理你还可以拿出 [调试卡](../item/debugCard.md). +比如你要挑一个适合你的 [显卡](../item/graphicsCard1.md)(~~GTX690,GTX1080~~), 还可能需要一个[网卡](../item/lanCard.md), 一块 [红石卡](../item/redstoneCard1.md) , 如果你是可以调创造的狗管理你还可以拿出[调试卡](../item/debugCard.md). 打开[机箱](../block/case1.md)你会看到一系列的槽位. 上面写了槽位的数量,可以放什么样的配件进去,等 (槽位小字有写),这些数据取决于机箱档次. ![GUI of a tier two computer case.](opencomputers:doc/img/configuration_case1.png) -如果没放东西, [机箱](../block/case1.md)完全没用. 如果你试图按下 [电脑](computer.md)的开机键, 他只会立刻在你的聊天框输出一条错误, 用蜂鸣声提示你. 幸运的是他提醒了你要怎么去做: 电脑需要能源. 把你的电脑接发电机, 或者是接到[能量转换器](../block/powerConverter.md). +如果没放东西, [机箱](../block/case1.md)完全没用. 如果你试图按下 [电脑](computer.md)的开机键, 它只会立刻在你的聊天框输出一条错误, 用蜂鸣声提示你. 幸运的是它提醒了你要怎么去做: 电脑需要能源. 把你的电脑接发电机, 或者是接到[能量转换器](../block/powerConverter.md). -这次启动, 他会告诉你电脑需要 [CPU](../item/cpu1.md). CPU分不同级别,越高级的要越多的东西合成,执行速度也快.选择一款CPU,丢进你的[机箱](../block/case1.md). +这次启动, 它会告诉你电脑需要 [CPU](../item/cpu1.md). CPU分不同级别,越高级的要越多的东西合成,执行速度也快.选择一款CPU,丢进你的[机箱](../block/case1.md). -好的这次他要你放[内存](../item/ram1.md)了 . 注意警报变化了: 长-短. 越高级的 [内存](../item/ram1.md)容量越大,跑的程序越多. 运行 [OpenOS](openOS.md), 这篇教程的目标, 需要至少2条T1 [内存](../item/ram1.md). +好的这次它要你放[内存](../item/ram1.md)了 . 注意警报变化了: 长-短. 越高级的 [内存](../item/ram1.md)容量越大,跑的程序越多. 运行 [OpenOS](openOS.md), 这篇教程的目标, 需要至少2条T1 [内存](../item/ram1.md). -ok,做的很好,现在[机箱](../block/case1.md) 变成这样了: +OK,做的很好,现在[机箱](../block/case1.md) 变成这样了: ![Partially configured computer.](opencomputers:doc/img/configuration_case2.png) -别急, 现在虽然不会打印错误了, 但是他也什么都做不了. 至少他还会发出两声警报. 这意味着电脑进入执行状态,但是未能成功. In other words: it technically runs! This is where a very useful tool comes into play: the [analyzer](../item/analyzer.md). This tool allows inspecting many of OpenComputers' blocks, as well as some blocks from other mods. To use it on the [computer](computer.md), use the [analyzer](../item/analyzer.md) on the case while sneaking. +别急, 现在虽然不会打印错误了, 但是它也什么都做不了. 至少它还会发出两声警报. 这意味着电脑进入执行状态,但是未能成功. 换句话说, 它在技术上算是运行了! 这时候你就可以请出一把神器: [分析器](../item/analyzer.md)! 这个工具能让你了解OC以及一些别的mod中方块的信息. 对电脑使用时请按住Shift右击机箱. 你会在聊天框看到 [电脑](computer.md) 遇到的错误: `no bios found; install configured EEPROM` -这说明:你需要一个刷写过程序的E2PROM芯片,并装入机箱 +这说明:你需要一个刷写过程序的EEPROM芯片,并装入机箱 -注意那个 configured,需要刷一个程序.合成E2PROM很简单,但是刷写程序需要电脑,是不是难了点,这里我们要直接合成一个预刷写LUA BIOS的E2PROM,使用E2PROM和你的手册合成,将这个ROM丢进机箱,开机！ +注意那个 configured,需要刷一个程序.合成EEPROM很简单,但是刷写程序需要电脑,是不是难了点,这里我们要直接合成一个预刷写LUA BIOS的EEPROM,使用EEPROM和你的手册合成,将这个ROM丢进机箱,开机！ 啊哈哈,还是啥都没有,但是我们看到了一条信息 @@ -42,7 +42,7 @@ ok,做的很好,现在[机箱](../block/case1.md) 变成这样了: 嗯,如果你用了T2机箱,那么你还要做一个[软盘驱动器](../block/diskDrive.md)来读盘,如果是T3及以上那么直接放到机箱就行了,如果使用驱动器,那么将驱动器放在电脑边上,插入软盘,启动 -好的,他启动了.如果有什么问题的话,可以使用[分析仪](../item/analyzer.md)排查.不过我们的电脑应该跑起来了. +好的,它启动了.如果有什么问题的话,可以使用[分析仪](../item/analyzer.md)排查.不过我们的电脑应该跑起来了. 最难的部分已经过去了,剩下就是如何让电脑输出信息,并且让电脑接受输入 @@ -50,65 +50,10 @@ ok,做的很好,现在[机箱](../block/case1.md) 变成这样了: ![No, it's not a flatscreen.](oredict:oc:screen2) -之后你就可以看到电脑的输出,然后电脑就会等待你的操作了,尝试一下吧！敲入 'lua' 并按下回车,你将会得到lua交互解释器的帮助(英文),你可以测试基本lua命令,更多信息见[the Lua page](lua.md) +之后你就可以看到电脑的输出,然后电脑就会等待你的操作了,尝试一下吧！敲入 'lua' 并按下回车,你将会得到lua解释器的帮助(英文),你可以测试基本lua命令,更多信息见[the Lua page](lua.md) ![It lives!](opencomputers:doc/img/configuration_done.png) -之后就可以建造更复杂的 [电脑](computer.md), [服务器](../item/server1.md) ,用 [组装机](../block/assembler.md) 组装[机器人](../block/robot.md), [无人机](../item/drone.md), [单片机](../block/microcontroller.md) 和 [平板](../item/tablet.md). +之后就可以建造更复杂的[电脑](computer.md), [服务器](../item/server1.md), 用[组装机](../block/assembler.md)组装[机器人](../block/robot.md), [无人机](../item/drone.md), [单片机](../block/microcontroller.md)和[平板](../item/tablet.md). -Happy coding! - - - - - -# Getting Started - -Also know as "how to build your first computer". To get your first [computer](computer.md) to run, you will need to first set it up correctly. There are many different types of computers in OpenComputers, but let's start with the basic one: the standard computer. - -**Disclaimer**: this will be step-by-step, and also provide some information on how to look for issues yourself later on, so this is quite long. If you have never built a computer in real life, and/or are completely new to the mod, it is highly recommended you read through it all. - -First off, you will need a [computer case](../block/case1.md). This is the block which will contain all of the components, defining the behavior of the computer you are building. - -![A tier two computer case.](oredict:oc:case2) - -For example, you will need to choose what tier of [graphics card](../item/graphicsCard1.md) you wish to use, if you need a [network card](../item/lanCard.md), a [redstone card](../item/redstoneCard1.md) or, if you're just playing around in creative mode, maybe even a [debug card](../item/debugCard.md). - -When you open the [computer case](../block/case1.md)'s GUI, you will see a few slots to the right. The number of slots, and what tier of component can be placed into them (indicated by the small roman numeral in the slot) depends on the tier of the case itself. -![GUI of a tier two computer case.](opencomputers:doc/img/configuration_case1.png) -In their empty state, [computer cases](../block/case1.md) are pretty useless. You can try to power up your [computer](computer.md) now, but it'll immediately print an error message to your chat log, and make its dissatisfaction heard by beeping at you. Good thing the error message is telling you what you can do to fix this situation: it requires energy. Connect your [computer](computer.md) to some power, either directly or via a [power converter](../block/powerConverter.md). - -When you try to start it now, it will tell you that you need a [CPU](../item/cpu1.md). These come in different tiers - a trend you will notice is present throughout OpenComputers. For [CPUs](../item/cpu1.md), higher tiers mean more components at a time, as well as faster execution. So pick a tier, and put it in your [computer case](../block/case1.md). - -Next up you will be asked to insert some [memory (RAM)](../item/ram1.md). Notice that the beep code is different now: long-short. Higher tiers of [memory (RAM)](../item/ram1.md) mean more memory available to the programs running on your [computer](computer.md). To run [OpenOS](openOS.md), which is the goal of this introduction, you will want to use at least two tier 1 [memory (RAM)](../item/ram1.md) sticks. - -We're making good progress here. By now your [computer case](../block/case1.md) will look somewhat like this: -![Partially configured computer.](opencomputers:doc/img/configuration_case2.png) -And behold, turning it on now does not print any more error messages! But alas, it still doesn't do much. At least it beeps twice now. That means the actual execution of the [computer](computer.md) failed. In other words: it technically runs! This is where a very useful tool comes into play: the [analyzer](../item/analyzer.md). This tool allows inspecting many of OpenComputers' blocks, as well as some blocks from other mods. To use it on the [computer](computer.md), use the [analyzer](../item/analyzer.md) on the case while sneaking. - -You should now see the error that caused the [computer](computer.md) to crash: -`no bios found; install configured EEPROM` - -The emphasis here is on *configured*. Crafting an [EEPROM](../item/eeprom.md) is pretty simple. To configure it, you will usually use a [computer](computer.md) - but that's a little difficult right now, so we're going to use a recipe to craft a configured "Lua BIOS" [EEPROM](../item/eeprom.md). The standard recipe is an [EEPROM](../item/eeprom.md) plus a [manual](../item/manual.md). Put the configured [EEPROM](../item/eeprom.md) into your [computer](computer.md), aaaand. - -Nope. Still nothing. But we know what to do: player uses [analyzer](../item/analyzer.md), it's super effective! Now we have a different error message: -`no bootable medium found; file not found` - -Well then. That means the BIOS is working. It's just not finding a file system to boot from, such as a [floppy](../item/floppy.md) or [hard drive](../item/hdd1.md). The Lua BIOS in particular expects such a file system to furthermore contain a file named `init.lua` at root level. As with the [EEPROM](../item/eeprom.md), you usually write to file systems using a [computer](computer.md). You probably guessed it: we now need to craft our operating system disk. Take a blank [floppy disk](../item/floppy.md) and a [manual](../item/manual.md), craft them together, and you'll get an [OpenOS](openOS.md) disk. - -Now, if you used a tier 2 [computer case](../block/case2.md) as in the screenshots above, you'll have nowhere to place that floppy. If you have a tier 3 or creative [computer case](../block/case3.md), you can place the floppy right into the [case](../block/case1.md). Otherwise you'll need to place a [disk drive](../block/diskDrive.md) next to your case (or connect it via [cables](../block/cable.md)). Once your disk is in place, you know what to do. Press the power button. - -It lives! Or should, anyway. If it doesn't something went wrong, and you'll want to investigate using the [analyzer](../item/analyzer.md). But assuming it's running now, you're pretty much done. The hardest part is over. All that's left is to make it take input and show some output. - -To allow the [computer](computer.md) to show some output, you'll want to grab a [screen](../block/screen1.md) and a [graphics card](../item/graphicsCard1.md). -![No, it's not a flatscreen.](oredict:oc:screen2) - -Place the [screen](../block/screen1.md) adjacent to your [computer case](../block/case1.md), or, again, connect it using some [cable](../block/cable.md). Then place a [graphics card](../item/graphicsCard1.md) of your choice into the [computer case](../block/case1.md). You should now see a blinking cursor on the [screen](../block/screen1.md). Finally, place a [keyboard](../block/keyboard.md) either on the [screen](../block/screen1.md) itself, or in a way so that it faces the [screen](../block/screen1.md), to enable [keyboard](../block/keyboard.md) input. - -And with that, you're done. The [computer](computer.md) is up and running and ready for action. Try using it now! Type `lua` in the shell and press enter, and you'll be greeted with a bit of information on how to use the Lua interpreter. Here you can test basic Lua commands. For more information this topic see [the Lua page](lua.md). - -![It lives!](opencomputers:doc/img/configuration_done.png) - -Have fun building more complex [computers](computer.md), messing with [servers](../item/server1.md) and assembling [robots](../block/robot.md), [drones](../item/drone.md), [microcontrollers](../block/microcontroller.md) and [tablets](../item/tablet.md) in the [assembler](../block/assembler.md). - -Happy coding! +祝编程愉快! From 81d7abe0d9dd4c7c86a0266ad45930de9f759418 Mon Sep 17 00:00:00 2001 From: Rail Engineer #20 <37258405+tongkl1@users.noreply.github.com> Date: Sat, 19 May 2018 16:49:57 +0800 Subject: [PATCH 12/14] Update abstractBusCard.md --- .../assets/opencomputers/doc/zh_CN/item/abstractBusCard.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/assets/opencomputers/doc/zh_CN/item/abstractBusCard.md b/src/main/resources/assets/opencomputers/doc/zh_CN/item/abstractBusCard.md index 0d9ad24900..85d52a1694 100644 --- a/src/main/resources/assets/opencomputers/doc/zh_CN/item/abstractBusCard.md +++ b/src/main/resources/assets/opencomputers/doc/zh_CN/item/abstractBusCard.md @@ -2,4 +2,4 @@ ![More networking!](oredict:oc:abstractBusCard) -允许[电脑](../general/computer.md), [服务器](server1.md) and [机器人](../block/robot.md) to interact with StargateTech2's abstract bus. When the card is installed, these blocks will connect to the abstract bus and a component becomes available to the machine that can be used to send messages across the abstract bus. Incoming abstract bus messages are converted to signals that are injected into the machine. +允许[电脑](../general/computer.md), [服务器](server1.md)和[机器人](../block/robot.md)与StargateTech2的抽象总线交互. From b7139268273106d17e9713ea46e24c9711257cfd Mon Sep 17 00:00:00 2001 From: Rail Engineer #20 <37258405+tongkl1@users.noreply.github.com> Date: Sat, 19 May 2018 16:50:20 +0800 Subject: [PATCH 13/14] Update index.md --- src/main/resources/assets/opencomputers/doc/zh_CN/index.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/assets/opencomputers/doc/zh_CN/index.md b/src/main/resources/assets/opencomputers/doc/zh_CN/index.md index 48c3b10aa8..d2d7abb300 100644 --- a/src/main/resources/assets/opencomputers/doc/zh_CN/index.md +++ b/src/main/resources/assets/opencomputers/doc/zh_CN/index.md @@ -1,6 +1,6 @@ # OpenComputers使用手册 -OpenComputers这个mod向游戏加入了连续性的(persistent只能这么翻译了QAQ), 模块化的, 高度可定制化的[电脑](general/computer.md), [服务器](item/server1.md), [机器人](block/robot.md), 和[无人机](item/drone.md). 所有设备均可通过LUA 5.3编写程序, 以便根据用途改变系统的复杂程度. +OpenComputers这个mod向游戏加入了连续性的, 模块化的, 高度可定制化的[电脑](general/computer.md), [服务器](item/server1.md), [机器人](block/robot.md), 和[无人机](item/drone.md). 所有设备均可通过LUA 5.3编写程序, 以便根据用途改变系统的复杂程度. 通过[关于手册](item/manual.md)了解如何使用本手册(绿字是链接, 可点击). @@ -36,4 +36,4 @@ OC的设备各有所长, 但也各有一些限制. [电脑](general/computer.md) [机器人](block/robot.md)是可移动的 [电脑](general/computer.md), 可以与世界交互 (但无法和外部OC方块交互). 不像 [电脑](general/computer.md), [机器人](block/robot.md) 一经建造，内部的部件就不能再被改变或者移除. 为了解决这个问题, [机器人](block/robot.md)可以预装[升级插槽](item/upgradeContainer1.md)或者[扩展卡插槽](item/cardContainer1.md), 以允许热插拔. [OpenOS](general/openOS.md)可以通过装入预装了OpenOS的[硬盘](block/diskDrive.md)安装, 也可以装个[软盘驱动器](block/diskDrive.md)以便插入[软盘](item/floppy.md)安装. 重新配置机器人需要将其[拆解](block/disassembler.md) . [无人机](item/drone.md)是阉割版的[机器人](block/robot.md). 他们只有寥寥几个物品栏, 移动方式也和机器人不同, 还像[单片机](block/microcontroller.md)一样安不上操作系统. [无人机](item/drone.md)可以使用预编程的[EEPROM](item/eeprom.md)). 大部分情况下, [机器人](block/robot.md)和[无人机](item/drone.md)使用相同的组件和升级插件; 然而, 这些东西在无人机和机器人的表现不一定一样, 比如, 在无人机上, [物品栏升级](item/inventoryUpgrade.md)每次只提供4个物品栏, 8个封顶, 而[机器人](block/robot.md)上的[物品栏升级](item/inventoryUpgrade.md)则每个提供16个物品栏, 64个封顶. -本手册包含了本mod一切物品和方块的详细(并不)信息, 以及搭建多种系统的教程. \ No newline at end of file +本手册包含了本mod一切物品和方块的详细(并不)信息, 以及搭建多种系统的教程. From 8836aa7c4213fc1dffec8691a7662c87b0f92b1e Mon Sep 17 00:00:00 2001 From: Rail Engineer #20 <37258405+tongkl1@users.noreply.github.com> Date: Sat, 19 May 2018 18:51:27 +0800 Subject: [PATCH 14/14] Update print.md --- .../assets/opencomputers/doc/zh_CN/block/print.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/resources/assets/opencomputers/doc/zh_CN/block/print.md b/src/main/resources/assets/opencomputers/doc/zh_CN/block/print.md index 5073d0d25c..bba3e34ef7 100644 --- a/src/main/resources/assets/opencomputers/doc/zh_CN/block/print.md +++ b/src/main/resources/assets/opencomputers/doc/zh_CN/block/print.md @@ -2,10 +2,10 @@ ![Any way you want me.](block:OpenComputers:print) -3D打印制品由 [3D打印机](printer.md)制造. 他们主要作为装饰用途出现, 但也可以收发红石信号来扩展出一点点小的功能. +3D打印制品由[3D打印机](printer.md)制造. 他们主要作为装饰方块出现, 但也可以收发红石信号来扩展出一点点小的功能. -可以通过放入 [3D打印机](printer.md)进行回收. 可以重用一点用来打印的 [油墨](../item/chamelium.md). 打印的颜料是不会回收的. +可以通过放入[3D打印机](printer.md)进行回收. 可以重用一点用来打印的[染色材料](../item/chamelium.md). 打印的颜料是不会回收的. -长按shift(默认的OC扩展tip),将会显示出当前打印制品的激活状态. +长按shift(OC默认显示tooltip的按键),将会显示出当前打印制品的激活状态. -兼容Forge Multipart. 在他们不碰撞, 且单个方块的形状数量不超出上限时,可以被放入单个方块的空间, 比如火炬, 拉杆, 线缆等. +3D打印制品兼容Forge Multipart. 只要碰撞箱不重叠, 且单个方块的形状数量不超出上限, 它们可以与其它方块共用一格空间, 比如火炬, 拉杆, 线缆等.