Merge remote-tracking branch 'origin/master-MC1.7.10' into master-MC1.12

build.gradle

@@ -214,7 +214,7 @@ dependencies {
     embedded name: 'OC-JNLua', version: '20230530.0', ext: 'jar'
     embedded name: 'OC-JNLua-Natives', version: '20220928.1', ext: 'jar'
 
-    testImplementation("junit:junit:4.13")
+    testImplementation("junit:junit:4.13.2")
     testImplementation("org.mockito:mockito-all:1.10.19")
     testImplementation("org.scalactic:scalactic_2.11:2.2.6")
     testImplementation("org.scalatest:scalatest_2.11:2.2.6")

changelog.md

@@ -1,10 +1,9 @@
 ## Fixes/improvements
 
-* [#3769] Add default user agent configuration option; change OpenComputers' default user agent to "opencomputers/$version".
-* [#3759] Add V1 and V2 to the robot name list. (AutumnalModding)
-* [#3727] Fix more regressions related to OpenOS error handling. (jasonS05, kcinnajlol)
-* Fix client-side memory leak on anything RedstoneAware (Glease)
+* [#3764] Fix left and right names being swapped in the Rack GUI
+* [#3779] Fix `os.sleep(0)` causing `too long without yielding` (Ocawesome101)
+* (1.12) [#3774] Fix Jukebox driver (kebufu)
 
 ## List of contributors
 
-asie, AutumnalModding, Glease, jasonS05, kcinnajlol
+asie, kebufu, Ocawesome101

src/main/scala/li/cil/oc/client/gui/Rack.scala

@@ -84,8 +84,8 @@ class Rack(playerInventory: InventoryPlayer, val rack: tileentity.Rack) extends
   def sideName(side: EnumFacing) = side match {
     case EnumFacing.UP => Localization.Rack.Top
     case EnumFacing.DOWN => Localization.Rack.Bottom
-    case EnumFacing.EAST => Localization.Rack.Left
-    case EnumFacing.WEST => Localization.Rack.Right
+    case EnumFacing.WEST => Localization.Rack.Left
+    case EnumFacing.EAST => Localization.Rack.Right
     case EnumFacing.NORTH => Localization.Rack.Back
     case _ => Localization.Rack.None
   }