diff options
| author | shedaniel <daniel@shedaniel.me> | 2024-09-17 21:34:04 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2024-09-17 21:34:04 +0800 |
| commit | 3febdc4e1d6927f19d0de6fc8430765336d34d7e (patch) | |
| tree | e8cc88c46ce9b2ebf0954f94dcb56189f2fa5a1b /runtime/src/main/resources/assets/roughlyenoughitems/lang | |
| parent | bc039e2d0a45409396c9156307d70529ccb28a3e (diff) | |
| parent | ccf3dcd60aa6c1d079dd57c59d9a89c2ca60b1e7 (diff) | |
| download | RoughlyEnoughItems-3febdc4e1d6927f19d0de6fc8430765336d34d7e.tar.gz RoughlyEnoughItems-3febdc4e1d6927f19d0de6fc8430765336d34d7e.tar.bz2 RoughlyEnoughItems-3febdc4e1d6927f19d0de6fc8430765336d34d7e.zip | |
Merge remote-tracking branch 'origin/12.x-1.20' into 13.x-1.20.2
# Conflicts:
# default-plugin/src/main/java/me/shedaniel/rei/plugin/common/displays/DefaultSmithingDisplay.java
# fabric/src/main/resources/roughlyenoughitems.accessWidener
# runtime/src/main/java/me/shedaniel/rei/impl/client/registry/display/DisplayRegistryImpl.java
# runtime/src/main/java/me/shedaniel/rei/impl/common/registry/RecipeManagerContextImpl.java
Diffstat (limited to 'runtime/src/main/resources/assets/roughlyenoughitems/lang')
| -rwxr-xr-x | runtime/src/main/resources/assets/roughlyenoughitems/lang/en_us.json | 6 |
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.", |