Merge branch 'master-MC1.7.10' into gtnh-oc-1.8.2

changelog.md

@@ -1,43 +1,30 @@
-## New Features/Support
+## New features
 
-* Added: Experimental Lua 5.4 support (Lua 5.4.4).
-  * For now, this is hidden behind a configuration option.
-* Added: Forestry circuit boards' internal layout is now available to Lua scripts.
-* Added: Major upgrade of Lua libraries.
-  * Updated LuaJ to 3.0.2 with many third-party patches applied.
-  * JNLua is now compiled with proper optimizations - ~2x better performance!
-  * Lua 5.2 has been updated with gamax92's backported bugfixes.
-  * Lua 5.3 has been updated from 5.3.2 to 5.3.6.
-  * 64-bit integers in calls should now be handled properly.
-* Added: New robot names.
-* Added: Official support for AArch64 on Linux and macOS.
-* Added: Source tank parameter for Transposer transferFluid(). (repo-alt)
-* Added: Subtle indentations to Redstone I/O texture.
-  * The amount of darkened dots on each side marks the ordinal number of the side it responds to.
-* Added: Support for non-BMP Unicode codepoints!
-  * To clarify, Unicode characters >= 0x10000 should now be fully supported - as long as they're provided in the font.
-* Added: Support for partial font overrides in resource packs.
-  * If a resource pack's font.hex file only contains some glyphs, missing glyphs present in parent resource packs won't disappear.
-* Added: Support for the "PATCH" HTTP method. (hohserg1)
-* Added: New config option: "transposerFluidTransferRate". (repo-alt)
-* Changed: New limitFlightHeight configuration definition.
-  * This allows values above 256 to be used, which may be useful for Cubic Chunks users.
-* Changed: Replaced the forceNativeLibWithName config option with two new ones: forceNativeLibPlatform and forceNativeLibPathFirst. (TheCodex6824)
-  * forceNativeLibPlatform allows overriding the normally auto-detected platform string to a custom value, in case the user is on an unsupported platform.
-  * forceNativeLibPathFirst allows choosing a directory to check for natives in, instead of always searching in the jar for one. This allows custom natives to be used without packing them into the mod jar first, which should be much easier for end users.
-* Changed: The game now crashes instead of reloading defaults if a config file is present but invalid.
-* Fixed: [#3588] Renaming over other files does not properly free space.
-* Fixed: [#3591] Memory leak with wrapped worlds from other mods.
-* Fixed: [#3596] Freeze when connecting a ComputerCraft peripheral via an Adapter (Kosmos-Prime)
-* Fixed: [#3603] computer.getDeviceInfo doesn't pause the computer immediately (AR2000AR)
-* Fixed: [#3609] Swapped arguments in a graphics card "bitblt()" edge case. (Kosmos-Prime)
-* Removed: Native Lua library support for x86 (32-bit) macOS.
-* (1.7.10) Fixed: [#3239] Inconsistencies in Robot block clicking.
+* [#3533] Added support for observing the contents of fluid container items.
+* [1.12.2] Ported some CoFH Core, Ender IO and Railcraft drivers and wrench support.
+* Added Railcraft Anchor/Worldspike driver (repo-alt).
+* Added Spanish translation (sanmofe).
+
+## Fixes/improvements
+
+* [#3620] Fixed OC 1.8.0+ regression involving API arguments and numbers.
+* [#3013] Fixed rare server-side deadlock when sending disk activity update packets.
+* Fixed bugs in internal wcwidth() implementation and updated it to cover Unicode 12.
+* [1.7.10] Fixed the Database upgrade's documentation not showing up in NEI.
+* Fixed server->client synchronization for some types of GPU bitblt operations.
+* Fixed string.gmatch not supporting the "init" argument on Lua 5.4.
+* Tweaks to server->client networking code:
+  * Added support for configuring the maximum packet distance for effects, sounds, and all client packets.
+  * Improved the method of synchronizing tile entity updates with the client.
+  * Robot light colors are now sent to all observers of the tile entity, preventing a potential (rare) glitch.
+* Update GNU Unifont to 15.0.05.
 
 ## OpenOS fixes/improvements
 
-* Fixed: [#3558] Invalid file modification timestamps in /bin/ls.
+* [#3371] Fix minor bug in rm.lua.
+* Fix "ls -l" command on Lua 5.4.
+* General minor improvements to the codebase.
 
 ## List of contributors
 
-AR2000AR, asie, hohserg1, Kosmos-Prime, payonel, repo-alt, Smok1e, TheCodex6824
+asie, ds84182, Possseidon, repo-alt, sanmofe

dependencies.gradle

@@ -2,7 +2,7 @@
 
 dependencies {
     shadowImplementation name: 'OC-LuaJ', version: '20220907.1', ext: 'jar'
-    shadowImplementation name: 'OC-JNLua', version: '20220928.1', ext: 'jar'
+    shadowImplementation name: 'OC-JNLua', version: '20230530.0', ext: 'jar'
     shadowImplementation name: 'OC-JNLua-Natives', version: '20220928.1', ext: 'jar'
 
     compile("com.google.code.findbugs:jsr305:3.0.2")

src/main/resources/LICENSE-wcwidth

@@ -0,0 +1,20 @@
+Copyright © 2005-2020 Rich Felker, et al.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

src/main/resources/application.conf

@@ -959,14 +959,6 @@ opencomputers {
     # Whether to allow adding custom headers to HTTP requests.
     enableHttpHeaders: true
 
-    # This is a list of allowed HTTP methods. If empty, any HTTP method
-    # can be used.
-    enableHttpMethods: []
-
-    # This is a number describing how many HTTP redirects are allowed
-    # while processing an HTTP request call. If 0, no redirects are allowed.
-    enableHttpRedirects: 50
-
     # Whether to allow TCP connections via internet cards. When enabled,
     # the `connect` method on internet card components becomes available.
     enableTcp: true
@@ -1408,6 +1400,23 @@ opencomputers {
     # It may transfer unlimited amount per operation, but will then 
     # wait ((Amount in buckets)/16) seconds
     transposerFluidTransferRate=16000
+
+    # Delay between disk activity sounds, specified in milliseconds.
+    # If set to -1, no disk activity update packets are sent.
+    diskActivitySoundDelay: 500
+
+    # Maximum distance for updates sent from the client to the server, in blocks.
+    # This is further modulated by the server's maximum view distance.
+    # If set to 0, this option is ignored.
+    maxNetworkClientPacketDistance: 0.0
+
+    # Maximum distance for visual effects sent from the client to the server.
+    # These are non-essential - losing them should not cause glitches on the client side.
+    maxNetworkClientEffectPacketDistance: 64.0
+
+    # Maximum distance for sound effects sent from the client to the server.
+    # These are non-essential - losing them should not cause glitches on the client side.
+    maxNetworkClientSoundPacketDistance: 32.0
   }
 
   # Settings for mod integration (the mod previously known as OpenComponents).