Skip to content

Actions: yairm210/Unciv

Actions

Conflict marking

Actions

Loading...
Loading

Show workflow options

Create status badge

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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Better battle menu Conflict marking #9380: Pull request #13076 synchronize by k-oa
March 20, 2025 21:31 8s
March 20, 2025 21:31 8s
Better battle menu Conflict marking #9379: Pull request #13076 synchronize by k-oa
March 20, 2025 20:23 8s
March 20, 2025 20:23 8s
Better battle menu Conflict marking #9378: Pull request #13076 synchronize by k-oa
March 20, 2025 19:49 7s
March 20, 2025 19:49 7s
4.15.18 Conflict marking #9377: Commit 5430954 pushed by yairm210
March 20, 2025 18:37 2m 8s master
master
March 20, 2025 18:37 2m 8s
4.15.18 Conflict marking #9376: Commit 5430954 pushed by yairm210
March 20, 2025 18:37 2m 11s 4.15.18
4.15.18
March 20, 2025 18:37 2m 11s
Forest chopping moddability Conflict marking #9375: Pull request #13072 synchronize by EmperorPinguin
March 20, 2025 18:36 10s
March 20, 2025 18:36 10s
Forest chopping moddability Conflict marking #9374: Pull request #13072 synchronize by EmperorPinguin
March 20, 2025 18:35 8s
March 20, 2025 18:35 8s
Stats in notifications no longer with black icons Conflict marking #9373: Commit 46c5bb0 pushed by yairm210
March 20, 2025 18:34 2m 7s master
master
March 20, 2025 18:34 2m 7s
Version rollout (#13080) Conflict marking #9372: Commit b8d1d80 pushed by yairm210
March 20, 2025 18:18 2m 11s master
master
March 20, 2025 18:18 2m 11s
Version rollout Conflict marking #9371: Pull request #13080 synchronize by yairm210
March 20, 2025 18:18 2m 8s
March 20, 2025 18:18 2m 8s
Update Catalan.properties (#13077) Conflict marking #9370: Commit ed122e7 pushed by yairm210
March 20, 2025 18:18 8s version_rollout
version_rollout
March 20, 2025 18:18 8s
Forest chopping moddability Conflict marking #9369: Pull request #13072 synchronize by EmperorPinguin
March 20, 2025 17:06 10m 13s
March 20, 2025 17:06 10m 13s
Forest chopping moddability Conflict marking #9368: Pull request #13072 synchronize by EmperorPinguin
March 20, 2025 16:49 10m 7s
March 20, 2025 16:49 10m 7s
Forest chopping moddability Conflict marking #9367: Pull request #13072 synchronize by EmperorPinguin
March 20, 2025 16:43 10m 13s
March 20, 2025 16:43 10m 13s
Forest chopping moddability Conflict marking #9366: Pull request #13072 synchronize by EmperorPinguin
March 20, 2025 16:40 10m 13s
March 20, 2025 16:40 10m 13s
Forest chopping moddability Conflict marking #9365: Pull request #13072 synchronize by EmperorPinguin
March 20, 2025 15:18 10m 11s
March 20, 2025 15:18 10m 11s
Support BNW score formula (#13079) Conflict marking #9364: Commit 8925744 pushed by yairm210
March 20, 2025 14:06 2m 12s master
master
March 20, 2025 14:06 2m 12s
Resolved #9487 - Hide bomb shelters when nuclear weapons are disabled Conflict marking #9363: Commit e532c00 pushed by yairm210
March 20, 2025 14:04 2m 8s master
master
March 20, 2025 14:04 2m 8s
Better battle menu Conflict marking #9362: Pull request #13076 synchronize by k-oa
March 19, 2025 22:30 11s
March 19, 2025 22:30 11s
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