merge amazing-config-update into 1.20.1-backport

2 files changed, 16 insertions, 0 deletions

diff --git a/src/main/resources/assets/frank/lang/en_ca.json b/src/main/resources/assets/frank/lang/en_ca.json
new file mode 100644
index 0000000..07f9fda
--- /dev/null
+++ b/src/main/resources/assets/frank/lang/en_ca.json
@@ -0,0 +1,4 @@
+{
+  "ui.frank.config.text_colour": "Text Colour",
+  "ui.frank.config.text_colour.tooltip": "Hexadecimal RGB value for the text colour."
+}
diff --git a/src/main/resources/assets/frank/lang/en_us.json b/src/main/resources/assets/frank/lang/en_us.json
index ca2862d..1a7471d 100644
--- a/src/main/resources/assets/frank/lang/en_us.json
+++ b/src/main/resources/assets/frank/lang/en_us.json
@@ -1,5 +1,17 @@
 {
   "ui.frank.time_left": "Time remaining: %sm %ss",
   "ui.frank.smeltable": "Items smeltable: %s",
+
+  "ui.frank.config": "Configuration - Frank",
+  "ui.frank.config.preview": "Preview",
+  "ui.frank.config.time_left_first": "Time Left First",
+  "ui.frank.config.time_left_only": "Time Left Only",
+  "ui.frank.config.items_smeltable_first": "Items Smeltable First",
+  "ui.frank.config.items_smeltable_only": "Items Smeltable Only",
+  "ui.frank.config.disabled": "Disabled",
+  "ui.frank.config.display_mode": "Display Mode",
+  "ui.frank.config.text_colour": "Text Color",
+  "ui.frank.config.text_colour.tooltip": "Hexadecimal RGB value for the text color.",
+
   "frank.matrix": "Matrix"
 }