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

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

Browse Source 
Conflicts:
	build.properties
This commit is contained in:
Florian Nücke 2014-07-25 11:33:18 +02:00
commit c2ac9aca38
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.properties
View File

@ -1,7 +1,7 @@
minecraft.version=1.7.10 minecraft.version=1.7.10
forge.version=10.13.0.1180 forge.version=10.13.0.1180
oc.version=1.3.2 oc.version=1.3.2
oc.subversion=dev oc.subversion=
cc.mc.version=1.7.10 cc.mc.version=1.7.10
ccl.version=1.1.1.95 ccl.version=1.1.1.95
fmp.version=1.1.0.299 fmp.version=1.1.0.299

2
src/main/scala/li/cil/oc/common/item/Tablet.scala
View File

@ -21,6 +21,8 @@ import net.minecraft.world.World
import net.minecraftforge.event.world.WorldEvent import net.minecraftforge.event.world.WorldEvent
class Tablet(val parent: Delegator) extends Delegate { class Tablet(val parent: Delegator) extends Delegate {
showInItemList = false // Hide in release builds.
override def maxStackSize = 1 override def maxStackSize = 1
override def update(stack: ItemStack, world: World, player: Entity, slot: Int, selected: Boolean) = override def update(stack: ItemStack, world: World, player: Entity, slot: Int, selected: Boolean) =