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

# Conflicts:
#	build.properties
This commit is contained in:
Florian Nücke 2016-05-25 18:19:00 +02:00
commit dd973ae1ab
5 changed files with 16 additions and 9 deletions

View File

@ -30,7 +30,7 @@ gc.version=3.0.7
gt.version=5.04.06
ic2.version=2.3.131-ex18
igwmod.version=1.1.3-18
jei.version=2.28.7.174
jei.version=2.28.18.186
mcmp.version=1.2.0_70
mekanism.build=5
mekanism.version=7.1.2

View File

@ -85,7 +85,9 @@ if #args == 0 or options.i then
end
end
local function hint(line, index)
line = (line or ""):sub(1, index - 1)
line = (line or "")
local tail = line:sub(index)
line = line:sub(1, index - 1)
local path = string.match(line, "[a-zA-Z_][a-zA-Z0-9_.]*$")
if not path then return nil end
local suffix = string.match(path, "[^.]+$") or ""
@ -95,7 +97,7 @@ if #args == 0 or options.i then
local r1, r2 = {}, {}
findKeys(t, r1, string.sub(line, 1, #line - #suffix), suffix)
for k in pairs(r1) do
table.insert(r2, k)
table.insert(r2, k .. tail)
end
table.sort(r2)
if #r2 == 1 then
@ -103,10 +105,11 @@ if #args == 0 or options.i then
__index=function(tbl, key)
if key==2 then
local prev=tbl[1]
tbl[1]=nil
local next = hint(prev,#prev+1)
for i,v in ipairs(next) do
tbl[i] = v
if next then
for i,v in ipairs(next) do
tbl[i] = v
end
end
setmetatable(tbl,getmetatable(next))
return tbl[1]

View File

@ -517,7 +517,7 @@ function --[[@delayloaded-start@]] term.internal.tab(input,hints)
c.i=(c.i+change)%math.max(#c,1)
local next=c[c.i+1]
if next then
local tail = unicode.wlen(input.data) - input.index - 1
local tail = unicode.len(input.data) - input.index
input:clear()
input:update(next)
input:move(-tail)

View File

@ -248,8 +248,8 @@ class TextBuffer(val host: EnvironmentHost) extends prefab.ManagedEnvironment wi
// backwards compatibility, and partially to enforce a valid one.
val sizeChanged = data.size = (w, h)
val viewportChanged = setViewport(w, h)
if (sizeChanged && !viewportChanged) {
if (node != null) {
if (sizeChanged || viewportChanged) {
if (!viewportChanged && node != null) {
node.sendToReachable("computer.signal", "screen_resized", Int.box(w), Int.box(h))
}
true

View File

@ -1,6 +1,8 @@
package li.cil.oc.common.item
import li.cil.oc.Settings
import li.cil.oc.util.BlockPosition
import net.minecraft.entity.player.EntityPlayer
import net.minecraft.item.ItemStack
class EEPROM(val parent: Delegator) extends traits.Delegate {
@ -16,4 +18,6 @@ class EEPROM(val parent: Delegator) extends traits.Delegate {
}
super.displayName(stack)
}
override def doesSneakBypassUse(position: BlockPosition, player: EntityPlayer): Boolean = true
}