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

projects/core/src/main/resources/data/computercraft/lua/rom/apis/paintutils.lua

@@ -47,12 +47,22 @@ local function sortCoords(startX, startY, endX, endY)
     return minX, maxX, minY, maxY
 end
 
---- Parses an image from a multi-line string
---
--- @tparam string image The string containing the raw-image data.
--- @treturn table The parsed image data, suitable for use with
--- [`paintutils.drawImage`].
--- @since 1.80pr1
+--[=[- Parses an image from a multi-line string
+
+@tparam string image The string containing the raw-image data.
+@treturn table The parsed image data, suitable for use with [`paintutils.drawImage`].
+@usage Parse an image from a string, and draw it.
+
+    local image = paintutils.parseImage([[
+     e  e
+
+    e    e
+     eeee
+    ]])
+    paintutils.drawImage(image, term.getCursorPos())
+
+@since 1.80pr1
+]=]
 function parseImage(image)
     expect(1, image, "string")
     local tImage = {}

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

@@ -1,3 +1,12 @@
+# New features in CC: Tweaked 1.114.4
+
+* Allow typing/pasting any character in the CC charset.
+* Add a new `computercraft:storage_capacity` to override a disk or computer's capacity.
+
+Several bug fixes:
+* Fix command computers having NBT set when placed in a Create contraption.
+* Use correct bounding box when checking for entities in turtle movement.
+
 # New features in CC: Tweaked 1.114.3
 
 * `wget` now prints the error that occurred, rather than a generic "Failed" (tizu69).

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

@@ -1,10 +1,10 @@
-New features in CC: Tweaked 1.114.3
+New features in CC: Tweaked 1.114.4
 
-* `wget` now prints the error that occurred, rather than a generic "Failed" (tizu69).
-* Update several translations.
+* Allow typing/pasting any character in the CC charset.
+* Add a new `computercraft:storage_capacity` to override a disk or computer's capacity.
 
 Several bug fixes:
-* Fix `fs.isDriveRoot` returning true for non-existent files.
-* Fix possible memory leak when sending terminal contents.
+* Fix command computers having NBT set when placed in a Create contraption.
+* Use correct bounding box when checking for entities in turtle movement.
 
 Type "help changelog" to see the full version history.