AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-08-03 19:17:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master-MC1.7.10' into master-MC1.10

Browse Source 
# Conflicts:
#	src/main/scala/li/cil/oc/integration/appeng/NetworkControl.scala
This commit is contained in:
payonel 2019-11-16 10:22:39 -08:00
commit db39561abf
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/scala/li/cil/oc/integration/appeng/NetworkControl.scala
View File

@ -100,7 +100,7 @@ trait NetworkControl[AETile >: Null <: TileEntity with IActionHost] {
case (key: String, value: AnyRef) => (key, value) case (key: String, value: AnyRef) => (key, value)
} }
result(allCraftables result(allCraftables
.collect{ case aeCraftItem if matches(convert(aeCraftItem), filter) => new NetworkControl.Craftable(tile, pos, aeCraftItem) } .collect{ case aeCraftItem if filter.isEmpty || matches(convert(aeCraftItem), filter) => new NetworkControl.Craftable(tile, pos, aeCraftItem) }
.toArray) .toArray)
} }