aboutsummaryrefslogtreecommitdiff
path: root/runtime/src/main/resources
diff options
context:
space:
mode:
authorshedaniel <daniel@shedaniel.me>2023-06-08 13:32:42 +0800
committershedaniel <daniel@shedaniel.me>2023-06-08 13:32:42 +0800
commit3d0de007896f853e70f337fc421649104859099f (patch)
tree6b05c0389197fee7608c105bae8356eec8d0e397 /runtime/src/main/resources
parentd467c0135ee24d402d1110bc4dfa319b6bed1009 (diff)
parentdf6576f1818768a0f8b11cfadae145921d48e6dc (diff)
downloadRoughlyEnoughItems-3d0de007896f853e70f337fc421649104859099f.tar.gz
RoughlyEnoughItems-3d0de007896f853e70f337fc421649104859099f.tar.bz2
RoughlyEnoughItems-3d0de007896f853e70f337fc421649104859099f.zip
Merge remote-tracking branch 'shedaniel/11.x-1.19.4' into 12.x-1.20
# Conflicts: # runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCoreClient.java # runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/CompositeDisplayViewingScreen.java # runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/EntryWidget.java
Diffstat (limited to 'runtime/src/main/resources')
-rwxr-xr-xruntime/src/main/resources/assets/roughlyenoughitems/lang/en_us.json1
1 files changed, 1 insertions, 0 deletions
diff --git a/runtime/src/main/resources/assets/roughlyenoughitems/lang/en_us.json b/runtime/src/main/resources/assets/roughlyenoughitems/lang/en_us.json
index 35d9f23d0..1e3b150fa 100755
--- a/runtime/src/main/resources/assets/roughlyenoughitems/lang/en_us.json
+++ b/runtime/src/main/resources/assets/roughlyenoughitems/lang/en_us.json
@@ -322,6 +322,7 @@
"config.roughlyenoughitems.miscellaneous.newFastEntryRendering": "Faster Entry Rendering:",
"config.roughlyenoughitems.miscellaneous.cachingFastEntryRendering": "Caching Entry Rendering:",
"config.roughlyenoughitems.miscellaneous.cachingFastEntryRendering.@PrefixText": "This option will improve performance for rendering entries for up to 5x, with an average of 2.5x performance gain. However, this will break enchantment glints and animated textures.",
+ "config.roughlyenoughitems.miscellaneous.cachingDisplayLookup": "Caching Display Lookup:",
"config.roughlyenoughitems.itemCheatingMode": "Item Cheating Amount:",
"config.roughlyenoughitems.itemCheatingMode.rei_like": "Normal",
"config.roughlyenoughitems.itemCheatingMode.jei_like": "Inverted",