aboutsummaryrefslogtreecommitdiff
path: root/runtime/src
diff options
context:
space:
mode:
authorshedaniel <daniel@shedaniel.me>2021-11-18 19:02:54 +0800
committershedaniel <daniel@shedaniel.me>2021-11-18 19:02:54 +0800
commit3ac878f7cd6b1cd54bbf6ed2843bfe51bcdf1321 (patch)
tree2f07a5c2bae097c6aff5b3042082e53c3b417b36 /runtime/src
parent0ad79cc5f5460cda2184d7be22e19fda187d07ba (diff)
parent8f24a0f8446bddbbb5540163a96c2a6fde762823 (diff)
downloadRoughlyEnoughItems-3ac878f7cd6b1cd54bbf6ed2843bfe51bcdf1321.tar.gz
RoughlyEnoughItems-3ac878f7cd6b1cd54bbf6ed2843bfe51bcdf1321.tar.bz2
RoughlyEnoughItems-3ac878f7cd6b1cd54bbf6ed2843bfe51bcdf1321.zip
Merge remote-tracking branch 'Shnupbups/oxidation' into 6.x-1.17
Diffstat (limited to 'runtime/src')
-rwxr-xr-xruntime/src/main/resources/assets/roughlyenoughitems/lang/en_us.json4
1 files changed, 4 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 990b82aa0..7b7c40c8f 100755
--- a/runtime/src/main/resources/assets/roughlyenoughitems/lang/en_us.json
+++ b/runtime/src/main/resources/assets/roughlyenoughitems/lang/en_us.json
@@ -39,6 +39,10 @@
"category.rei.beacon_payment": "Beacon Payment",
"category.rei.tilling": "Tilling",
"category.rei.pathing": "Pathing",
+ "category.rei.waxing": "Waxing",
+ "category.rei.wax_scraping": "Wax Scraping",
+ "category.rei.oxidizing": "Oxidizing",
+ "category.rei.oxidation_scraping": "Oxidation Scraping",
"category.rei.information": "Information",
"text.rei.composting.chance": "§e%d%% Chance",
"text.rei.composting.page": "Page %d",