Skip to content

Commit

Permalink
Merge remote-tracking branch 'local-1.7/master-MC1.7.10' into master-…
Browse files Browse the repository at this point in the history
…MC1.12
  • Loading branch information
asiekierka committed Apr 19, 2024
2 parents 99b9e3e + ad76e2a commit 179e1c3
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 20 deletions.
2 changes: 1 addition & 1 deletion build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ forge.version=14.23.5.2860

mod.name=OpenComputers
mod.group=li.cil.oc
mod.version=1.8.4-snapshot
mod.version=1.8.5-snapshot

ae2.version=rv6-stable-7
buildcraft.version=7.99.24.8
Expand Down
18 changes: 1 addition & 17 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -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

Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
5 changes: 4 additions & 1 deletion src/main/scala/li/cil/oc/Localization.scala
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,10 @@ import scala.util.matching.Regex
object Localization {
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)

Expand Down

0 comments on commit 179e1c3

Please sign in to comment.