Merge branch 'master-MC1.12' into catchup-MC1.16

build.properties

@@ -6,7 +6,7 @@ scorge.version=3.1.3
 
 mod.name=OpenComputers
 mod.group=li.cil.oc
-mod.version=1.8.4-snapshot
+mod.version=1.8.5-snapshot
 
 ae2.version=8.4.7
 cct.version=1.100.5

changelog.md

@@ -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
 
-* [CVE-2024-31446] Fixed Lua virtual machine freeze involving xpcall().
-* (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.
+* [#3710] Fix localization regression introduced in 1.8.4.
 
 ## List of contributors
 

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

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

src/main/scala/li/cil/oc/Localization.scala

@@ -7,7 +7,10 @@ import net.minecraft.util.text.event.HoverEvent
 import scala.util.matching.Regex
 
 object Localization {
-  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 = LanguageMap.getInstance.has(key)