Merge branch 'master' of github.com:Faboslav/friends-and-foes

* 'master' of github.com:Faboslav/friends-and-foes: Update `en_us.json` & `ru_ru.json` (#265) # Conflicts: # common/src/main/resources/assets/friendsandfoes/lang/en_us.json
Faboslav · Sep 27, 2024 · f696f1a · f696f1a
2 parents 07b681a + 13ed921
commit f696f1a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/common/src/main/resources/assets/friendsandfoes/lang/en_us.json b/common/src/main/resources/assets/friendsandfoes/lang/en_us.json
@@ -142,4 +142,4 @@
 	"trinkets.slot.charm.charm": "Charm",
 	"text.betterf3.line.glares": "Glares",
 	"text.betterf3.line.rascals": "Rascals"
-}
+}
diff --git a/common/src/main/resources/assets/friendsandfoes/lang/ru_ru.json b/common/src/main/resources/assets/friendsandfoes/lang/ru_ru.json
@@ -142,4 +142,4 @@
 	"trinkets.slot.charm.charm": "Амулет",
 	"text.betterf3.line.glares": "Остроликие",
 	"text.betterf3.line.rascals": "Негодники"
-}
+}