AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-16 10:51:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of cil.li:oc

Browse Source
This commit is contained in:
Johannes Lohrer 2013-12-01 01:40:18 +01:00
commit 21fa5ba6a1
4 changed files with 35 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,36 +19,36 @@ oc:block.ScreenProfessional.name=Professioneller Bildschirm
# Items # Items
oc:item.Analyzer.name=Messgerät 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.Crafting.name=Crafting
oc:item.CuttingWire.name=Schneidedraht
oc:item.Disk.name=Diskette oc:item.Disk.name=Diskette
oc:item.Generator.name=Generator oc:item.Generator.name=Generator
oc:item.GraphicsCardAdvanced.name=Hochwertige Grafikkarte oc:item.GraphicsCardAdvanced.name=Hochwertige Grafikkarte
oc:item.GraphicsCardBasic.name=Einfache Grafikkarte oc:item.GraphicsCardBasic.name=Einfache Grafikkarte
oc:item.GraphicsCardProfessional.name=Professionelle Grafikkarte oc:item.GraphicsCardProfessional.name=Professionelle Grafikkarte
oc:item.HardDiskDrive.name=Festplatte oc:item.HardDiskDrive.name=Festplatte
oc:item.IronNugget.name=Eisennugget
oc:item.Memory.name=Speicher oc:item.Memory.name=Speicher
oc:item.NetworkCard.name=Netzwerkkarte 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.NumPad.name=Ziffernblock
oc:item.ArrowKeys.name=Pfeiltasten oc:item.PrintedCircuitBoard.name=Leiterplatte (PCB)
oc:item.CuttingWire.name=Schneidedraht oc:item.RawCircuitBoard.name=Rohe Basis Platte
oc:item.ButtonGroup.name=Tastengruppe oc:item.RedstoneCard.name=Redstonekarte
oc:item.Transistor.name=Transistor oc:item.Transistor.name=Transistor
oc:item.ArithmeticLogicUnit.name=Arithmetisch-logische Einheit (ALU) oc:item.WirelessNetworkCard.name=Drahtlosnetzwerkkarte
oc:item.ControlUnit.name=Steuerwerk (CU)
oc:item.CPU.name=Hauptprozessor (CPU)
# GUI # GUI
oc:gui.Analyzer.Address=Adresse oc:gui.Analyzer.Address=Adresse
oc:gui.Analyzer.ComponentName=Komponentenname oc:gui.Analyzer.ComponentName=Komponentenname
oc:gui.Analyzer.LastError=Letzter Fehler oc:gui.Analyzer.LastError=Letzter Fehler
oc:gui.Analyzer.RobotOwner=Besitzer
oc:gui.Analyzer.RobotName=Name oc:gui.Analyzer.RobotName=Name
oc:gui.Analyzer.RobotOwner=Besitzer
oc:gui.Analyzer.StoredEnergy=Gespeicherte Energie oc:gui.Analyzer.StoredEnergy=Gespeicherte Energie
oc:gui.Analyzer.TotalEnergy=Insgesamt gespeicherte Energie oc:gui.Analyzer.TotalEnergy=Insgesamt gespeicherte Energie
oc:gui.Robot.Power=Energie oc:gui.Robot.Power=Energie

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

@ -23,36 +23,36 @@ oc:block.ScreenProfessional.name=Professional Screen
# Items # Items
oc:item.Analyzer.name=Analyzer 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.Crafting.name=Crafting
oc:item.CuttingWire.name=Cutting Wire
oc:item.Disk.name=Floppy Disk oc:item.Disk.name=Floppy Disk
oc:item.Generator.name=Generator oc:item.Generator.name=Generator
oc:item.GraphicsCardAdvanced.name=Advanced Graphics Card oc:item.GraphicsCardAdvanced.name=Advanced Graphics Card
oc:item.GraphicsCardBasic.name=Basic Graphics Card oc:item.GraphicsCardBasic.name=Basic Graphics Card
oc:item.GraphicsCardProfessional.name=Professional Graphics Card oc:item.GraphicsCardProfessional.name=Professional Graphics Card
oc:item.HardDiskDrive.name=Hard Disk Drive oc:item.HardDiskDrive.name=Hard Disk Drive
oc:item.IronNugget.name=Iron Nugget
oc:item.Memory.name=Memory oc:item.Memory.name=Memory
oc:item.NetworkCard.name=Network Card 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.NumPad.name=Numeric Keypad
oc:item.ArrowKeys.name=Arrow Keys oc:item.PrintedCircuitBoard.name=Printed Circuit Board (PCB)
oc:item.CuttingWire.name=Cutting Wire oc:item.RawCircuitBoard.name=Raw Circuit Board
oc:item.ButtonGroup.name=Button Group oc:item.RedstoneCard.name=Redstone Card
oc:item.Transistor.name=Transistor oc:item.Transistor.name=Transistor
oc:item.ArithmeticLogicUnit.name=Arithmetic Logic Unit (ALU) oc:item.WirelessNetworkCard.name=Wireless Network Card
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
oc:gui.Analyzer.ComponentName=Component name oc:gui.Analyzer.ComponentName=Component name
oc:gui.Analyzer.LastError=Last error oc:gui.Analyzer.LastError=Last error
oc:gui.Analyzer.RobotOwner=Owner
oc:gui.Analyzer.RobotName=Name oc:gui.Analyzer.RobotName=Name
oc:gui.Analyzer.RobotOwner=Owner
oc:gui.Analyzer.StoredEnergy=Stored energy oc:gui.Analyzer.StoredEnergy=Stored energy
oc:gui.Analyzer.TotalEnergy=Total stored energy oc:gui.Analyzer.TotalEnergy=Total stored energy
oc:gui.Robot.Power=Power oc:gui.Robot.Power=Power

BIN
assets/opencomputers/textures/items/pcb.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 330 B

8
li/cil/oc/common/item/PrintedCircuitBoard.scala
View File

@ -1,6 +1,14 @@
package li.cil.oc.common.item 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" val unlocalizedName = "PrintedCircuitBoard"
override def registerIcons(iconRegister: IconRegister) {
super.registerIcons(iconRegister)
icon = iconRegister.registerIcon(Settings.resourceDomain + ":pcb")
}
} }