mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-08-28 08:12:18 +00:00
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jonathan Coates 2024-11-23 09:36:50 +00:00
commit b7396f3796
No known key found for this signature in database
GPG Key ID: B9E431FF07C98D06
4 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

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

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

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

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

@ -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 # New features in CC: Tweaked 1.114.1
Several bug fixes: Several bug fixes:

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

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