AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-13 17:28:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'local-1.7/master-MC1.7.10' into master-MC1.12

Browse Source
This commit is contained in:
Adrian Siekierka 2024-04-19 14:38:46 +02:00
commit 179e1c3a72
4 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.properties
View File

@ -5,7 +5,7 @@ forge.version=14.23.5.2860
mod.name=OpenComputers mod.name=OpenComputers
mod.group=li.cil.oc mod.group=li.cil.oc
mod.version=1.8.4-snapshot mod.version=1.8.5-snapshot
ae2.version=rv6-stable-7 ae2.version=rv6-stable-7
buildcraft.version=7.99.24.8 buildcraft.version=7.99.24.8

18
changelog.md
View File

@ -1,22 +1,6 @@
## New features
* (1.7.10) [#3524] Add support for reading Thaumcraft aspect information from Wands. (repo-alt)
* Improve OpenOS "package" implementation:
* [#3447] Populate package.config, add support for the package.preload table. (RobertCochran)
* Add support for the package.searchers table.
## Fixes/improvements ## Fixes/improvements
* [CVE-2024-31446] Fixed Lua virtual machine freeze involving xpcall(). * [#3710] Fix localization regression introduced in 1.8.4.
* (1.12.2) [#3659] Fixed bug when programatically transferring fluids from specific tanks. (yut23)
* [#3664] Fixed client-side errors when using third-party mod energy integration on an integrated server.
* [#3677] Fixed crash when showing error containing a percent sign with the Analyzer item.
* [#3698] Fixed documentation for the Screen's "turnOn" and "turnOff" functions. (Hawk777, DCNick3)
* [#3663] Fixed response code/message information not being preserved for unsuccessful HTTP responses.
* [#3691] Improved documentation for software bundled with the "network" floppy. (Computerdores)
* [#3644] Improved forged packet protection with regards to configuring server racks. (Glease)
* [#3652] Updated French translation. (ff66theone)
* Updated GNU Unifont to 15.1.05.
## List of contributors ## List of contributors

2
src/main/resources/assets/opencomputers/loot/openos/lib/core/boot.lua
View File

@ -1,7 +1,7 @@
-- called from /init.lua -- called from /init.lua
local raw_loadfile = ... local raw_loadfile = ...
_G._OSVERSION = "OpenOS 1.8.4" _G._OSVERSION = "OpenOS 1.8.5"
-- luacheck: globals component computer unicode _OSVERSION -- luacheck: globals component computer unicode _OSVERSION
local component = component local component = component

5
src/main/scala/li/cil/oc/Localization.scala
View File

@ -14,7 +14,10 @@ import scala.util.matching.Regex
object Localization { object Localization {
private val nl = Regex.quote("[nl]") private val nl = Regex.quote("[nl]")
private def resolveKey(key: String) = if (canLocalize(Settings.namespace + key)) Option(Settings.namespace + key) else Option.empty private def resolveKey(key: String) =
if (canLocalize(Settings.namespace + key)) Option(Settings.namespace + key)
else if (canLocalize(key)) Option(key)
else Option.empty
def canLocalize(key: String): Boolean = I18n.canTranslate(key) def canLocalize(key: String): Boolean = I18n.canTranslate(key)