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

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

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

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

@ -34,7 +34,8 @@ class LinkedCard extends prefab.ManagedEnvironment with QuantumNetwork.QuantumNo
DeviceAttribute.Description -> "Quantumnet controller", DeviceAttribute.Description -> "Quantumnet controller",
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
) )
override def getDeviceInfo: util.Map[String, String] = deviceInfo override def getDeviceInfo: util.Map[String, String] = deviceInfo

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

@ -48,7 +48,8 @@ class NetworkCard(val host: EnvironmentHost) extends prefab.ManagedEnvironment w
DeviceAttribute.Description -> "Ethernet controller", DeviceAttribute.Description -> "Ethernet controller",
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
) )
override def getDeviceInfo: util.Map[String, String] = deviceInfo override def getDeviceInfo: util.Map[String, String] = deviceInfo