Merge branch 'main' into document-stack-size

FallingColors · Aug 23, 2024 · 27bf4b2 · 27bf4b2
2 parents 4a1d0fa + aa02f75
commit 27bf4b2
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/Common/src/main/resources/assets/hexcasting/lang/en_us.flatten.json5 b/Common/src/main/resources/assets/hexcasting/lang/en_us.flatten.json5
@@ -956,7 +956,7 @@
         bool_commute: "a boolean, 0, or 1",
       },
 
-      location: {
+      location_: {
         too_far: "%s is out of range",
         out_of_world: "%s is not within the world",
         too_close_to_out: "%s is too close to the boundary of the world",

diff --git a/Common/src/main/resources/assets/hexcasting/lang/ru_ru.flatten.json5 b/Common/src/main/resources/assets/hexcasting/lang/ru_ru.flatten.json5
@@ -946,7 +946,7 @@
         bool_commute: "Логика - 0 или 1",
       },
 
-      location: {
+      location_: {
         too_far: "%s находится вне диапазона",
         out_of_world: "%s находится за пределами этого мира",
         too_close_to_out: "%s находится слишком близко к границе мира",

diff --git a/Common/src/main/resources/assets/hexcasting/lang/zh_cn.flatten.json5 b/Common/src/main/resources/assets/hexcasting/lang/zh_cn.flatten.json5
@@ -951,7 +951,7 @@
         bool_commute: "一个布尔值、0或1",
       },
 
-      location: {
+      location_: {
         too_far: "%s超出影响范围",
         out_of_world: "%s不在此世界内",
         too_close_to_out: "%s离世界边界太近了",