AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-18 11:48:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch master-MC1.11 into master-MC1.12

Browse Source
This commit is contained in:
payonel 2017-12-02 23:47:50 -08:00
commit 818f8b9058
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/scala/li/cil/oc/server/component/LinkedCard.scala
View File

@ -36,7 +36,7 @@ class LinkedCard extends AbstractManagedEnvironment with QuantumNetwork.QuantumN
DeviceAttribute.Vendor -> Constants.DeviceInfo.DefaultVendor, DeviceAttribute.Vendor -> Constants.DeviceInfo.DefaultVendor,
DeviceAttribute.Product -> "HyperLink IV: Ender Edition", DeviceAttribute.Product -> "HyperLink IV: Ender Edition",
DeviceAttribute.Capacity -> Settings.get.maxNetworkPacketSize.toString, DeviceAttribute.Capacity -> Settings.get.maxNetworkPacketSize.toString,
DeviceAttribute.Width -> Settings.get.maxNetworkPacketParts DeviceAttribute.Width -> Settings.get.maxNetworkPacketParts.toString
) )
override def getDeviceInfo: util.Map[String, String] = deviceInfo override def getDeviceInfo: util.Map[String, String] = deviceInfo

2
src/main/scala/li/cil/oc/server/component/NetworkCard.scala
View File

@ -50,7 +50,7 @@ class NetworkCard(val host: EnvironmentHost) extends AbstractManagedEnvironment
DeviceAttribute.Vendor -> Constants.DeviceInfo.DefaultVendor, DeviceAttribute.Vendor -> Constants.DeviceInfo.DefaultVendor,
DeviceAttribute.Product -> "42i520 (MPN-01)", DeviceAttribute.Product -> "42i520 (MPN-01)",
DeviceAttribute.Capacity -> Settings.get.maxNetworkPacketSize.toString, DeviceAttribute.Capacity -> Settings.get.maxNetworkPacketSize.toString,
DeviceAttribute.Width -> Settings.get.maxNetworkPacketParts DeviceAttribute.Width -> Settings.get.maxNetworkPacketParts.toString
) )
override def getDeviceInfo: util.Map[String, String] = deviceInfo override def getDeviceInfo: util.Map[String, String] = deviceInfo