Skip to content

Commit 85f2790

Browse files
authored
Merge branch 'main' into gold-fluctuations
2 parents 41c9590 + 5dde4cc commit 85f2790

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+812
-362
lines changed
1.71 MB
Loading
-436 Bytes
Loading
-280 Bytes
Loading
-330 Bytes
Loading
-476 Bytes
Loading
-310 Bytes
Loading
-467 Bytes
Loading

resources/lang/en.json

Lines changed: 9 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@
144144
"instant_build": "Instant build",
145145
"infinite_gold": "Infinite gold",
146146
"infinite_troops": "Infinite troops",
147-
"compact_map": "Mini Map",
147+
"compact_map": "Compact Map",
148148
"max_timer": "Game length (minutes)",
149149
"disable_nukes": "Disable Nukes",
150150
"automatic_difficulty": "Automatic Difficulty",
@@ -512,7 +512,13 @@
512512
"exit": "Exit Game",
513513
"keep": "Keep Playing",
514514
"spectate": "Spectate",
515-
"wishlist": "Wishlist on Steam!"
515+
"wishlist": "Wishlist on Steam!",
516+
"ofm_winter": "OpenFront Masters Winter Tournament!",
517+
"ofm_winter_description": "Join the competitive tournament and compete against the best players",
518+
"join_tournament": "Join Tournament",
519+
"join_discord": "Join Our Discord Community!",
520+
"discord_description": "Connect with other players, get updates, and share strategies",
521+
"join_server": "Join Server"
516522
},
517523
"leaderboard": {
518524
"title": "Leaderboard",
@@ -669,39 +675,7 @@
669675
"purchase": "Purchase this skin to unlock it."
670676
},
671677
"pattern": {
672-
"default": "Default",
673-
"custom": "Custom",
674-
"stripes_v": "Vertical",
675-
"stripes_h": "Horizontal",
676-
"horizontal_stripes": "Horizontal (Alt)",
677-
"vertical_bars": "Vertical (Alt)",
678-
"checkerboard": "Checkerboard",
679-
"choco": "Choco",
680-
"diagonal": "Diagonal",
681-
"cross": "Cross",
682-
"mini_cross": "Mini Cross",
683-
"sword": "Sword",
684-
"sparse_dots": "Sparse Dots",
685-
"evan": "Evan",
686-
"diagonal_stripe": "Diagonal Stripe",
687-
"mountain_ridge": "Mountain Ridge",
688-
"scattered_dots": "Scattered Dots",
689-
"circuit_board": "Circuit Board",
690-
"shells": "Shells",
691-
"-w-": ".w.",
692-
"white_rabbit": "White Rabbit",
693-
"goat": "Goat",
694-
"cats": "Cats",
695-
"cursor": "Cursor",
696-
"hand": "Hand",
697-
"radiation": "Radiation",
698-
"openfront_qr": "OpenFront.io QR code",
699-
"openfront": "OpenFront",
700-
"t_rex": "T-Rex",
701-
"embelem": "Emblem",
702-
"contributor": "Contributor",
703-
"grogu_head": "Grogu Head",
704-
"grogu": "Grogu"
678+
"default": "Default"
705679
}
706680
},
707681
"flag_input": {
-316 Bytes
Binary file not shown.
-438 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)