Skip to content

Actions: yairm210/Unciv

Actions

Conflict marking

Actions

Loading...
Loading

Show workflow options

Create status badge

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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Allow for city level stockpiles to actually function Conflict marking #8665: Pull request #12710 synchronize by SeventhM
December 26, 2024 06:44 9s
December 26, 2024 06:44 9s
fix UncivServer.xyz info in Multiplayer.md (#12711) Conflict marking #8664: Commit 905ef25 pushed by yairm210
December 26, 2024 06:26 2m 12s master
master
December 26, 2024 06:26 2m 12s
Allow for city level stockpiles to actually function Conflict marking #8663: Pull request #12710 synchronize by SeventhM
December 26, 2024 05:37 8s
December 26, 2024 05:37 8s
Allow for city level stockpiles to actually function Conflict marking #8662: Pull request #12710 synchronize by SeventhM
December 26, 2024 05:31 10s
December 26, 2024 05:31 10s
4.14.18 Conflict marking #8661: Commit e224ae6 pushed by yairm210
December 25, 2024 18:54 11s 4.14.18
4.14.18
December 25, 2024 18:54 11s
4.14.18 Conflict marking #8660: Commit e224ae6 pushed by yairm210
December 25, 2024 18:54 2m 9s master
master
December 25, 2024 18:54 2m 9s
Version rollout (#12709) Conflict marking #8659: Commit 647484a pushed by yairm210
December 25, 2024 18:46 2m 10s master
master
December 25, 2024 18:46 2m 10s
Simulation: More Robust Stats (#12675) Conflict marking #8658: Commit b948770 pushed by yairm210
December 25, 2024 18:45 2m 11s master
master
December 25, 2024 18:45 2m 11s
Update Croatian translation (#12693) Conflict marking #8657: Commit 3c5b4bb pushed by yairm210
December 25, 2024 18:44 13s version_rollout
version_rollout
December 25, 2024 18:44 13s
Update Russian.properties (#12694) Conflict marking #8656: Commit 66f7390 pushed by yairm210
December 25, 2024 18:44 10s version_rollout
version_rollout
December 25, 2024 18:44 10s
Update Indonesian.properties (#12695) Conflict marking #8655: Commit 1efa40e pushed by yairm210
December 25, 2024 18:44 9s version_rollout
version_rollout
December 25, 2024 18:44 9s
Update Brazilian_Portuguese.properties (#12696) Conflict marking #8654: Commit d59dd3e pushed by yairm210
December 25, 2024 18:44 9s version_rollout
version_rollout
December 25, 2024 18:44 9s
Update French.properties (#12698) Conflict marking #8653: Commit bc66fe8 pushed by yairm210
December 25, 2024 18:44 10s version_rollout
version_rollout
December 25, 2024 18:44 10s
Update Catalan.properties (#12700) Conflict marking #8652: Commit d8bae63 pushed by yairm210
December 25, 2024 18:44 13s version_rollout
version_rollout
December 25, 2024 18:44 13s
Update Latin translation (#12708) Conflict marking #8651: Commit b6e1fac pushed by yairm210
December 25, 2024 18:44 2m 12s version_rollout
version_rollout
December 25, 2024 18:44 2m 12s
Allow stat from battle uniques to also give stockpiles (#12689) Conflict marking #8650: Commit c7fb6fb pushed by yairm210
December 25, 2024 18:38 2m 10s master
master
December 25, 2024 18:38 2m 10s
Allow civs to trade with each other before settling their first citie… Conflict marking #8649: Commit fe5a2ac pushed by yairm210
December 25, 2024 18:37 2m 13s master
master
December 25, 2024 18:37 2m 13s
Delete duplicate trade denied message (#12707) Conflict marking #8648: Commit fc1454e pushed by yairm210
December 25, 2024 18:36 12s master
master
December 25, 2024 18:36 12s
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