aboutsummaryrefslogtreecommitdiff
path: root/runtime/src/main/resources
diff options
context:
space:
mode:
authorshedaniel <daniel@shedaniel.me>2024-09-17 22:15:52 +0800
committershedaniel <daniel@shedaniel.me>2024-09-17 22:15:52 +0800
commit3251f01cacfaf6dcdfd35ee3eaa5e5bee9d372b7 (patch)
tree3b4876ab4de85a4a702300d9bbbb812d94f888e4 /runtime/src/main/resources
parentdcac5f4891046507047c5951c164fb1c1f08da74 (diff)
parent15a46dc3a91cf3f8fdb7a1ddf382ce05bfcf742e (diff)
downloadRoughlyEnoughItems-3251f01cacfaf6dcdfd35ee3eaa5e5bee9d372b7.tar.gz
RoughlyEnoughItems-3251f01cacfaf6dcdfd35ee3eaa5e5bee9d372b7.tar.bz2
RoughlyEnoughItems-3251f01cacfaf6dcdfd35ee3eaa5e5bee9d372b7.zip
Merge remote-tracking branch 'origin/15.x-1.20.5' into 16.x-1.21
# Conflicts: # runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCoreClient.java
Diffstat (limited to 'runtime/src/main/resources')
-rwxr-xr-xruntime/src/main/resources/assets/roughlyenoughitems/lang/en_us.json6
1 files changed, 6 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 0146868cf..5568968b6 100755
--- a/runtime/src/main/resources/assets/roughlyenoughitems/lang/en_us.json
+++ b/runtime/src/main/resources/assets/roughlyenoughitems/lang/en_us.json
@@ -79,6 +79,10 @@
"text.rei.tag_accept": "Tag: #%s",
"text.rei.missing": "Missing following:",
"text.rei.performance": "Performance Analysis",
+ "text.rei.display_registry_analysis": "Display Registry Analysis",
+ "text.rei.display_registry_analysis.displays": "%d display(s)",
+ "text.rei.sort": "Sort",
+ "text.rei.sort.by": "Sort by %s",
"text.rei.addons": "REI Addons",
"text.rei.shapeless": "Shapeless",
"text.rei.crafting.firework.gunpowder.amount": "The amount of gunpowder affects the flight duration of the firework.",
@@ -451,6 +455,8 @@
"config.rei.options.debug.search_performance.desc": "Verbose console print out for analysing search performance.",
"config.rei.options.debug.entry_list_performance": "Entry List Performance",
"config.rei.options.debug.entry_list_performance.desc": "Display the time used to render entries on the entry list.",
+ "config.rei.options.debug.display_registry_analysis": "Display Registry Analysis",
+ "config.rei.options.debug.display_registry_analysis.desc": "Break-down in registration of displays in each category.",
"config.rei.options.groups.reset.reload": "Reload",
"config.rei.options.reset.reload_plugins": "Reload Plugins",
"config.rei.options.reset.reload_plugins.desc": "Resets the current loaded data and reload all data and plugins.",