Florian Nücke 05408976d4 Merge branch 'master' of cil.li:oc
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
2013-12-01 00:56:05 +01:00
Description
Home of the OpenComputers mod for Minecraft.
MIT 122 MiB
Languages
Scala 64.4%
Lua 20.6%
Java 14.9%
Roff 0.1%