aboutsummaryrefslogtreecommitdiff
path: root/runtime/src/main/resources/assets
diff options
context:
space:
mode:
authorshedaniel <daniel@shedaniel.me>2023-01-22 00:14:52 +0800
committershedaniel <daniel@shedaniel.me>2023-01-22 00:20:20 +0800
commit140e9148743dbe2469c2c6783f83057aaa2d3565 (patch)
tree1844bbe6f800ad1e81b48af54832644c7df0d377 /runtime/src/main/resources/assets
parente2979ca8bdf49a5db0f944085caec284fde3d00b (diff)
parent7dac5856acd5a1b4111f009d3c348a501f1bc397 (diff)
downloadRoughlyEnoughItems-140e9148743dbe2469c2c6783f83057aaa2d3565.tar.gz
RoughlyEnoughItems-140e9148743dbe2469c2c6783f83057aaa2d3565.tar.bz2
RoughlyEnoughItems-140e9148743dbe2469c2c6783f83057aaa2d3565.zip
Merge remote-tracking branch 'origin/9.x-1.19' into 10.x-1.19.3
# Conflicts: # default-plugin/src/main/java/me/shedaniel/rei/plugin/client/favorites/CommandSender.java # fabric/src/main/java/me/shedaniel/rei/impl/client/fabric/CommandSenderImpl.java # forge/src/main/java/me/shedaniel/rei/impl/client/forge/CommandSenderImpl.java
Diffstat (limited to 'runtime/src/main/resources/assets')
-rwxr-xr-xruntime/src/main/resources/assets/roughlyenoughitems/lang/en_us.json2
1 files changed, 2 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 b4af25079..680d7019f 100755
--- a/runtime/src/main/resources/assets/roughlyenoughitems/lang/en_us.json
+++ b/runtime/src/main/resources/assets/roughlyenoughitems/lang/en_us.json
@@ -368,6 +368,8 @@
"rule.roughlyenoughitems.filtering.search.show.false": "Hide",
"rule.roughlyenoughitems.filtering.basic": "Basic Plugin Filtering",
"rule.roughlyenoughitems.filtering.basic.subtitle": "Filter entries by REI plugins. This is not configurable here.",
+ "rule.roughlyenoughitems.filtering.hide.tag": "Tag Filtering",
+ "rule.roughlyenoughitems.filtering.hide.tag.subtitle": "Filter entries by 'c:hidden_from_recipe_viewers'. This is not configurable here.",
"language.roughlyenoughitems.english": "English",
"language.roughlyenoughitems.japanese": "Japanese",
"language.roughlyenoughitems.chinese_simplified": "Chinese Simplified",