Skip to content

Actions: yairm210/Unciv

Actions

Conflict marking

Actions

Loading...
Loading

Show workflow options

Create status badge

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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

4.15.5 Conflict marking #8975: Commit 1e20fd1 pushed by yairm210
January 26, 2025 09:48 2m 10s master
master
January 26, 2025 09:48 2m 10s
4.15.5 Conflict marking #8974: Commit 1e20fd1 pushed by yairm210
January 26, 2025 09:48 13s 4.15.5
4.15.5
January 26, 2025 09:48 13s
Version rollout (#12861) Conflict marking #8973: Commit ec5dfd1 pushed by yairm210
January 26, 2025 09:43 13s master
master
January 26, 2025 09:43 13s
perf(render): Ignore act() for minimap Conflict marking #8972: Commit fbbd8d6 pushed by yairm210
January 26, 2025 09:43 2m 10s master
master
January 26, 2025 09:43 2m 10s
Update Italian.properties (#12850) Conflict marking #8971: Commit 7231921 pushed by yairm210
January 26, 2025 09:26 12s version_rollout
version_rollout
January 26, 2025 09:26 12s
Update Indonesian.properties (#12851) Conflict marking #8970: Commit acca269 pushed by yairm210
January 26, 2025 09:26 9s version_rollout
version_rollout
January 26, 2025 09:26 9s
translate new lines and minor fix (#12852) Conflict marking #8969: Commit 4d9dd81 pushed by yairm210
January 26, 2025 09:26 9s version_rollout
version_rollout
January 26, 2025 09:26 9s
Update French.properties (#12854) Conflict marking #8968: Commit 085fea3 pushed by yairm210
January 26, 2025 09:26 12s version_rollout
version_rollout
January 26, 2025 09:26 12s
Update German translation (#12855) Conflict marking #8967: Commit ce009a6 pushed by yairm210
January 26, 2025 09:26 2m 9s version_rollout
version_rollout
January 26, 2025 09:26 2m 9s
Update Spanish.properties (#12856) Conflict marking #8966: Commit b1c4dde pushed by yairm210
January 26, 2025 09:26 9s version_rollout
version_rollout
January 26, 2025 09:26 9s
Update Brazilian_Portuguese.properties (#12860) Conflict marking #8965: Commit 8c93847 pushed by yairm210
January 26, 2025 09:26 10s version_rollout
version_rollout
January 26, 2025 09:26 10s
UnitTable: show a summary when no unit is selected (#12832) Conflict marking #8964: Commit 477c6c5 pushed by yairm210
January 26, 2025 09:24 2m 13s master
master
January 26, 2025 09:24 2m 13s
Fix sticky tooltips (#12859) Conflict marking #8963: Commit 0a68485 pushed by yairm210
January 26, 2025 09:24 2m 12s master
master
January 26, 2025 09:24 2m 12s
Prerender the "pillaged improvement" icon as well Conflict marking #8962: Commit 45d8535 pushed by yairm210
January 26, 2025 09:01 2m 12s master
master
January 26, 2025 09:01 2m 12s
perf(render): Converted improvement images to prerendered images Conflict marking #8961: Commit 0b19463 pushed by yairm210
January 26, 2025 08:47 2m 12s master
master
January 26, 2025 08:47 2m 12s
Update Brazilian_Portuguese.properties Conflict marking #8960: Pull request #12860 synchronize by Ranbut
January 25, 2025 17:24 12s
January 25, 2025 17:24 12s
perf(render): Create dynamic texture for resources so swaps are only … Conflict marking #8959: Commit 9f8c93d pushed by yairm210
January 24, 2025 09:48 2m 15s master
master
January 24, 2025 09:48 2m 15s
chore: Genericify on-the-fly texture packing to be source agnostic Conflict marking #8958: Commit 31aaf3c pushed by yairm210
January 24, 2025 08:53 2m 12s master
master
January 24, 2025 08:53 2m 12s
chore: Stat image setup separated to a distinct function - we don't n… Conflict marking #8957: Commit 6c2fd82 pushed by yairm210
January 24, 2025 08:48 2m 15s master
master
January 24, 2025 08:48 2m 15s
perf(render): Separate resource icons into separate layer Conflict marking #8956: Commit e4b3d2e pushed by yairm210
January 24, 2025 08:46 2m 14s master
master
January 24, 2025 08:46 2m 14s
Add small Skip/Cycle Button Conflict marking #8955: Pull request #12845 synchronize by itanasi
January 24, 2025 06:20 12s
January 24, 2025 06:20 12s
Add small Skip/Cycle Button Conflict marking #8954: Pull request #12845 synchronize by itanasi
January 24, 2025 06:17 10s
January 24, 2025 06:17 10s
Add small Skip/Cycle Button Conflict marking #8953: Pull request #12845 synchronize by itanasi
January 24, 2025 04:43 11s
January 24, 2025 04:43 11s
Correctly reset pixmap packer when loading a new ruleset Conflict marking #8952: Commit d34d2cb pushed by yairm210
January 23, 2025 15:48 2m 11s master
master
January 23, 2025 15:48 2m 11s
perf(render): Yields rendered from a dynamically created texture Conflict marking #8951: Commit 6234171 pushed by yairm210
January 23, 2025 15:45 2m 14s master
master
January 23, 2025 15:45 2m 14s