mirror of
https://github.com/MightyPirates/OpenComputers.git
synced 2025-09-18 03:36:47 -04:00
Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10
Conflicts: build.properties
This commit is contained in:
commit
4336b14863
@ -24,7 +24,7 @@ do
|
||||
end
|
||||
|
||||
-- Report boot progress if possible.
|
||||
local gpu = component.list("gpu")()
|
||||
local gpu = component.list("gpu", true)()
|
||||
local w, h
|
||||
if gpu and screen then
|
||||
component.invoke(gpu, "bind", screen)
|
||||
|
Loading…
x
Reference in New Issue
Block a user