Sovereignty/jecs
1
0
Fork 0
mirror of https://github.com/Ukendio/jecs.git synced 2025-04-25 09:30:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge conflicts

Browse source
This commit is contained in:
Ukendio 2024-07-07 00:18:23 +02:00
parent 68010b3b5f
commit ddbfd6c383
2 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
benches/query.luau
View file

@ -7,10 +7,7 @@ local function TITLE(title: string)
print() print()
print(testkit.color.white(title)) print(testkit.color.white(title))
end end
<<<<<<< HEAD
=======
>>>>>>> b73d7e12b79401f3c52303d4ae01166b720c75b1
local jecs = require("@jecs") local jecs = require("@jecs")
local mirror = require("../mirror/init") local mirror = require("../mirror/init")

2
src/init.luau
View file

@ -848,7 +848,7 @@ local function preparedQuery(compatibleArchetypes: { Archetype },
replace = replace replace = replace
} }
return it return setmetatable(it, it) :: any
end end
local function query(world: World, ...: number): Query local function query(world: World, ...: number): Query