tree ee907122a336492c18a9019becfc9e710b1badf7
parent 40fc4fe051dc9c87907d30e5ec4447872bda5fc6
parent 4e8971111b64e1664965f85976fcdbf12c766dff
author Florian Nücke <florian@nuecke.de> 1410446072 +0200
committer Florian Nücke <florian@nuecke.de> 1410446072 +0200

Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10

Conflicts:
	src/main/scala/li/cil/oc/client/gui/DynamicGuiContainer.scala
	src/main/scala/li/cil/oc/server/component/UpgradeCrafting.scala