Merge branch 'mc-1.20.x' into mc-1.21.x

gradle.properties

@@ -12,7 +12,7 @@ neogradle.subsystems.conventions.runs.enabled=false
 
 # Mod properties
 isUnstable=true
-modVersion=1.114.1
+modVersion=1.114.2
 
 # Minecraft properties: We want to configure this here so we can read it in settings.gradle
 mcVersion=1.21.1

projects/common/src/client/java/dan200/computercraft/client/render/monitor/MonitorBlockEntityRenderer.java

@@ -217,9 +217,9 @@ public class MonitorBlockEntityRenderer implements BlockEntityRenderer<MonitorBl
                 foregroundBuffer.drawWithShader(
                     modelView, RenderSystem.getProjectionMatrix(), RenderTypes.getTerminalShader(),
                     // Skip the cursor quad if it is not visible this frame.
-                    FixedWidthFontRenderer.isCursorVisible(terminal) && FrameInfo.getGlobalCursorBlink()
-                        ? foregroundBuffer.getIndexCount()
-                        : foregroundBuffer.getIndexCount() - RenderTypes.TERMINAL.mode().indexCount(4)
+                    FixedWidthFontRenderer.isCursorVisible(terminal) && !FrameInfo.getGlobalCursorBlink()
+                        ? foregroundBuffer.getIndexCount() - RenderTypes.TERMINAL.mode().indexCount(4)
+                        : foregroundBuffer.getIndexCount()
                 );
 
                 // Clear state

projects/core/src/main/resources/data/computercraft/lua/rom/help/changelog.md

@@ -1,3 +1,8 @@
+# New features in CC: Tweaked 1.114.2
+
+One bug fix:
+* Fix OpenGL errors when rendering empty monitors.
+
 # New features in CC: Tweaked 1.114.1
 
 Several bug fixes:

projects/core/src/main/resources/data/computercraft/lua/rom/help/whatsnew.md

@@ -1,8 +1,6 @@
-New features in CC: Tweaked 1.114.1
+New features in CC: Tweaked 1.114.2
 
-Several bug fixes:
-* Fix monitor touch events only firing from one monitor.
-* Fix crash when lectern has no item.
-* Fix cursor not blinking on monitors.
+One bug fix:
+* Fix OpenGL errors when rendering empty monitors.
 
 Type "help changelog" to see the full version history.