AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-17 03:05:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of cil.li:oc

Browse Source 
Conflicts:
	li/cil/oc/common/item/ButtonGroup.scala
	li/cil/oc/common/item/IronCutter.scala
	li/cil/oc/common/item/Platine.scala
	li/cil/oc/common/item/PlatineBody.scala
This commit is contained in:
Florian Nücke 2013-12-01 00:56:05 +01:00
commit 05408976d4
11 changed files with 46 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
assets/opencomputers/lang/de_DE.lang
View File

@ -31,6 +31,16 @@ oc:item.NetworkCard.name=Netzwerkkarte
oc:item.RedstoneCard.name=Redstonekarte oc:item.RedstoneCard.name=Redstonekarte
oc:item.WirelessNetworkCard.name=Drahtlosnetzwerkkarte oc:item.WirelessNetworkCard.name=Drahtlosnetzwerkkarte
oc:item.IronNugget.name=Eisennugget oc:item.IronNugget.name=Eisennugget
oc:item.CircuitBoard.name=Basis Platte
oc:item.PrintedCircuitBoard.name=Leiterplatte (PCB)
oc:item.NumPad.name=Ziffernblock
oc:item.ArrowKeys.name=Pfeiltasten
oc:item.CuttingWire.name=Schneidedraht
oc:item.ButtonGroup.name=Tastengruppe
oc:item.Transistor.name=Transistor
oc:item.ArithmeticLogicUnit.name=Arithmetisch-logische Einheit (ALU)
oc:item.ControlUnit.name=Steuerwerk (CU)
oc:item.CPU.name=Hauptprozessor (CPU)
# GUI # GUI
oc:gui.Analyzer.Address=Adresse oc:gui.Analyzer.Address=Adresse

10
assets/opencomputers/lang/en_US.lang
View File

@ -35,6 +35,16 @@ oc:item.NetworkCard.name=Network Card
oc:item.RedstoneCard.name=Redstone Card oc:item.RedstoneCard.name=Redstone Card
oc:item.WirelessNetworkCard.name=Wireless Network Card oc:item.WirelessNetworkCard.name=Wireless Network Card
oc:item.IronNugget.name=Iron Nugget oc:item.IronNugget.name=Iron Nugget
oc:item.CircuitBoard.name=Circuit Board
oc:item.PrintedCircuitBoard.name=Printed Circuit Board(PCB)
oc:item.NumPad.name=Numeric Keypad
oc:item.ArrowKeys.name=Arrow Keys
oc:item.CuttingWire.name=Cutting Wire
oc:item.ButtonGroup.name=Button Group
oc:item.Transistor.name=Transistor
oc:item.ArithmeticLogicUnit.name=Arithmetic Logic Unit (ALU)
oc:item.ControlUnit.name=Control Unit (CU)
oc:item.CPU.name=Central Processing Unit (CPU)
# GUI # GUI
oc:gui.Analyzer.Address=Address oc:gui.Analyzer.Address=Address

12
li/cil/oc/Items.scala
View File

@ -36,9 +36,9 @@ object Items {
// ----------------------------------------------------------------------- // // ----------------------------------------------------------------------- //
// Crafting // Crafting
var card1, card2, card3: item.Card = null var card1, card2, card3: item.Card = null
var circuitBoardBody: item.PlatineBody = null var circuitBoardBody: item.CircuitBoard = null
var circuitBoard: item.Platine = null var circuitBoard: item.PrintedCircuitBoard = null
var ironCutter: item.IronCutter = null var ironCutter: item.CuttingWire = null
var chip1, chip2, chip3: item.Chip = null var chip1, chip2, chip3: item.Chip = null
var numPad: item.NumPad = null var numPad: item.NumPad = null
var arrowKeys: item.ArrowKeys = null var arrowKeys: item.ArrowKeys = null
@ -76,9 +76,9 @@ object Items {
card1 = new item.Card(multi, 0) card1 = new item.Card(multi, 0)
card2 = new item.Card(multi, 1) card2 = new item.Card(multi, 1)
card3 = new item.Card(multi, 2) card3 = new item.Card(multi, 2)
circuitBoardBody = new item.PlatineBody(multi) circuitBoardBody = new item.CircuitBoard(multi)
circuitBoard = new item.Platine(multi) circuitBoard = new item.PrintedCircuitBoard(multi)
ironCutter = new item.IronCutter(multi) ironCutter = new item.CuttingWire(multi)
chip1 = new item.Chip(multi, 0) chip1 = new item.Chip(multi, 0)

2
li/cil/oc/common/item/Alu.scala
View File

@ -4,7 +4,7 @@ import li.cil.oc.Settings
import net.minecraft.client.renderer.texture.IconRegister import net.minecraft.client.renderer.texture.IconRegister
class ALU(val parent: Delegator) extends Delegate { class ALU(val parent: Delegator) extends Delegate {
val unlocalizedName = "ALU" val unlocalizedName = "ArithmeticLogicUnit"
override def registerIcons(iconRegister: IconRegister) { override def registerIcons(iconRegister: IconRegister) {
super.registerIcons(iconRegister) super.registerIcons(iconRegister)

6
li/cil/oc/common/item/CircuitBoard.scala Normal file
View File

@ -0,0 +1,6 @@
package li.cil.oc.common.item
class CircuitBoard (val parent: Delegator) extends Delegate {
val unlocalizedName = "CircuitBoard"
}

2
li/cil/oc/common/item/ControlUnit.scala
View File

@ -4,7 +4,7 @@ import li.cil.oc.Settings
import net.minecraft.client.renderer.texture.IconRegister import net.minecraft.client.renderer.texture.IconRegister
class ControlUnit(val parent: Delegator) extends Delegate { class ControlUnit(val parent: Delegator) extends Delegate {
val unlocalizedName = "CU" val unlocalizedName = "ControlUnit"
override def registerIcons(iconRegister: IconRegister) { override def registerIcons(iconRegister: IconRegister) {
super.registerIcons(iconRegister) super.registerIcons(iconRegister)

6
li/cil/oc/common/item/CuttingWire.scala Normal file
View File

@ -0,0 +1,6 @@
package li.cil.oc.common.item
class CuttingWire (val parent: Delegator) extends Delegate {
val unlocalizedName = "CuttingWire"
}

5
li/cil/oc/common/item/IronCutter.scala
View File

@ -1,5 +0,0 @@
package li.cil.oc.common.item
class IronCutter(val parent: Delegator) extends Delegate {
val unlocalizedName = "IronCutter"
}

5
li/cil/oc/common/item/Platine.scala
View File

@ -1,5 +0,0 @@
package li.cil.oc.common.item
class Platine(val parent: Delegator) extends Delegate {
val unlocalizedName = "Platine"
}

5
li/cil/oc/common/item/PlatineBody.scala
View File

@ -1,5 +0,0 @@
package li.cil.oc.common.item
class PlatineBody(val parent: Delegator) extends Delegate {
val unlocalizedName = "PlatineBody"
}

6
li/cil/oc/common/item/PrintedCircuitBoard.scala Normal file
View File

@ -0,0 +1,6 @@
package li.cil.oc.common.item
class PrintedCircuitBoard (val parent: Delegator) extends Delegate {
val unlocalizedName = "PrintedCircuitBoard"
}