Merge branch 'master' of https://github.com/Pyroxenium/Basalt
This commit is contained in:
@@ -3,6 +3,7 @@ local _OBJECTS = require("loadObjects")
|
|||||||
local BasaltDraw = require("basaltDraw")
|
local BasaltDraw = require("basaltDraw")
|
||||||
local utils = require("utils")
|
local utils = require("utils")
|
||||||
local layout = require("layout")
|
local layout = require("layout")
|
||||||
|
local log = require("basaltLogs")
|
||||||
local uuid = utils.uuid
|
local uuid = utils.uuid
|
||||||
local rpairs = utils.rpairs
|
local rpairs = utils.rpairs
|
||||||
local xmlValue = utils.getValueFromXML
|
local xmlValue = utils.getValueFromXML
|
||||||
@@ -1106,4 +1107,4 @@ return function(name, parent, pTerm, basalt)
|
|||||||
end
|
end
|
||||||
setmetatable(object, base)
|
setmetatable(object, base)
|
||||||
return object
|
return object
|
||||||
end
|
end
|
||||||
|
|||||||
Reference in New Issue
Block a user