Merge branch 'mc-1.15.x' into mc-1.16.x

cc-tweaked · Jul 18, 2020 · 2a17585 · 2a17585
2 parents 087c305 + 2f323f2
commit 2a17585
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/main/resources/data/computercraft/lua/rom/help/changelog.txt b/src/main/resources/data/computercraft/lua/rom/help/changelog.txt
@@ -3,15 +3,17 @@
 * Add cc.image.nft module, for working with nft files. (JakobDev)
 * [experimental] Provide a generic peripheral for any tile entity without an existing one. We currently provide methods for working with inventories, fluid tanks and energy storage. This is disabled by default, and must be turned on in the config.
 * Add configuration to control the sizes of monitors and terminals.
+* Add configuration to control maximum render distance of monitors.
 * Allow getting "detailed" information about an item, using `turtle.getItemDetail(slot, true)`. This will contain the same information that the generic peripheral supplies.
 
 And several bug fixes:
 * Add back config for allowing interacting with command computers.
 * Fix write method missing from printers.
 * Fix dupe bug when killing an entity with a turtle.
 * Correctly supply port in the Host header (neumond).
-* Fix turtle.craft failing when missing an argument.
+* Fix `turtle.craft` failing when missing an argument.
 * Fix deadlock when mistakenly "watching" an unloaded chunk.
+* Fix full path of files being leaked in some errors.
 
 Type "help changelog" to see the full version history.
 

diff --git a/src/main/resources/data/computercraft/lua/rom/help/whatsnew.txt b/src/main/resources/data/computercraft/lua/rom/help/whatsnew.txt
@@ -3,14 +3,16 @@ New features in CC: Tweaked 1.90.0
 * Add cc.image.nft module, for working with nft files. (JakobDev)
 * [experimental] Provide a generic peripheral for any tile entity without an existing one. We currently provide methods for working with inventories, fluid tanks and energy storage. This is disabled by default, and must be turned on in the config.
 * Add configuration to control the sizes of monitors and terminals.
+* Add configuration to control maximum render distance of monitors.
 * Allow getting "detailed" information about an item, using `turtle.getItemDetail(slot, true)`. This will contain the same information that the generic peripheral supplies.
 
 And several bug fixes:
 * Add back config for allowing interacting with command computers.
 * Fix write method missing from printers.
 * Fix dupe bug when killing an entity with a turtle.
 * Correctly supply port in the Host header (neumond).
-* Fix turtle.craft failing when missing an argument.
+* Fix `turtle.craft` failing when missing an argument.
 * Fix deadlock when mistakenly "watching" an unloaded chunk.
+* Fix full path of files being leaked in some errors.
 
 Type "help changelog" to see the full version history.