curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-03-07 20:31:51 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://bitbucket.org/minjae_song/terrarum_renewed

Browse Source 
Conflicts:
	src/net/torvald/terrarum/virtualcomputer/computer/BaseTerrarumComputer.kt

Former-commit-id: 8d34d0d74fb8a8ed0075e74251234e53672ae62b
Former-commit-id: 5761c7d88ed9a80b5459fda83754e2a79b52dcf4
This commit is contained in:
Song Minjae
2016-09-26 12:34:49 +09:00
parent 75d73f7d18 d44c11f0f0
commit 51cc29b4e4
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/net/torvald/terrarum/virtualcomputer/computer/BaseTerrarumComputer.kt
View File

@@ -106,7 +106,7 @@ class BaseTerrarumComputer(val term: Teletype? = null) {
// secure the sandbox
luaJ_globals["io"] = LuaValue.NIL
// dubug is sandboxed in OpenComputers code
// dubug should be sandboxed in BOOT.lua (use OpenComputers code)
//val sethook = luaJ_globals["debug"]["sethook"]
//luaJ_globals["debug"] = LuaValue.NIL