Skip to content

Actions: yairm210/Unciv

Actions

Conflict marking

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
4,877 workflow runs
4,877 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Add a field for global unit uniques Conflict marking #8918: Pull request #12775 synchronize by SeventhM
January 22, 2025 02:17 14s
January 22, 2025 02:17 14s
Add a field for global unit uniques Conflict marking #8917: Pull request #12775 synchronize by SeventhM
January 22, 2025 01:20 11s
January 22, 2025 01:20 11s
Add a field for global unit uniques Conflict marking #8916: Pull request #12775 synchronize by SeventhM
January 22, 2025 01:04 11s
January 22, 2025 01:04 11s
Multiplayer screen correctly handles errors when downloading mods Conflict marking #8915: Commit 2f79658 pushed by yairm210
January 21, 2025 10:13 2m 12s master
master
January 21, 2025 10:13 2m 12s
UnitTable: show a summary when no unit is selected Conflict marking #8914: Pull request #12832 synchronize by sulai
January 19, 2025 23:04 12s
January 19, 2025 23:04 12s
chore: Simplified validateInProgressConstructions Conflict marking #8913: Commit 159f2e5 pushed by yairm210
January 19, 2025 19:44 2m 10s master
master
January 19, 2025 19:44 2m 10s
chore: Simplified updateAllyForCityState Conflict marking #8912: Commit 678df50 pushed by yairm210
January 19, 2025 11:07 2m 11s master
master
January 19, 2025 11:07 2m 11s
chore: Split CityStateFunctions.cityStateAttacked into subfunctions Conflict marking #8911: Commit 350a0cb pushed by yairm210
January 19, 2025 11:03 2m 9s master
master
January 19, 2025 11:03 2m 9s
Resolved #12823 - "Cannot attack" accepts "vs" conditionals Conflict marking #8910: Commit 629081f pushed by yairm210
January 18, 2025 17:54 2m 14s master
master
January 18, 2025 17:54 2m 14s
4.15.3 Conflict marking #8909: Commit 263bb53 pushed by yairm210
January 18, 2025 17:42 2m 11s 4.15.3
4.15.3
January 18, 2025 17:42 2m 11s
4.15.3 Conflict marking #8908: Commit 263bb53 pushed by yairm210
January 18, 2025 17:42 2m 11s master
master
January 18, 2025 17:42 2m 11s
Version rollout (#12825) Conflict marking #8907: Commit c4a8c0c pushed by yairm210
January 18, 2025 17:31 2m 9s master
master
January 18, 2025 17:31 2m 9s
Update Indonesian.properties (#12793) Conflict marking #8906: Commit 152efe6 pushed by yairm210
January 18, 2025 17:19 2m 0s version_rollout
version_rollout
January 18, 2025 17:19 2m 0s
Update Ukrainian translations (#12795) Conflict marking #8905: Commit f14e588 pushed by yairm210
January 18, 2025 17:19 1m 59s version_rollout
version_rollout
January 18, 2025 17:19 1m 59s
Update Italian.properties (#12796) Conflict marking #8904: Commit b8bc378 pushed by yairm210
January 18, 2025 17:19 35s version_rollout
version_rollout
January 18, 2025 17:19 35s
Update Croatian translation (#12797) Conflict marking #8903: Commit 688f0b1 pushed by yairm210
January 18, 2025 17:18 2m 27s version_rollout
version_rollout
January 18, 2025 17:18 2m 27s
Update Brazilian_Portuguese.properties (#12803) Conflict marking #8902: Commit 08ef09b pushed by yairm210
January 18, 2025 17:18 2m 13s version_rollout
version_rollout
January 18, 2025 17:18 2m 13s
Update French.properties (#12804) Conflict marking #8901: Commit 24c46d3 pushed by yairm210
January 18, 2025 17:18 2m 9s version_rollout
version_rollout
January 18, 2025 17:18 2m 9s
Update German translation (#12810) Conflict marking #8900: Commit 85ae94f pushed by yairm210
January 18, 2025 17:18 2m 9s version_rollout
version_rollout
January 18, 2025 17:18 2m 9s
Update Spanish.properties (#12815) Conflict marking #8899: Commit 353c312 pushed by yairm210
January 18, 2025 17:18 2m 7s version_rollout
version_rollout
January 18, 2025 17:18 2m 7s
Update Russian.properties (#12818) Conflict marking #8898: Commit ec99197 pushed by yairm210
January 18, 2025 17:18 2m 11s version_rollout
version_rollout
January 18, 2025 17:18 2m 11s
Update Polish.properties (#12819) Conflict marking #8897: Commit 488bf8d pushed by yairm210
January 18, 2025 17:18 2m 9s version_rollout
version_rollout
January 18, 2025 17:18 2m 9s
Small update Dutch (#12821) Conflict marking #8896: Commit ff476de pushed by yairm210
January 18, 2025 17:18 2m 10s version_rollout
version_rollout
January 18, 2025 17:18 2m 10s
Fixed unique buildings/improvements with zeroed stat not showing befo… Conflict marking #8895: Commit 5f58fe3 pushed by yairm210
January 18, 2025 17:17 2m 9s master
master
January 18, 2025 17:17 2m 9s
Fixed unique buildings/improvements with zeroed stat not showing befo… Conflict marking #8894: Commit fa72cfe pushed by yairm210
January 18, 2025 17:16 14s fix-worker-improvement-crash
fix-worker-improvement-crash
January 18, 2025 17:16 14s