aboutsummaryrefslogtreecommitdiff
path: root/runtime/src/main/resources/assets
diff options
context:
space:
mode:
authorshedaniel <daniel@shedaniel.me>2024-04-17 02:58:51 +0900
committershedaniel <daniel@shedaniel.me>2024-04-17 03:00:17 +0900
commit90fd49a7d1decc43c41c23550afe326b6df570eb (patch)
treefafd3093735c60d326e1e5043a30ac33e96035db /runtime/src/main/resources/assets
parentd96699c5e2858ef1d25d2a2fc77deff59041af81 (diff)
parent3411a078ef92b06fb1f5b12116a8241811ff9aab (diff)
downloadRoughlyEnoughItems-90fd49a7d1decc43c41c23550afe326b6df570eb.tar.gz
RoughlyEnoughItems-90fd49a7d1decc43c41c23550afe326b6df570eb.tar.bz2
RoughlyEnoughItems-90fd49a7d1decc43c41c23550afe326b6df570eb.zip
Merge remote-tracking branch 'origin/11.x-1.19.4' into 12.x-1.20
# Conflicts: # runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/collapsible/CollapsibleEntryWidget.java
Diffstat (limited to 'runtime/src/main/resources/assets')
-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 73bcb103a..fa6f3dbd4 100755
--- a/runtime/src/main/resources/assets/roughlyenoughitems/lang/en_us.json
+++ b/runtime/src/main/resources/assets/roughlyenoughitems/lang/en_us.json
@@ -137,6 +137,7 @@
"text.rei.left_arrow": "<",
"text.rei.right_arrow": ">",
"text.rei.view_all_categories": "View All Categories",
+ "text.rei.view_all_categories.tooltip": "%d categories",
"text.rei.go_back_first_page": "Back to Page 1",
"text.rei.choose_page": "Choose Page",
"text.rei.shift_click_to": "Shift-Click to %s",