Skip to content

Actions: yairm210/Unciv

Actions

Conflict marking

Actions

Loading...
Loading

Show workflow options

Create status badge

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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

chore: Split RegionStartFinder.findStart into subfunctions Conflict marking #8864: Commit d077f93 pushed by yairm210
January 11, 2025 21:54 2m 12s master
master
January 11, 2025 21:54 2m 12s
chore: Move region start functions into their own class Conflict marking #8863: Commit bfc7324 pushed by yairm210
January 11, 2025 21:35 2m 16s master
master
January 11, 2025 21:35 2m 16s
chore: Split strategic+bonus resource placement into subfunctions in … Conflict marking #8862: Commit 13405b5 pushed by yairm210
January 11, 2025 21:27 2m 11s master
master
January 11, 2025 21:27 2m 11s
chore: MapRegions simplification - usingArchipelagoRegions is now a T… Conflict marking #8861: Commit 5535c9a pushed by yairm210
January 11, 2025 20:54 2m 18s master
master
January 11, 2025 20:54 2m 18s
chore: minor Battle.kt simplification Conflict marking #8860: Commit 0201a9c pushed by yairm210
January 11, 2025 20:43 2m 11s master
master
January 11, 2025 20:43 2m 11s
4.15.2 Conflict marking #8859: Commit 00ff7b2 pushed by yairm210
January 11, 2025 19:55 2m 13s master
master
January 11, 2025 19:55 2m 13s
4.15.2 Conflict marking #8858: Commit 00ff7b2 pushed by yairm210
January 11, 2025 19:55 2m 13s 4.15.2
4.15.2
January 11, 2025 19:55 2m 13s
Remove "last seen improvements" that are no longer valid improvements… Conflict marking #8857: Commit 9b9f319 pushed by yairm210
January 11, 2025 19:52 2m 18s master
master
January 11, 2025 19:52 2m 18s
Update CityLocationTileRanker.kt Conflict marking #8856: Pull request #12774 synchronize by EmperorPinguin
January 11, 2025 19:52 2m 12s
January 11, 2025 19:52 2m 12s
Added option to change the Maximum Autosave turns stored Conflict marking #8855: Pull request #12790 synchronize by Emandac
January 11, 2025 19:46 12s
January 11, 2025 19:46 12s
Version rollout (#12792) Conflict marking #8854: Commit bfbd0ce pushed by yairm210
January 11, 2025 19:36 2m 12s master
master
January 11, 2025 19:36 2m 12s
Update Indonesian.properties (#12767) Conflict marking #8853: Commit 234e315 pushed by yairm210
January 11, 2025 19:35 11s version_rollout
version_rollout
January 11, 2025 19:35 11s
Update Spanish.properties (#12768) Conflict marking #8852: Commit 772fa89 pushed by yairm210
January 11, 2025 19:35 13s version_rollout
version_rollout
January 11, 2025 19:35 13s
Update Brazilian_Portuguese.properties (#12769) Conflict marking #8851: Commit d4caa77 pushed by yairm210
January 11, 2025 19:35 10s version_rollout
version_rollout
January 11, 2025 19:35 10s
translated changed lines (#12770) Conflict marking #8850: Commit 6c4be48 pushed by yairm210
January 11, 2025 19:35 8s version_rollout
version_rollout
January 11, 2025 19:35 8s
Update Italian.properties (#12771) Conflict marking #8849: Commit 26b10ae pushed by yairm210
January 11, 2025 19:34 2m 9s version_rollout
version_rollout
January 11, 2025 19:34 2m 9s
Update French.properties (#12773) Conflict marking #8848: Commit 34b2977 pushed by yairm210
January 11, 2025 19:34 11s version_rollout
version_rollout
January 11, 2025 19:34 11s
Update Latin translation (#12777) Conflict marking #8847: Commit 40a26a8 pushed by yairm210
January 11, 2025 19:34 2m 9s version_rollout
version_rollout
January 11, 2025 19:34 2m 9s
Update Russian.properties (#12778) Conflict marking #8846: Commit 23f4781 pushed by yairm210
January 11, 2025 19:34 2m 12s version_rollout
version_rollout
January 11, 2025 19:34 2m 12s
Update Catalan.properties (#12791) Conflict marking #8845: Commit f38cbd0 pushed by yairm210
January 11, 2025 19:34 12s version_rollout
version_rollout
January 11, 2025 19:34 12s
Tweaks for Screen Size small-portrait (#12782) Conflict marking #8844: Commit 6e77757 pushed by yairm210
January 11, 2025 19:32 2m 11s master
master
January 11, 2025 19:32 2m 11s
Tweaks for Screen Size small-portrait Conflict marking #8843: Pull request #12782 synchronize by sulai
January 11, 2025 19:02 11s
January 11, 2025 19:02 11s
Added option to change the Maximum Autosave turns stored Conflict marking #8842: Pull request #12790 synchronize by Emandac
January 11, 2025 18:32 10s
January 11, 2025 18:32 10s
Fixed tests Conflict marking #8841: Commit a90e7c4 pushed by yairm210
January 11, 2025 18:30 2m 11s master
master
January 11, 2025 18:30 2m 11s
Added option to change the Maximum Autosave turns stored Conflict marking #8840: Pull request #12790 synchronize by Emandac
January 11, 2025 18:10 13s
January 11, 2025 18:10 13s