Skip to content

Actions: yairm210/Unciv

Actions

Conflict marking

Actions

Loading...
Loading

Show workflow options

Create status badge

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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Cancel the chain reaction of defense pact (#12703) Conflict marking #8647: Commit 87817dd pushed by yairm210
December 25, 2024 18:36 2m 12s master
master
December 25, 2024 18:36 2m 12s
Cancel the chain reaction of defense pact Conflict marking #8646: Pull request #12703 synchronize by czyh2022
December 24, 2024 14:12 18s
December 24, 2024 14:12 18s
Fix gaining resources twice when it is gained from a city (#12699) Conflict marking #8645: Commit 81a8585 pushed by yairm210
December 23, 2024 06:51 2m 11s master
master
December 23, 2024 06:51 2m 11s
undo Conflict marking #8644: Commit 4428d25 pushed by yairm210
December 22, 2024 20:49 2m 13s master
master
December 22, 2024 20:49 2m 13s
Allow stat from battle uniques to also give stockpiles Conflict marking #8643: Pull request #12689 synchronize by SeventhM
December 22, 2024 20:36 11s
December 22, 2024 20:36 11s
Allow stat from battle uniques to also give stockpiles Conflict marking #8642: Pull request #12689 synchronize by SeventhM
December 22, 2024 20:28 9s
December 22, 2024 20:28 9s
Cache edge images for faster update()s on all tilegroups (e.g. unit c… Conflict marking #8641: Commit 2b0cc5c pushed by yairm210
December 22, 2024 19:40 2m 14s master
master
December 22, 2024 19:40 2m 14s
Resolved #12677 - "close unit table" button does not cycle units Conflict marking #8640: Commit 4638301 pushed by yairm210
December 22, 2024 11:12 2m 13s master
master
December 22, 2024 11:12 2m 13s
Update Russian.properties Conflict marking #8639: Pull request #12694 synchronize by dadadnet
December 22, 2024 10:04 9s
December 22, 2024 10:04 9s
Update Croatian translation Conflict marking #8638: Pull request #12693 synchronize by metablaster
December 22, 2024 09:38 10s
December 22, 2024 09:38 10s
4.14.17 Conflict marking #8637: Commit f6c342f pushed by yairm210
December 22, 2024 09:01 2m 11s 4.14.17
4.14.17
December 22, 2024 09:01 2m 11s
4.14.17 Conflict marking #8636: Commit f6c342f pushed by yairm210
December 22, 2024 09:01 2m 10s master
master
December 22, 2024 09:01 2m 10s
Resolved #12687 - Flank attack unique works with 'vs' conditionals Conflict marking #8635: Commit efc0cf0 pushed by yairm210
December 22, 2024 09:00 2m 12s master
master
December 22, 2024 09:00 2m 12s
Resolved #12678 - city-states don't take unique units from barbarians… Conflict marking #8634: Commit 7eb642d pushed by yairm210
December 22, 2024 08:45 2m 10s master
master
December 22, 2024 08:45 2m 10s
Version rollout (#12692) Conflict marking #8633: Commit 5320223 pushed by yairm210
December 22, 2024 08:18 2m 10s master
master
December 22, 2024 08:18 2m 10s
Update Indonesian.properties (#12667) Conflict marking #8632: Commit 546c082 pushed by yairm210
December 22, 2024 08:14 12s version_rollout
version_rollout
December 22, 2024 08:14 12s
Update Croatian translation (#12668) Conflict marking #8631: Commit 628286a pushed by yairm210
December 22, 2024 08:14 14s version_rollout
version_rollout
December 22, 2024 08:14 14s
Update Brazilian_Portuguese.properties (#12669) Conflict marking #8630: Commit a4ba6b6 pushed by yairm210
December 22, 2024 08:14 14s version_rollout
version_rollout
December 22, 2024 08:14 14s
Update Russian.properties (#12670) Conflict marking #8629: Commit 32c12bf pushed by yairm210
December 22, 2024 08:14 7s version_rollout
version_rollout
December 22, 2024 08:14 7s
Update French.properties (#12671) Conflict marking #8628: Commit 1d2cc16 pushed by yairm210
December 22, 2024 08:14 8s version_rollout
version_rollout
December 22, 2024 08:14 8s
Update Italian.properties (#12674) Conflict marking #8627: Commit d386917 pushed by yairm210
December 22, 2024 08:14 9s version_rollout
version_rollout
December 22, 2024 08:14 9s
Update Latin translation (#12683) Conflict marking #8626: Commit e49ed2f pushed by yairm210
December 22, 2024 08:14 10s version_rollout
version_rollout
December 22, 2024 08:14 10s
Update Dutch.properties (#12684) Conflict marking #8625: Commit dd0af75 pushed by yairm210
December 22, 2024 08:14 2m 10s version_rollout
version_rollout
December 22, 2024 08:14 2m 10s
Add unique for increased improvement rates rather than decreased buil… Conflict marking #8624: Commit a6bacca pushed by yairm210
December 22, 2024 08:13 2m 9s master
master
December 22, 2024 08:13 2m 9s
UI: various improvements mostly relating to centering and WorldScreen… Conflict marking #8623: Commit f9e69fb pushed by yairm210
December 22, 2024 08:10 2m 14s master
master
December 22, 2024 08:10 2m 14s