Merge upstream/master into keywordlocale

Resolved conflicts in Keyword.java and en-US.properties: kept the
localized 3-arg Keyword constructor and forwarded the upstream
ENCHANT reminder format-arg fix (%s -> %1$s) into lblKwAbilityEnchantReminder.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

Author: MostCromulent

CONTRIBUTING.md

@@ -62,6 +62,12 @@ Card scripting resources are found in the forge-gui/res/ path.
 
 Art files need to be copyright-free and they should be in the public domain.
 
+## Using AI coding agents
+
+If you use an AI agent (e.g. Claude Code, OpenAI Codex) to substantially code a contribution to Forge please identify this when you make a pull request, either by including the coding agent as a co-author or by noting in the body of the request.
+
+Agents have a tendency to add unnecessary new unit or wiring tests to the CI suite. This should be avoided unless necessary to catch potential future integration regressions.
+
 ### Project Hierarchy
 
 Forge is divided into 4 primary projects with additional projects that target specific platform releases. The primary projects are:

docs/Credit-and-Thanks.md

@@ -1,32 +1,38 @@
 ## Special Thanks
-1. Quest icons created by Teekatas, from his Legendora set - [Link](http://raindropmemory.deviantart.com/)
-1. Thanks to the XMage team for permission to use their targeting arrows.
-1. Thanks to http://www.freesound.org/browse/ for providing some sound files.
-1. Credit to Kevin Macleod for the royalty free music that is used.
-1. Credit to Juhani Junkala for the royalty free music for boss battles - [Link](https://opengameart.org/content/boss-battle-music)
+- Quest icons created by Teekatas, from his Legendora set - [Link](http://raindropmemory.deviantart.com/)
+- Thanks to the XMage team for permission to use their targeting arrows.
+- Thanks to http://www.freesound.org/browse/ for providing some sound files.
+- Credit to Kevin Macleod for the royalty free music that is used.
+- Credit to Juhani Junkala for the royalty free music for boss battles - [Link](https://opengameart.org/content/boss-battle-music)
 
-## Adventure Mode Sprites and tiles.
+## Sprites and icons
+
+### Adventure Mode
 Some of the sprites and tiles that are used in Adventure mode come from external artists. These fall under the ownership of their respective artists and may be used only under the conditions laid out in their respective licence.
 
-1. Credit to Reddit user [wampastompah](https://www.reddit.com/user/wampastompah) for the sprites of iconic MTG characters that are used in Adventure mode
-1. Credit to [Aleksandr Makarov's](https://itch.io/profile/iknowkingrabbit) pixelart (tiles and sprites) that are used in Adventure mode.
-1. Credit to [Elthen](https://linktr.ee/elthen) for his sprites that are used in adventure mode.
-1. Credit to [DeepDiveGameStudio](https://deepdivegamestudio.itch.io) for some of the sprites that are used in adventure mode.
-1. Credit to [Krishna Palacio](https://itch.io/profile/krishna-palacio) for some of the sprites and tiles that are used in adventure mode.
-1. Credit to https://opengameart.org/ for some of the tiles. More in dept creditation of the tiles used can be found [Here](https://docs.google.com/spreadsheets/d/e/2PACX-1vTD0L8yDltZnn4025CZ9exhziCj0rbpd2aKE-0qeHikVBz51OKaAHLsgFuaDuIWrkrqIJicxzdn3SG1/pubhtml)
+- Credit to Reddit user [wampastompah](https://www.reddit.com/user/wampastompah) for the sprites of iconic MTG characters that are used in Adventure mode
+- Credit to [Aleksandr Makarov's](https://itch.io/profile/iknowkingrabbit) pixelart (tiles and sprites) that are used in Adventure mode.
+- Credit to [Elthen](https://linktr.ee/elthen) for his sprites that are used in adventure mode.
+- Credit to [DeepDiveGameStudio](https://deepdivegamestudio.itch.io) for some of the sprites that are used in adventure mode.
+- Credit to [Krishna Palacio](https://itch.io/profile/krishna-palacio) for some of the sprites and tiles that are used in adventure mode.
+- Credit to https://opengameart.org/ for some of the tiles. More in dept creditation of the tiles used can be found [Here](https://docs.google.com/spreadsheets/d/e/2PACX-1vTD0L8yDltZnn4025CZ9exhziCj0rbpd2aKE-0qeHikVBz51OKaAHLsgFuaDuIWrkrqIJicxzdn3SG1/pubhtml)
+
+### Other sprites and icons
+- Clipboard icon by Dimitry Miroliubov at [Flaticon](https://www.flaticon.com/free-icon/clipboard_340068)
+- Dock-bar icons by [Lorc](https://lorcblog.blogspot.com/), [Delapouite](https://delapouite.com/), and Skoll, sourced from [game-icons.net](https://game-icons.net/), licensed under [CC BY 3.0](https://creativecommons.org/licenses/by/3.0/).
 
 ## Soundtrack
 
 ### Adventure
-1. Battle = Rising Legion - Derek Fiechter//Assyrian Fortress - Derek Fiechter//Goblin Raid - Brandon Fiechter//  As we Marched -  Vindsvept //  Mecha Dwarves - Derek Fiechter
-1. Boss = 
-1. Inn= Wild Boar's Inn - Brandon Fiechter// Black Rock - Logan Epic Canto //The Land of Gnomes - Logan Epic Canto//Dance of the Red Lights- Logan Epic Canto // Poland - Brandon Fiechter // Tir Nan Og - Logan Epic Canto // Village Consort -Kevin Macleod
-1. Dungeon = Swamp Witch - Derek Fiechter // Giant Mushrooms - Derek Fiechter// Cobweb Fairies - Derek Fiechter
-1. Menus = Vindsvept - Wanderer // Vindsvept - Lake of Light
-1. Waste biome = Vindsvept - Through the Woods we Ran // Vindsvept - Adventure
-1. Swamp biome = Merky Swamp - Brandon Fiechter // Masquerade of the Ghosts - Brandon Fiechter
-1. Island biome = Pirates of the Coast - Brandon Fiechter & Derek Fiechter//Buried Treasure - Brandon Fiechter & Derek Fiechter
-1. Forest biome = Enchanted Forest - Logan Epic Canto // The Celtic King
-1. Plains biome = Cobblestone Village - Brandon Fiechter //  Camelot - Brandon Fiechter
-1. Mountain biome = Goblin Tinker - Brandon Fiechter // Goblin King's Tavern - Brandon Fiechter
-1. Castle = Horus - Brandon Fiechter & Derek Fiechter
+- Battle = Rising Legion - Derek Fiechter//Assyrian Fortress - Derek Fiechter//Goblin Raid - Brandon Fiechter//  As we Marched -  Vindsvept //  Mecha Dwarves - Derek Fiechter
+- Boss = 
+- Inn= Wild Boar's Inn - Brandon Fiechter// Black Rock - Logan Epic Canto //The Land of Gnomes - Logan Epic Canto//Dance of the Red Lights- Logan Epic Canto // Poland - Brandon Fiechter // Tir Nan Og - Logan Epic Canto // Village Consort -Kevin Macleod
+- Dungeon = Swamp Witch - Derek Fiechter // Giant Mushrooms - Derek Fiechter// Cobweb Fairies - Derek Fiechter
+- Menus = Vindsvept - Wanderer // Vindsvept - Lake of Light
+- Waste biome = Vindsvept - Through the Woods we Ran // Vindsvept - Adventure
+- Swamp biome = Merky Swamp - Brandon Fiechter // Masquerade of the Ghosts - Brandon Fiechter
+- Island biome = Pirates of the Coast - Brandon Fiechter & Derek Fiechter//Buried Treasure - Brandon Fiechter & Derek Fiechter
+- Forest biome = Enchanted Forest - Logan Epic Canto // The Celtic King
+- Plains biome = Cobblestone Village - Brandon Fiechter //  Camelot - Brandon Fiechter
+- Mountain biome = Goblin Tinker - Brandon Fiechter // Goblin King's Tavern - Brandon Fiechter
+- Castle = Horus - Brandon Fiechter & Derek Fiechter

docs/Development/UI-Guidelines.md

@@ -0,0 +1,71 @@
+# UI Guidelines
+
+Forge is a volunteer project and creativity is encouraged! This page is not a hard rule-book — the guidelines below are intended to give some direction to contributors submitting UI changes and help maintain a consistent UI approach across the project.
+
+## Contents
+
+- [UI Design Principles](#ui-design-principles)
+- [Where Should a New Setting or Option Live?](#where-should-a-new-setting-or-option-live)
+  - [Desktop](#desktop)
+    - [Game Menu](#game-menu)
+    - [Dock Panel](#dock-panel)
+    - [Preferences Menu](#preferences-menu)
+  - [Mobile](#mobile)
+    - [Game Menu](#game-menu-1)
+    - [Settings](#settings)
+
+---
+
+## UI Design Principles
+
+- Aim to be intuitive and user-friendly.
+- Involve a good mix of dynamic and static elements.
+- Use reasonable, context-driven default options.
+- User-facing elements should always use localisation keys, not hard-coded strings.
+- UI elements should be compatible with theme skinning — prefer skin-aware components and colours over hard-coded styles.
+- The default Forge skin should favour accessibility.
+
+---
+
+## Where Should a New Setting or Option Live?
+
+### Desktop
+
+#### Game Menu
+
+- **Purpose:** detailed in-match configuration options.
+- **Heuristic:** if it affects in-match gameplay or display and the user might want to change it mid-match, it should live in the Game menu for easy access.
+
+The in-match menu bar is divided into the following top-level submenus:
+
+- **Game** — how the user interacts with game state (e.g. yield options, auto yields and triggers, concede).
+- **Layout** — visual UI and layout (e.g. XML layout files, theme selection, UI panel options).
+- **Display** — how game state is displayed to the user (e.g. card overlays, targeting arcs, stack/group token options, separate combatants toggle).
+- **Audio** — sound and music settings.
+
+Conventions:
+
+- If a new feature involves suboptions (not just a single checkbox), group them together in a submenu.
+- Avoid nesting menu items more than 3 levels deep (e.g. `Forge > Game > Stack/Group options` is as deep as we want to go).
+
+#### Dock Panel
+
+- **Purpose:** quick shortcuts and toggles for the most commonly used gameplay functions.
+- **Heuristic:** if the user would need to navigate the game menu multiple times per match to change a setting, it should have a button here.
+- The dock is only ever a mirror of a setting or option — never the exclusive entry point.
+
+#### Preferences Menu
+
+- **Purpose:** comprehensive access to all available user preferences and options.
+- The search filter makes this menu cheap to add to — don't be overly concerned about menu length.
+
+### Mobile
+
+#### Game Menu
+
+Physical space is at a premium on mobile, so only the most essential settings a user needs to access in-match should appear in the game menu. Generally these will be settings that involve interacting with game state, not just display options.
+
+#### Settings
+
+- **Purpose:** comprehensive access to all available user preferences and options.
+- The search filter makes this menu cheap to add to — don't be overly concerned about menu length.

docs/Development/ownership.md

@@ -5,9 +5,9 @@ Please also try to check back a bit after your PR gets merged in case it causes
 ## DevOps
 | Concept | Owners | Ancestors | Example tasks |
 | - | - | - | - |
-| PC Releases | friarsol | Agetian | - update Maven dependencies |
+| PC Releases | friarsol | Agetian | - update Maven dependencies<br>- maintain CI files |
 | Android Releases | | kevlahnota | |
-| Sentry | JaminCollins | | - watch for rare/unusual crashes |
+| Sentry | JaminCollins | | - watch trends for rare/unusual crashes |
 
 ## Ingame Engine
 | Concept | Owners | Ancestors | Example tasks |
@@ -26,7 +26,7 @@ Please also try to check back a bit after your PR gets merged in case it causes
 ## User Interface
 | Concept | Owners | Ancestors | Example tasks |
 | - | - | - | - |
-| Desktop | | | |
+| Desktop | | | - performance profiling |
 | Android | | DrDev, kevlahnota | - test new libGDX versions |
 | Localization | | Alumi | - update card translation files<br>- update engine text (native speaker not required) |
 | Sound effects | | | |
@@ -41,7 +41,7 @@ Please also try to check back a bit after your PR gets merged in case it causes
 | Concept | Owners | Ancestors | Example tasks |
 | - | - | - | - |
 | Quest | friarsol | | |
-| [Network Play](../network-play.md) | | JaminCollins | |
+| [Network Play](../network-play.md) | MostCromulent | JaminCollins | |
 | Gauntlet | | | |
 | Draft | | | |
 | Planar Conquest | | DrDev | |
@@ -61,4 +61,4 @@ Please also try to check back a bit after your PR gets merged in case it causes
 ## Miscellaneous
 | Concept | Owners | Ancestors | Example tasks |
 | - | - | - | - |
-| Documentation | | | - update Wiki |
+| Documentation | TRT | | - update Wiki |

docs/Frequently-Asked-Questions.md

@@ -9,7 +9,6 @@ https://discord.com/channels/267367946135928833/1047001034788196452
 # General
 
 ## How do I download content?
-
 Forge has content downloaders within the app itself, you can use those tools to update the graphics assets. More information about card and token image assets can be found here. [Card Images, Downloading](Card-Images.md#downloading)
 
 ## My desktop match/deck view is all messed up?
@@ -20,7 +19,6 @@ Sometimes people will decide that they do not like the changes that they made an
 Also use the mentioned measure if your match or deckeditor won't start - it would help in 90% of the cases.
 
 ## I think I found a bug in Forge. What do I do?
-
 *Most users, who are running beta versions of Forge, should continue to use these instructions. As for alpha testers, these instructions have yet to be made congruent with the latest automatic bug reporting from within Forge.*
 
 Bug reports from users are the lifeblood of Forge. Please keep in mind that "beta" releases *are* test releases. Forge is constantly evolving, so we do not yet have "stable" or "production" releases. Because of the pace at which new cards are added to the multiverse by external forces, this will be the  norm for some time. We do not expect everything to work 100%. We have a small number of developers and a handful of slightly less technical people actively improving the game. We simply cannot devote the resources to test every single card, much less the nearly infinite ways the cards can interact.
@@ -38,13 +36,11 @@ Because duplicate bug reports use up our limited resources, please research your
 * If you're unsure, you can also post on one of the support channels of the discord. In case you do not get a timely response, please submit a new issue anyway to make sure it doesn't get lost.
 
 ## I have an idea to make Forge better. What do I do?
-
 Follow the directions in [Bug Reports](Frequently-Asked-Questions#i-think-i-found-a-bug-in-forge-what-do-i-do), keeping in mind that you are not reporting a bug, but rather a **Feature Request**.
 
 # Development
 
 ## I want to help develop Forge. How do I get started?
-
 Forge is written in Java, so knowledge in that language (or similar Object Oriented languages like C++ or C\#) is very helpful. However, it is possible to learn the grammar for writing the data objects of cards without programming experience.
 
 A development environment such as [IntelliJ](https://www.jetbrains.com/idea) is beneficial, as it helps writing, compiling and testing your changes.
@@ -64,25 +60,20 @@ For smaller first-time contributions using the GitHub web interface is also an a
 To obtain the source code of Forge, read our [Development Guide](Development/IntelliJ-setup/IntelliJ-setup.md).
 
 ## My system is all setup to help. What now?
-
 Take a look through the /res/cardsfolder folder. This is where all the card data lives. If you know of cards that are missing from Forge, see if there are similar cards that already exist.
 
 # Gameplay
 
 ## Where do I use Flashback or a similar ability that is in an External area?
-
 Click on the Lightning Bolt icon in the player panel. Since cards with external Activations aren't as clear to activate, we created this shortcut for this specific purpose. After the last card is removed from a zone window, that window will automatically be hidden.
 
 ## How do I target a player?
-
 Just click on the player's Avatar in the Player Panel when prompted to select a Player as a target.
 
 ## Where did my mana go?
-
 If you have an effect that generated you some mana, and you don't know where it is. Check out the Player Panel. There are 6 different mana subpools one for each color/colorless that should have it. If you accidentally tapped your mana before your Main Phase, your mana is gone. Sorry, we don't have a way at this time to revert these actions. In general, I'd say it's easier/better to start casting a spell first, then activate your mana so this doesn't happen.
 
 # Quest Mode
 
 ## What is the difference between Fantasy Quest and Normal Quest?
-
-In Normal Quest, you start with 20 life and only have access to the Card Shop. In Fantasy Quest, you start at 15 life and gain additional access to the Bazaar which allows you to buy things like extra life points, Pets, Plants and more.
+In Normal Quest, you start with 20 life and only have access to the Card Shop. In Fantasy, you start at 15 life and gain additional access to the Bazaar which allows you to buy things like extra life points, Pets, Plants and more.

docs/Network-Play.md

@@ -45,22 +45,22 @@
 
 1. **Configure network** — Host must configure network settings to enable external connections (see [Network Configuration](#network-configuration) below).
 2. **Verify versions** — Confirm all devices are running the same Forge version (see [Version Compatibility](#version-compatibility) below).
-3. **Launch Forge** on all devices.
+3. **Launch Forge** on all devices and navigate to the online play screen.
      - Mobile: Choose "Classic Mode", then "Play Online"
-     - Desktop: "Online Multiplayer" > "Lobby" > "Connect to Server"
-4. **Host** leaves the server address field **empty** and clicks OK.
+     - Desktop: "Online Multiplayer" > "Lobby"
+4. **Host** clicks **"Host a Game"** to start the server.
      - On first host, Forge will ask whether to **automatically open the port via UPnP** (see [UPnP](#upnp-automatic-port-forwarding) below). If your router supports UPnP, choosing "Just Once" or "Always" can skip manual port forwarding entirely.
 5. **Host** determines address to share with clients:
      - **Local play:** Use the **Copy Local URL** button in the lobby — this copies the address in the correct format. Forge displays the host's IP (typically `192.168.x.x`). Verify against the device's network settings. Ignore any suggestion to use `localhost`.
      - **Remote play:** Use the **Copy External URL** button in the lobby — if necessary verify the external IP at [canyouseeme.org](http://canyouseeme.org).
- 7. **Client** enters the host's IP address in the connection dialog and clicks OK.
+6. **Client** clicks **"Join a Game"** and enters the host's address.
      - The address format is **`IP:port`** — for example: `192.168.1.50:36743` (local) or `203.0.113.45:36743` (remote).
      - If the port is omitted, Forge defaults to 36743 (=FORGE on older phone keypads).
-8. **Configure the match:**
+7. **Configure the match:**
      - Host selects match type, teams, and game settings.
      - All players select decks, sleeves, and avatars.
      - Each player toggles their **Ready** switch.
-9. **Host starts the match** once all players are ready.
+8. **Host starts the match** once all players are ready.
 
 ---