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

Update Croatian translation (#12826) Conflict marking #8943: Commit 6299914 pushed by yairm210
January 22, 2025 15:43 2m 8s version_rollout
version_rollout
January 22, 2025 15:43 2m 8s
Update Polish.properties (#12827) Conflict marking #8942: Commit e58216e pushed by yairm210
January 22, 2025 15:43 2m 6s version_rollout
version_rollout
January 22, 2025 15:43 2m 6s
Update Italian.properties (#12829) Conflict marking #8941: Commit 951b6da pushed by yairm210
January 22, 2025 15:43 2m 5s version_rollout
version_rollout
January 22, 2025 15:43 2m 5s
Update Indonesian.properties (#12830) Conflict marking #8940: Commit d5abf71 pushed by yairm210
January 22, 2025 15:43 1m 15s version_rollout
version_rollout
January 22, 2025 15:43 1m 15s
Update Catalan.properties (#12833) Conflict marking #8939: Commit 1f7fad7 pushed by yairm210
January 22, 2025 15:43 1m 11s version_rollout
version_rollout
January 22, 2025 15:43 1m 11s
Update French.properties (#12835) Conflict marking #8938: Commit e73125a pushed by yairm210
January 22, 2025 15:43 1m 5s version_rollout
version_rollout
January 22, 2025 15:43 1m 5s
Update Spanish.properties (#12836) Conflict marking #8937: Commit 98fd63a pushed by yairm210
January 22, 2025 15:43 1m 4s version_rollout
version_rollout
January 22, 2025 15:43 1m 4s
Update German translation (#12839) Conflict marking #8936: Commit d52ea21 pushed by yairm210
January 22, 2025 15:43 2m 14s version_rollout
version_rollout
January 22, 2025 15:43 2m 14s
Update Latin translation (#12840) Conflict marking #8935: Commit 690a4bf pushed by yairm210
January 22, 2025 15:43 2m 13s version_rollout
version_rollout
January 22, 2025 15:43 2m 13s
Turkish.properties (#12841) Conflict marking #8934: Commit 3d4bc9f pushed by yairm210
January 22, 2025 15:43 11s version_rollout
version_rollout
January 22, 2025 15:43 11s
Update Ukrainian translations (#12842) Conflict marking #8933: Commit 6625fc8 pushed by yairm210
January 22, 2025 15:42 12s version_rollout
version_rollout
January 22, 2025 15:42 12s
feat: Brazilian_Portuguese.properties (#12848) Conflict marking #8932: Commit b877d33 pushed by yairm210
January 22, 2025 15:42 2m 11s version_rollout
version_rollout
January 22, 2025 15:42 2m 11s
Add a field for global unit uniques (#12775) Conflict marking #8931: Commit 45347cc pushed by yairm210
January 22, 2025 15:41 2m 10s master
master
January 22, 2025 15:41 2m 10s
Added an UniqueType to Found puppet city. (#12834) Conflict marking #8930: Commit 19d0fbc pushed by yairm210
January 22, 2025 15:40 2m 11s master
master
January 22, 2025 15:40 2m 11s
Allow building improvements on terrains that only allow some improvem… Conflict marking #8929: Commit 9fc2510 pushed by yairm210
January 22, 2025 15:39 2m 10s master
master
January 22, 2025 15:39 2m 10s
Add conditional for when you aren't in a golden age (#12844) Conflict marking #8928: Commit f5ec43b pushed by yairm210
January 22, 2025 15:38 2m 12s master
master
January 22, 2025 15:38 2m 12s
Set Avoid Growth=false on capture (#12828) Conflict marking #8927: Commit 32856f9 pushed by yairm210
January 22, 2025 15:38 2m 12s master
master
January 22, 2025 15:38 2m 12s
Changes (#12846) Conflict marking #8926: Commit 05d246c pushed by yairm210
January 22, 2025 15:32 2m 14s master
master
January 22, 2025 15:32 2m 14s
Greeting stats translated correctly in notifications Conflict marking #8925: Commit 35b21d9 pushed by yairm210
January 22, 2025 12:29 2m 16s master
master
January 22, 2025 12:29 2m 16s
Update Croatian translation Conflict marking #8924: Pull request #12826 synchronize by metablaster
January 22, 2025 06:24 12s
January 22, 2025 06:24 12s
Update Croatian translation Conflict marking #8923: Pull request #12826 synchronize by metablaster
January 22, 2025 06:22 13s
January 22, 2025 06:22 13s
Allow building improvements on terrains that only allow some improvements when it has multiple uniques Conflict marking #8922: Pull request #12847 synchronize by SeventhM
January 22, 2025 05:24 11s
January 22, 2025 05:24 11s
Add small Skip/Cycle Button Conflict marking #8921: Pull request #12845 synchronize by itanasi
January 22, 2025 04:44 12s
January 22, 2025 04:44 12s
Add small Skip/Cycle Button Conflict marking #8920: Pull request #12845 synchronize by itanasi
January 22, 2025 04:37 12s
January 22, 2025 04:37 12s
Add small Skip/Cycle Button Conflict marking #8919: Pull request #12845 synchronize by itanasi
January 22, 2025 04:25 14s
January 22, 2025 04:25 14s