diff --git a/assets/opencomputers/lang/de_DE.lang b/assets/opencomputers/lang/de_DE.lang index 22456455b..e69770360 100644 --- a/assets/opencomputers/lang/de_DE.lang +++ b/assets/opencomputers/lang/de_DE.lang @@ -19,36 +19,36 @@ oc:block.ScreenProfessional.name=Professioneller Bildschirm # Items oc:item.Analyzer.name=Messgerät +oc:item.ArithmeticLogicUnit.name=Arithmetisch-logische Einheit (ALU) +oc:item.ArrowKeys.name=Pfeiltasten +oc:item.ButtonGroup.name=Tastengruppe +oc:item.CircuitBoard.name=Basis Platte +oc:item.ControlUnit.name=Steuerwerk (CU) +oc:item.CPU.name=Hauptprozessor (CPU) oc:item.Crafting.name=Crafting +oc:item.CuttingWire.name=Schneidedraht oc:item.Disk.name=Diskette oc:item.Generator.name=Generator oc:item.GraphicsCardAdvanced.name=Hochwertige Grafikkarte oc:item.GraphicsCardBasic.name=Einfache Grafikkarte oc:item.GraphicsCardProfessional.name=Professionelle Grafikkarte oc:item.HardDiskDrive.name=Festplatte +oc:item.IronNugget.name=Eisennugget oc:item.Memory.name=Speicher oc:item.NetworkCard.name=Netzwerkkarte -oc:item.RedstoneCard.name=Redstonekarte -oc:item.WirelessNetworkCard.name=Drahtlosnetzwerkkarte -oc:item.IronNugget.name=Eisennugget -oc:item.RawCircuitBoard.name=Rohe Basis Platte -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.PrintedCircuitBoard.name=Leiterplatte (PCB) +oc:item.RawCircuitBoard.name=Rohe Basis Platte +oc:item.RedstoneCard.name=Redstonekarte 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) +oc:item.WirelessNetworkCard.name=Drahtlosnetzwerkkarte # GUI oc:gui.Analyzer.Address=Adresse oc:gui.Analyzer.ComponentName=Komponentenname oc:gui.Analyzer.LastError=Letzter Fehler -oc:gui.Analyzer.RobotOwner=Besitzer oc:gui.Analyzer.RobotName=Name +oc:gui.Analyzer.RobotOwner=Besitzer oc:gui.Analyzer.StoredEnergy=Gespeicherte Energie oc:gui.Analyzer.TotalEnergy=Insgesamt gespeicherte Energie oc:gui.Robot.Power=Energie diff --git a/assets/opencomputers/lang/en_US.lang b/assets/opencomputers/lang/en_US.lang index c747775d5..0d3d02921 100644 --- a/assets/opencomputers/lang/en_US.lang +++ b/assets/opencomputers/lang/en_US.lang @@ -23,36 +23,36 @@ oc:block.ScreenProfessional.name=Professional Screen # Items oc:item.Analyzer.name=Analyzer +oc:item.ArithmeticLogicUnit.name=Arithmetic Logic Unit (ALU) +oc:item.ArrowKeys.name=Arrow Keys +oc:item.ButtonGroup.name=Button Group +oc:item.CircuitBoard.name=Circuit Board +oc:item.ControlUnit.name=Control Unit (CU) +oc:item.CPU.name=Central Processing Unit (CPU) oc:item.Crafting.name=Crafting +oc:item.CuttingWire.name=Cutting Wire oc:item.Disk.name=Floppy Disk oc:item.Generator.name=Generator oc:item.GraphicsCardAdvanced.name=Advanced Graphics Card oc:item.GraphicsCardBasic.name=Basic Graphics Card oc:item.GraphicsCardProfessional.name=Professional Graphics Card oc:item.HardDiskDrive.name=Hard Disk Drive +oc:item.IronNugget.name=Iron Nugget oc:item.Memory.name=Memory oc:item.NetworkCard.name=Network Card -oc:item.RedstoneCard.name=Redstone Card -oc:item.WirelessNetworkCard.name=Wireless Network Card -oc:item.IronNugget.name=Iron Nugget -oc:item.RawCircuitBoard.name=Raw Circuit Board -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.PrintedCircuitBoard.name=Printed Circuit Board (PCB) +oc:item.RawCircuitBoard.name=Raw Circuit Board +oc:item.RedstoneCard.name=Redstone Card 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) +oc:item.WirelessNetworkCard.name=Wireless Network Card # GUI oc:gui.Analyzer.Address=Address oc:gui.Analyzer.ComponentName=Component name oc:gui.Analyzer.LastError=Last error -oc:gui.Analyzer.RobotOwner=Owner oc:gui.Analyzer.RobotName=Name +oc:gui.Analyzer.RobotOwner=Owner oc:gui.Analyzer.StoredEnergy=Stored energy oc:gui.Analyzer.TotalEnergy=Total stored energy oc:gui.Robot.Power=Power diff --git a/assets/opencomputers/textures/items/pcb.png b/assets/opencomputers/textures/items/pcb.png new file mode 100644 index 000000000..a2998cfca Binary files /dev/null and b/assets/opencomputers/textures/items/pcb.png differ diff --git a/li/cil/oc/common/item/PrintedCircuitBoard.scala b/li/cil/oc/common/item/PrintedCircuitBoard.scala index 9356f45ee..4a139492e 100644 --- a/li/cil/oc/common/item/PrintedCircuitBoard.scala +++ b/li/cil/oc/common/item/PrintedCircuitBoard.scala @@ -1,6 +1,14 @@ package li.cil.oc.common.item +import li.cil.oc.Settings +import net.minecraft.client.renderer.texture.IconRegister -class PrintedCircuitBoard (val parent: Delegator) extends Delegate { +class PrintedCircuitBoard(val parent: Delegator) extends Delegate { val unlocalizedName = "PrintedCircuitBoard" + + override def registerIcons(iconRegister: IconRegister) { + super.registerIcons(iconRegister) + + icon = iconRegister.registerIcon(Settings.resourceDomain + ":pcb") + } }