From f68aea962ede8646512142402e41a882de22da2d Mon Sep 17 00:00:00 2001 From: Rashdan Date: Wed, 8 Apr 2015 12:35:51 -0700 Subject: [PATCH 1/4] Added Computer.md summary --- .../resources/assets/opencomputers/doc/en_US/Computer.md | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 src/main/resources/assets/opencomputers/doc/en_US/Computer.md diff --git a/src/main/resources/assets/opencomputers/doc/en_US/Computer.md b/src/main/resources/assets/opencomputers/doc/en_US/Computer.md new file mode 100644 index 000000000..a41f8602b --- /dev/null +++ b/src/main/resources/assets/opencomputers/doc/en_US/Computer.md @@ -0,0 +1,9 @@ +# Computers + +Computers are built using a variety of different blocks and components. The bare minimum needed to build a computer is a Case, Screen, and Keyboard. The Case and Screen are available in different Tiers providing different functionality and allowing for more complex Computer systems. In order for the Screen to be accessible, the Keyboard must be placed adjacent to the Screen (either on the sides or directly in front of the Screen). + +Once the basic structure is built, Components can be placed inside the Case. These Components include CPUs, Memory, Hard Disk Drives, Graphics Cards (to be able to use the Screen), Network Cards (for communication between Computer networks), etc. There are many components available allowing for highly flexible systems designed for specific purposes. + +Lower Tier Computers also require a Disk Drive, which takes a Floppy Disk. An OpenOS Floppy Disk is needed for booting up the Computer for the first time, and is used to install the Operating System to the Hard Disk Drive. Once installed to the Hard Disk Drive, the Floppy Disk is no longer necessary. Additional software is also available as Floppy 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 all types of Power-providing mods, and will connect directly to them. For a larger network with multiple Computers, a Power Converter (converts different mod's power to OC's internal Energy type), Power Distributor (distributes power to different Computers), and Capacitor (power storage for the network) can be used to connect different Computers on the network using Cables. \ No newline at end of file From 2f4a3cd9a7131149bb4fb5d27596711bacc290b7 Mon Sep 17 00:00:00 2001 From: Rashdan Date: Wed, 8 Apr 2015 12:59:02 -0700 Subject: [PATCH 2/4] Added some internal links --- .../resources/assets/opencomputers/doc/en_US/Computer.md | 9 --------- .../assets/opencomputers/doc/en_US/abstractBusCard.md | 2 +- .../resources/assets/opencomputers/doc/en_US/case1.md | 9 ++++----- .../resources/assets/opencomputers/doc/en_US/computer.md | 9 +++++++++ 4 files changed, 14 insertions(+), 15 deletions(-) delete mode 100644 src/main/resources/assets/opencomputers/doc/en_US/Computer.md create mode 100644 src/main/resources/assets/opencomputers/doc/en_US/computer.md diff --git a/src/main/resources/assets/opencomputers/doc/en_US/Computer.md b/src/main/resources/assets/opencomputers/doc/en_US/Computer.md deleted file mode 100644 index a41f8602b..000000000 --- a/src/main/resources/assets/opencomputers/doc/en_US/Computer.md +++ /dev/null @@ -1,9 +0,0 @@ -# Computers - -Computers are built using a variety of different blocks and components. The bare minimum needed to build a computer is a Case, Screen, and Keyboard. The Case and Screen are available in different Tiers providing different functionality and allowing for more complex Computer systems. In order for the Screen to be accessible, the Keyboard must be placed adjacent to the Screen (either on the sides or directly in front of the Screen). - -Once the basic structure is built, Components can be placed inside the Case. These Components include CPUs, Memory, Hard Disk Drives, Graphics Cards (to be able to use the Screen), Network Cards (for communication between Computer networks), etc. There are many components available allowing for highly flexible systems designed for specific purposes. - -Lower Tier Computers also require a Disk Drive, which takes a Floppy Disk. An OpenOS Floppy Disk is needed for booting up the Computer for the first time, and is used to install the Operating System to the Hard Disk Drive. Once installed to the Hard Disk Drive, the Floppy Disk is no longer necessary. Additional software is also available as Floppy 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 all types of Power-providing mods, and will connect directly to them. For a larger network with multiple Computers, a Power Converter (converts different mod's power to OC's internal Energy type), Power Distributor (distributes power to different Computers), and Capacitor (power storage for the network) can be used to connect different Computers on the network using Cables. \ No newline at end of file diff --git a/src/main/resources/assets/opencomputers/doc/en_US/abstractBusCard.md b/src/main/resources/assets/opencomputers/doc/en_US/abstractBusCard.md index d87ee3479..ae760882c 100644 --- a/src/main/resources/assets/opencomputers/doc/en_US/abstractBusCard.md +++ b/src/main/resources/assets/opencomputers/doc/en_US/abstractBusCard.md @@ -2,4 +2,4 @@ ![More networking!](oredict:oc:abstractBusCard) -This card allows computers, servers and robots 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. +This card allows [computers](Computer.md), [servers](server.md) and robots 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. diff --git a/src/main/resources/assets/opencomputers/doc/en_US/case1.md b/src/main/resources/assets/opencomputers/doc/en_US/case1.md index ed5c9dc61..acefa1c72 100644 --- a/src/main/resources/assets/opencomputers/doc/en_US/case1.md +++ b/src/main/resources/assets/opencomputers/doc/en_US/case1.md @@ -4,13 +4,12 @@ The Computer Case is the most basic computer you can build, and usually what you'll get started with. The different tiers of computers have a different layout of slots available for parts, as well as increasing level of supported component tier (indicated by the roman numeral in applicable slots). -To get a running computer you'll need to install a [CPU](cpu1.md) and some [Memory (RAM)](ram1.md) in a computer case. You'll usually also want to install a [Graphics Card](graphicsCard1.md) to be able to display text on a connected [screen](screen1.md), and a [Hard Drive](hdd1.md) to install an operating system on (after booting from an OS floppy from an external [Disk Drive](diskDrive.md) for the first time, for example). +To get a running computer you'll need to install a [CPU](cpu1.md) and some [memory (RAM)](ram1.md) in a computer case. You'll usually also want to install a [graphics card](graphicsCard1.md) to be able to display text on a connected [screen](screen1.md), and a [hard disk drive (HDD)](hdd1.md) to install an operating system on (after booting from an OS floppy from an external [disk drive](diskDrive.md) for the first time, for example). -Computers can be upgraded using several different cards. For example, using a [Redstone Card] -(redstoneCard1.md) computers are able to read and emit redstone signals. Using [Network Cards](lanCard.md) they can send and receive network messages, allowing them to communicate with other computers. +Computers can be upgraded using several different cards. For example, using a [redstone card](redstoneCard1.md) computers are able to read and emit redstone signals. Using [network cards](lanCard.md) they can send and receive network messages, allowing them to communicate with other computers. -If a computer stops working / crashes, try using the [Analyzer](analyzer.md) tool on it (sneak-activate) to see the error message that caused the computer to stop. +If a computer stops working / crashes, try using the [analyzer](analyzer.md) tool on it (sneak-activate) to see the error message that caused the computer to stop. Computer cases can be dyed using any dye. This is purely for aesthetic reasons, and has no practical implications. -Computer cases also serve as the base part when building [robots](robot.md) in the [Assembler](assembler.md). The different tiers determine the available slots for building the robot. When using a creative case, the robot will also provide itself with power, as does the normal creative case. +Computer cases also serve as the base part when building [robots](robot.md) in the [assembler](assembler.md). The different tiers determine the available slots for building the robot. When using a creative case, the robot will also provide itself with power, as does the normal creative case. diff --git a/src/main/resources/assets/opencomputers/doc/en_US/computer.md b/src/main/resources/assets/opencomputers/doc/en_US/computer.md new file mode 100644 index 000000000..f0ce9e6a4 --- /dev/null +++ b/src/main/resources/assets/opencomputers/doc/en_US/computer.md @@ -0,0 +1,9 @@ +# Computers + +Computers are built using a variety of different blocks and components. The bare minimum needed to build a computer is a [case](case1.md), [screen](screen1.md), and [keyboard](keyboard.md). The Case and Screen are available in different Tiers providing different functionality and allowing for more complex Computer systems. In order for the Screen to be accessible, the Keyboard must be placed adjacent to the Screen (either on the sides or directly in front of the Screen). + +Once the basic structure is built, Components can be placed inside the [case](case1.md). These Components include [CPUs](cpu1.md), [memory (RAM)](ram1.md), [hard disk drives (HDD)](hdd1.md), [graphics cards](gpu1.md) (to be able to use the [screen](screen1.md)), [network cards](lanCard.md) (for communication between Computer networks), etc. There are many components available allowing for highly flexible systems designed for specific purposes. + +Lower Tier Computers also require a [disk drive](diskDrive.md), which takes a [floppy](floppy.md) disk. An OpenOS [floppy](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](hdd1.md). Once installed to the [HDD](hdd1.md), the [floppy](floppy.md) disk is no longer necessary. Additional software is also available as [floppy](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 all types of Power-providing mods, and will connect directly to them. For a larger network with multiple Computers, a [Power Converter](powerConverter.md) (converts different mod's power to OC's internal Energy type), [Power Distributor](powerDistributor.md) (distributes power to different Computers), and [Capacitor](capacitor.md) (power storage for the network) can be used to connect different Computers on the network using Cables. \ No newline at end of file From 9a047348edaa8dd1e5a0cd739acf85652d9f64ea Mon Sep 17 00:00:00 2001 From: Rashdan Date: Wed, 8 Apr 2015 13:23:17 -0700 Subject: [PATCH 3/4] Added some more links, modified case1.md for specific Case info --- .../opencomputers/doc/en_US/accessPoint.md | 2 +- .../assets/opencomputers/doc/en_US/adapter.md | 4 +-- .../opencomputers/doc/en_US/analyzer.md | 2 +- .../assets/opencomputers/doc/en_US/case1.md | 34 +++++++++++++++---- .../opencomputers/doc/en_US/computer.md | 2 +- 5 files changed, 32 insertions(+), 12 deletions(-) diff --git a/src/main/resources/assets/opencomputers/doc/en_US/accessPoint.md b/src/main/resources/assets/opencomputers/doc/en_US/accessPoint.md index dd173cf59..f154d2a7b 100644 --- a/src/main/resources/assets/opencomputers/doc/en_US/accessPoint.md +++ b/src/main/resources/assets/opencomputers/doc/en_US/accessPoint.md @@ -2,7 +2,7 @@ ![AAA](oredict:oc:accessPoint) -The Access Point is the wireless version of the [switch block](switch.md). It can be used to separate subnetworks so that machines in them will not see components in other networks, while still allowing to send network messages to the machines in other networks. +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 in other networks, while still allowing to send network messages to the machines in other networks. In addition to that, this block will resend any wired messages it receives as wireless ones, wireless messages it receives as wired messages, and repeat wireless messages as wireless ones. diff --git a/src/main/resources/assets/opencomputers/doc/en_US/adapter.md b/src/main/resources/assets/opencomputers/doc/en_US/adapter.md index 2149f36aa..aa18f6a62 100644 --- a/src/main/resources/assets/opencomputers/doc/en_US/adapter.md +++ b/src/main/resources/assets/opencomputers/doc/en_US/adapter.md @@ -2,6 +2,6 @@ ![Now with 100% more everything.](oredict:oc:adapter) -The Adapter allows computers to interact with a number of blocks that are not part of OpenComputers, such as blocks from Minecraft itself (like the Furnace) and from a number of other mods. Supported blocks adjacent to the adapter will show up as components in [computers](case1.md) connected to the adapter. +The Adapter allows computers to interact with a number of blocks that are not part of OpenComputers, such as blocks from Minecraft itself (like the Furnace) and from a number of other mods. Supported blocks adjacent to the adapter will show up as components in [computers](computer.md) connected to the adapter. -In addition to this, the adapter provides a slot for a few select upgrades. For example, the [Inventory Controller Upgrade](inventoryControllerUpgrade.md) allows computers to query more information from an inventory adjacent to the adapter, similar to when the upgrade is installed in a device, and a [Tank Controller Upgrade](tankControllerUpgrade.md) provides similar functionality for fluid tanks next to the adapter. +In addition to this, the adapter provides a slot for a few select upgrades. For example, the [inventory controller upgrade](inventoryControllerUpgrade.md) allows computers to query more information from an inventory adjacent to the adapter, similar to when the upgrade is installed in a device (such as a [robot](robot.md) or [drone](drone.md)), and a [tank controller upgrade](tankControllerUpgrade.md) provides similar functionality for fluid tanks next to the adapter. diff --git a/src/main/resources/assets/opencomputers/doc/en_US/analyzer.md b/src/main/resources/assets/opencomputers/doc/en_US/analyzer.md index 413f23512..c353372e5 100644 --- a/src/main/resources/assets/opencomputers/doc/en_US/analyzer.md +++ b/src/main/resources/assets/opencomputers/doc/en_US/analyzer.md @@ -4,4 +4,4 @@ The Analyzer is a handy tool for getting some information about OpenComputers-related blocks in the world. Simply (sneak-)activate a block to get some information printed to the chat. This ranges from basic things like the address of components, to power levels in the subnetwork the block is in, and information on the error lead to a computer to crash, for example. -Another useful functionality is that when using the using the analyzer on a block while holding down [Ctrl] the address of the block component will be copied to the clipboard. +Another useful functionality is that when using the using the analyzer on a block while holding down **Ctrl** the address of the block component will be copied to the clipboard. This information can then be pasted into a [computer](computer.md) terminal if necessary. \ No newline at end of file diff --git a/src/main/resources/assets/opencomputers/doc/en_US/case1.md b/src/main/resources/assets/opencomputers/doc/en_US/case1.md index acefa1c72..814d55779 100644 --- a/src/main/resources/assets/opencomputers/doc/en_US/case1.md +++ b/src/main/resources/assets/opencomputers/doc/en_US/case1.md @@ -2,14 +2,34 @@ ![Just in case.](oredict:oc:case1) -The Computer Case is the most basic computer you can build, and usually what you'll get started with. The different tiers of computers have a different layout of slots available for parts, as well as increasing level of supported component tier (indicated by the roman numeral in applicable slots). +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). -To get a running computer you'll need to install a [CPU](cpu1.md) and some [memory (RAM)](ram1.md) in a computer case. You'll usually also want to install a [graphics card](graphicsCard1.md) to be able to display text on a connected [screen](screen1.md), and a [hard disk drive (HDD)](hdd1.md) to install an operating system on (after booting from an OS floppy from an external [disk drive](diskDrive.md) for the first time, for example). +The Tier 1 Case can house up to and including the following components: +- 2x Tier 1 Expansion Cards (such as [graphics cards](gpu1.md), [network cards](lanCard.md), etc) +- 1x Tier 1 [CPU](cpu1.md) +- 2x Tier 1 [RAM](ram1.md) +- 1x Tier 1 [HDD](hdd1.md) -Computers can be upgraded using several different cards. For example, using a [redstone card](redstoneCard1.md) computers are able to read and emit redstone signals. Using [network cards](lanCard.md) they can send and receive network messages, allowing them to communicate with other computers. +The Tier 2 Case can house up to and including the following components: +- 1x Tier 1 Expansion Card (such as [graphics cards](gpu1.md), [network cards](lanCard.md), etc) +- 1x Tier 2 Expansion Card +- 1x Tier 2 [CPU](cpu1.md) +- 2x Tier 2 [RAM](ram1.md) +- 1x Tier 1 [HDD](hdd1.md) +- 1x Tier 2 [HDD](hdd1.md) -If a computer stops working / crashes, try using the [analyzer](analyzer.md) tool on it (sneak-activate) to see the error message that caused the computer to stop. +The Tier 3 Case can house up to and including the following components: +- 1x Tier 3 Expansion Card (such as [graphics cards](gpu1.md), [network cards](lanCard.md), etc) +- 2x Tier 2 Expansion Card +- 1x Tier 3 [CPU](cpu1.md) +- 2x Tier 3 [RAM](ram1.md) +- 1x Tier 2 [HDD](hdd1.md) +- 1x Tier 3 [HDD](hdd1.md) +- 1x [floppy disk](floppy.md) -Computer cases can be dyed using any dye. This is purely for aesthetic reasons, and has no practical implications. - -Computer cases also serve as the base part when building [robots](robot.md) in the [assembler](assembler.md). The different tiers determine the available slots for building the robot. When using a creative case, the robot will also provide itself with power, as does the normal creative case. +The Tier 4 (Creative) Case can house the following components: +- 3x Tier 3 Expansion Cards (such as [graphics cards](gpu1.md), [network cards](lanCard.md), etc) +- 1x Tier 3 [CPU](cpu1.md) +- 2x Tier 3 [RAM](ram1.md) +- 2x Tier 3 [HDD](hdd1.md) +- 1x [floppy disk](floppy.md) \ No newline at end of file diff --git a/src/main/resources/assets/opencomputers/doc/en_US/computer.md b/src/main/resources/assets/opencomputers/doc/en_US/computer.md index f0ce9e6a4..283f27f3c 100644 --- a/src/main/resources/assets/opencomputers/doc/en_US/computer.md +++ b/src/main/resources/assets/opencomputers/doc/en_US/computer.md @@ -6,4 +6,4 @@ Once the basic structure is built, Components can be placed inside the [case](ca Lower Tier Computers also require a [disk drive](diskDrive.md), which takes a [floppy](floppy.md) disk. An OpenOS [floppy](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](hdd1.md). Once installed to the [HDD](hdd1.md), the [floppy](floppy.md) disk is no longer necessary. Additional software is also available as [floppy](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 all types of Power-providing mods, and will connect directly to them. For a larger network with multiple Computers, a [Power Converter](powerConverter.md) (converts different mod's power to OC's internal Energy type), [Power Distributor](powerDistributor.md) (distributes power to different Computers), and [Capacitor](capacitor.md) (power storage for the network) can be used to connect different Computers on the network using Cables. \ No newline at end of file +The final step necessary is to provide the Computer with a Power Source. OpenComputers is compatible with all types of Power-providing mods, and will connect directly to them. For a larger network with multiple Computers, a [power converter](powerConverter.md) (converts different mod's power to OC's internal Energy type), [power distributor](powerDistributor.md) (distributes power to different Computers), and [capacitor](capacitor.md) (power storage for the network) can be used to connect different Computers on the network using Cables. \ No newline at end of file From 3257a285f6fc5152ceab5c21a7b51cf022355aee Mon Sep 17 00:00:00 2001 From: Rashdan Date: Wed, 8 Apr 2015 13:36:16 -0700 Subject: [PATCH 4/4] Modified case1.md --- src/main/resources/assets/opencomputers/doc/en_US/case1.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/assets/opencomputers/doc/en_US/case1.md b/src/main/resources/assets/opencomputers/doc/en_US/case1.md index 814d55779..1557b3288 100644 --- a/src/main/resources/assets/opencomputers/doc/en_US/case1.md +++ b/src/main/resources/assets/opencomputers/doc/en_US/case1.md @@ -2,7 +2,7 @@ ![Just in case.](oredict:oc:case1) -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). +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 Tier 1 Case can house up to and including the following components: - 2x Tier 1 Expansion Cards (such as [graphics cards](gpu1.md), [network cards](lanCard.md), etc)