mirror of
https://github.com/MightyPirates/OpenComputers.git
synced 2025-09-16 10:51:55 -04:00
Merge branch master-MC1.7.10 into master-MC1.10
This commit is contained in:
commit
e18123049b
@ -34,7 +34,8 @@ class LinkedCard extends prefab.ManagedEnvironment with QuantumNetwork.QuantumNo
|
||||
DeviceAttribute.Description -> "Quantumnet controller",
|
||||
DeviceAttribute.Vendor -> Constants.DeviceInfo.DefaultVendor,
|
||||
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
|
||||
|
@ -48,7 +48,8 @@ class NetworkCard(val host: EnvironmentHost) extends prefab.ManagedEnvironment w
|
||||
DeviceAttribute.Description -> "Ethernet controller",
|
||||
DeviceAttribute.Vendor -> Constants.DeviceInfo.DefaultVendor,
|
||||
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
|
||||
|
Loading…
x
Reference in New Issue
Block a user