Skip to content

Actions: yairm210/Unciv

Actions

Conflict marking

Actions

Loading...
Loading

Show workflow options

Create status badge

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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Forest chopping moddability Conflict marking #9361: Pull request #13072 synchronize by EmperorPinguin
March 19, 2025 17:52 9s
March 19, 2025 17:52 9s
Modding: "Costs [amount] [stockpiledResource]" accepts game speed mod… Conflict marking #9360: Commit 9094a6d pushed by yairm210
March 19, 2025 13:33 2m 8s master
master
March 19, 2025 13:33 2m 8s
Modding: "Must be next to [tileFilter]" includes the center tile as well Conflict marking #9359: Commit 8e4763a pushed by yairm210
March 19, 2025 06:54 2m 7s master
master
March 19, 2025 06:54 2m 7s
Completing policy branches give leaders titles Conflict marking #9358: Pull request #13062 synchronize by govUA
March 18, 2025 06:45 9s
March 18, 2025 06:45 9s
Forest chopping moddability Conflict marking #9357: Pull request #13072 synchronize by EmperorPinguin
March 17, 2025 18:42 10s
March 17, 2025 18:42 10s
Forest chopping moddability Conflict marking #9356: Pull request #13072 synchronize by EmperorPinguin
March 17, 2025 18:38 8s
March 17, 2025 18:38 8s
Console: Allowed alt-navigation and deletion :D Conflict marking #9355: Commit 26d9523 pushed by yairm210
March 17, 2025 12:07 2m 7s master
master
March 17, 2025 12:07 2m 7s
Hopefully decrease OOMs on crash screen Conflict marking #9354: Commit 34b6b27 pushed by yairm210
March 17, 2025 09:57 2m 10s master
master
March 17, 2025 09:57 2m 10s
Forest chopping moddability Conflict marking #9353: Pull request #13072 synchronize by EmperorPinguin
March 17, 2025 08:55 9s
March 17, 2025 08:55 9s
Forest chopping moddability Conflict marking #9352: Pull request #13072 synchronize by EmperorPinguin
March 16, 2025 22:32 10s
March 16, 2025 22:32 10s
Forest chopping moddability Conflict marking #9351: Pull request #13072 synchronize by EmperorPinguin
March 16, 2025 22:23 7s
March 16, 2025 22:23 7s
Forest chopping moddability Conflict marking #9350: Pull request #13072 synchronize by EmperorPinguin
March 16, 2025 22:22 7s
March 16, 2025 22:22 7s
Forest chopping moddability Conflict marking #9349: Pull request #13072 synchronize by EmperorPinguin
March 16, 2025 22:13 7s
March 16, 2025 22:13 7s
Forest chopping moddability Conflict marking #9348: Pull request #13072 synchronize by EmperorPinguin
March 16, 2025 22:12 6s
March 16, 2025 22:12 6s
Forest chopping moddability Conflict marking #9347: Pull request #13072 synchronize by EmperorPinguin
March 16, 2025 22:11 10s
March 16, 2025 22:11 10s
Forest chopping moddability Conflict marking #9346: Pull request #13072 synchronize by EmperorPinguin
March 16, 2025 22:10 10s
March 16, 2025 22:10 10s
4.15.17 Conflict marking #9345: Commit df2c1da pushed by yairm210
March 16, 2025 20:48 2m 9s master
master
March 16, 2025 20:48 2m 9s
4.15.17 Conflict marking #9344: Commit df2c1da pushed by yairm210
March 16, 2025 20:48 2m 9s 4.15.17
4.15.17
March 16, 2025 20:48 2m 9s
Version rollout (#13074) Conflict marking #9343: Commit fcce59c pushed by yairm210
March 16, 2025 20:44 2m 7s master
master
March 16, 2025 20:44 2m 7s
Update Indonesian.properties (#13054) Conflict marking #9342: Commit 0bb63af pushed by yairm210
March 16, 2025 20:41 12s version_rollout
version_rollout
March 16, 2025 20:41 12s
translate new line (#13055) Conflict marking #9341: Commit 6e37d07 pushed by yairm210
March 16, 2025 20:41 7s version_rollout
version_rollout
March 16, 2025 20:41 7s
Update Brazilian_Portuguese.properties (#13056) Conflict marking #9340: Commit 1d45be6 pushed by yairm210
March 16, 2025 20:41 7s version_rollout
version_rollout
March 16, 2025 20:41 7s
Update French.properties (#13057) Conflict marking #9339: Commit acb5c4e pushed by yairm210
March 16, 2025 20:41 6s version_rollout
version_rollout
March 16, 2025 20:41 6s
Update Italian.properties (#13059) Conflict marking #9338: Commit e8cd8ab pushed by yairm210
March 16, 2025 20:41 8s version_rollout
version_rollout
March 16, 2025 20:41 8s
Update Latin translation (#13060) Conflict marking #9337: Commit b4509a5 pushed by yairm210
March 16, 2025 20:41 2m 11s version_rollout
version_rollout
March 16, 2025 20:41 2m 11s