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

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

Browse Source
This commit is contained in:
Florian Nücke 2015-02-13 17:45:00 +01:00
commit 7e08bd26ab
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/scala/li/cil/oc/common/init/Items.scala
View File

@ -228,7 +228,7 @@ object Items extends ItemAPI {
data.containers = Array( data.containers = Array(
get("cardContainer3").createItemStack(1), get("cardContainer3").createItemStack(1),
get("upgradeContainer3").createItemStack(1), get("upgradeContainer3").createItemStack(1),
get("upgradeContainer3").createItemStack(1) get("diskDrive").createItemStack(1)
) )
val stack = get("robot").createItemStack(1) val stack = get("robot").createItemStack(1)
@ -262,6 +262,7 @@ object Items extends ItemAPI {
Option(createOpenOS()), Option(createOpenOS()),
Option(get("hdd3").createItemStack(1)) Option(get("hdd3").createItemStack(1))
) )
data.container = Option(get("diskDrive").createItemStack(1))
val stack = get("tablet").createItemStack(1) val stack = get("tablet").createItemStack(1)
data.save(stack) data.save(stack)