Skip to content

Actions: yairm210/Unciv

Actions

Conflict marking

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
3,970 workflow runs
3,970 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Extract other classes out of Unique.kt Conflict marking #9527: Commit 4718d34 pushed by yairm210
April 9, 2025 11:05 2m 7s master
master
April 9, 2025 11:05 2m 7s
For cached stored in LocalUniqueCache, don't apply multiplication whe… Conflict marking #9526: Commit d5c6758 pushed by yairm210
April 9, 2025 10:49 2m 9s master
master
April 9, 2025 10:49 2m 9s
Update Indonesian.properties Conflict marking #9525: Pull request #13175 synchronize by Xenia2003
April 9, 2025 08:39 7s
April 9, 2025 08:39 7s
Update Indonesian.properties Conflict marking #9524: Pull request #13175 synchronize by Xenia2003
April 9, 2025 08:05 8s
April 9, 2025 08:05 8s
Update Indonesian.properties Conflict marking #9523: Pull request #13175 synchronize by Xenia2003
April 9, 2025 07:33 7s
April 9, 2025 07:33 7s
Update Indonesian.properties Conflict marking #9522: Pull request #13175 synchronize by Xenia2003
April 8, 2025 23:04 9s
April 8, 2025 23:04 9s
Update Indonesian.properties Conflict marking #9521: Pull request #13175 synchronize by Xenia2003
April 8, 2025 22:30 8s
April 8, 2025 22:30 8s
added 2 unique to change name/appearance of civ Conflict marking #9520: Pull request #13105 synchronize by Emandac
April 8, 2025 20:02 15s
April 8, 2025 20:02 15s
Resolved #13172 - City states don't get continually researchable tech… Conflict marking #9519: Commit 0bcf7f9 pushed by yairm210
April 8, 2025 16:58 2m 11s master
master
April 8, 2025 16:58 2m 11s
4.16.2 Conflict marking #9518: Commit 0c23171 pushed by yairm210
April 8, 2025 11:23 2m 9s 4.16.2
4.16.2
April 8, 2025 11:23 2m 9s
4.16.2 Conflict marking #9517: Commit 0c23171 pushed by yairm210
April 8, 2025 11:23 2m 9s master
master
April 8, 2025 11:23 2m 9s
4.16.2 Conflict marking #9516: Commit 3d0c445 pushed by yairm210
April 8, 2025 11:06 2m 9s master
master
April 8, 2025 11:06 2m 9s
4.16.2 Conflict marking #9515: Commit 3d0c445 pushed by yairm210
April 8, 2025 11:06 2m 7s 4.16.2
4.16.2
April 8, 2025 11:06 2m 7s
Version rollout (#13170) Conflict marking #9514: Commit 3f66208 pushed by yairm210
April 8, 2025 09:29 2m 11s master
master
April 8, 2025 09:29 2m 11s
Update Italian.properties (#13151) Conflict marking #9513: Commit a2c2d14 pushed by yairm210
April 8, 2025 09:21 8s version_rollout
version_rollout
April 8, 2025 09:21 8s
Update French.properties (#13155) Conflict marking #9512: Commit bbc65c8 pushed by yairm210
April 8, 2025 09:21 8s version_rollout
version_rollout
April 8, 2025 09:21 8s
Update Indonesian.properties (#13156) Conflict marking #9511: Commit e80c9cf pushed by yairm210
April 8, 2025 09:21 10s version_rollout
version_rollout
April 8, 2025 09:21 10s
Update Brazilian_Portuguese.properties (#13159) Conflict marking #9510: Commit c813d24 pushed by yairm210
April 8, 2025 09:21 7s version_rollout
version_rollout
April 8, 2025 09:21 7s
update Simplified_Chinese.properties (#13163) Conflict marking #9509: Commit 8fb7314 pushed by yairm210
April 8, 2025 09:21 8s version_rollout
version_rollout
April 8, 2025 09:21 8s
Update Galician.properties (#13166) Conflict marking #9508: Commit 5b7ad80 pushed by yairm210
April 8, 2025 09:21 13s version_rollout
version_rollout
April 8, 2025 09:21 13s
Update German translation (#13169) Conflict marking #9507: Commit dea844e pushed by yairm210
April 8, 2025 09:21 10s version_rollout
version_rollout
April 8, 2025 09:21 10s
Eureka unique (#13130) Conflict marking #9506: Commit 64c94f5 pushed by yairm210
April 8, 2025 09:20 2m 8s master
master
April 8, 2025 09:20 2m 8s
Improve save file name and errors handling (#13164) Conflict marking #9505: Commit a26e71b pushed by yairm210
April 8, 2025 09:19 2m 8s master
master
April 8, 2025 09:19 2m 8s
Added settings for circles vs hexagons for movable tiles, since it's … Conflict marking #9504: Commit 269335e pushed by yairm210
April 8, 2025 09:19 2m 10s master
master
April 8, 2025 09:19 2m 10s
Countables : Next "pass" (#13168) Conflict marking #9503: Commit 2025d2a pushed by yairm210
April 8, 2025 07:56 2m 11s master
master
April 8, 2025 07:56 2m 11s