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

Fixed multiple buy buttons in construction info table Conflict marking #9043: Commit 08f874a pushed by yairm210
February 2, 2025 10:26 2m 15s master
master
February 2, 2025 10:26 2m 15s
4.15.7 Conflict marking #9042: Commit ec3fac9 pushed by yairm210
February 1, 2025 21:30 2m 11s master
master
February 1, 2025 21:30 2m 11s
4.15.7 Conflict marking #9041: Commit ec3fac9 pushed by yairm210
February 1, 2025 21:30 2m 11s 4.15.7
4.15.7
February 1, 2025 21:30 2m 11s
Version rollout (#12895) Conflict marking #9040: Commit 53db1ce pushed by yairm210
February 1, 2025 21:25 2m 10s master
master
February 1, 2025 21:25 2m 10s
Update Indonesian.properties (#12878) Conflict marking #9039: Commit 199e4ce pushed by yairm210
February 1, 2025 21:22 14s version_rollout
version_rollout
February 1, 2025 21:22 14s
Uppdate German translation (#12879) Conflict marking #9038: Commit 94af60d pushed by yairm210
February 1, 2025 21:22 12s version_rollout
version_rollout
February 1, 2025 21:22 12s
Update Italian.properties (#12880) Conflict marking #9037: Commit 6022789 pushed by yairm210
February 1, 2025 21:22 8s version_rollout
version_rollout
February 1, 2025 21:22 8s
translate new lines (#12881) Conflict marking #9036: Commit 632b916 pushed by yairm210
February 1, 2025 21:22 10s version_rollout
version_rollout
February 1, 2025 21:22 10s
fixing a word (#12883) Conflict marking #9035: Commit c1e5eb8 pushed by yairm210
February 1, 2025 21:22 10s version_rollout
version_rollout
February 1, 2025 21:22 10s
Update French.properties (#12884) Conflict marking #9034: Commit e6778d0 pushed by yairm210
February 1, 2025 21:22 2m 11s version_rollout
version_rollout
February 1, 2025 21:22 2m 11s
Update Thai.properties (#12885) Conflict marking #9033: Commit d81d78f pushed by yairm210
February 1, 2025 21:22 2m 9s version_rollout
version_rollout
February 1, 2025 21:22 2m 9s
Update Spanish.properties (#12886) Conflict marking #9032: Commit f28e1cb pushed by yairm210
February 1, 2025 21:22 2m 12s version_rollout
version_rollout
February 1, 2025 21:22 2m 12s
Update Catalan.properties (#12887) Conflict marking #9031: Commit 0a73996 pushed by yairm210
February 1, 2025 21:22 2m 10s version_rollout
version_rollout
February 1, 2025 21:22 2m 10s
Update Latin translation (#12891) Conflict marking #9030: Commit a4d10b9 pushed by yairm210
February 1, 2025 21:22 2m 10s version_rollout
version_rollout
February 1, 2025 21:22 2m 10s
Fix Assignment Cycling (#12890) Conflict marking #9029: Commit 3748eca pushed by yairm210
February 1, 2025 21:20 2m 15s master
master
February 1, 2025 21:20 2m 15s
Revert all texture packing Conflict marking #9028: Commit 714923e pushed by yairm210
February 1, 2025 21:16 2m 11s master
master
February 1, 2025 21:16 2m 11s
Avoid crash when failing to load mods due to clipboard size smaller t… Conflict marking #9027: Commit 454a0e6 pushed by yairm210
February 1, 2025 17:14 2m 12s master
master
February 1, 2025 17:14 2m 12s
Fixed Unciv not starting on MacOS Conflict marking #9026: Commit a3f83a7 pushed by yairm210
February 1, 2025 17:03 11s 4.15.6-patch1-macOS
4.15.6-patch1-macOS
February 1, 2025 17:03 11s
Fixed Unciv not starting on MacOS Conflict marking #9025: Commit a3f83a7 pushed by yairm210
February 1, 2025 17:02 2m 13s master
master
February 1, 2025 17:02 2m 13s
Add small Skip/Cycle Button Conflict marking #9024: Pull request #12845 synchronize by itanasi
January 31, 2025 23:26 11s
January 31, 2025 23:26 11s
Add small Skip/Cycle Button Conflict marking #9023: Pull request #12845 synchronize by itanasi
January 30, 2025 16:18 11s
January 30, 2025 16:18 11s
Add small Skip/Cycle Button Conflict marking #9022: Pull request #12845 synchronize by itanasi
January 30, 2025 05:18 9s
January 30, 2025 05:18 9s
Add small Skip/Cycle Button Conflict marking #9021: Pull request #12845 synchronize by itanasi
January 30, 2025 05:14 11s
January 30, 2025 05:14 11s
4.15.6-patch1 Conflict marking #9020: Commit 80ced8f pushed by yairm210
January 29, 2025 17:48 15s master
master
January 29, 2025 17:48 15s
4.15.6-patch1 Conflict marking #9019: Commit 80ced8f pushed by yairm210
January 29, 2025 17:48 11s 4.15.6-patch1
4.15.6-patch1
January 29, 2025 17:48 11s