Skip to content

Actions: yairm210/Unciv

Actions

Conflict marking

Actions

Loading...
Loading

Show workflow options

Create status badge

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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Update Croatian translation (#12651) Conflict marking #8596: Commit 8fea4ae pushed by yairm210
December 16, 2024 08:56 18s version_rollout
version_rollout
December 16, 2024 08:56 18s
Update Brazilian_Portuguese.properties (#12654) Conflict marking #8595: Commit fdf766a pushed by yairm210
December 16, 2024 08:56 17s version_rollout
version_rollout
December 16, 2024 08:56 17s
Update Dutch.properties (#12664) Conflict marking #8594: Commit 5e6286d pushed by yairm210
December 16, 2024 08:56 12s version_rollout
version_rollout
December 16, 2024 08:56 12s
UI: standardised alignment and creation of options checkboxes, Unciv-… Conflict marking #8593: Commit c68b194 pushed by yairm210
December 16, 2024 08:55 12s master
master
December 16, 2024 08:55 12s
Add unified unique for gaining stats or stockpiles (#12642) Conflict marking #8592: Commit ae28dca pushed by yairm210
December 16, 2024 08:54 2m 12s master
master
December 16, 2024 08:54 2m 12s
Simulation: Save Stat support (#12663) Conflict marking #8591: Commit 2963d47 pushed by yairm210
December 16, 2024 08:54 13s master
master
December 16, 2024 08:54 13s
Use unit state for trigger conditionals for gaining new units (#12660) Conflict marking #8590: Commit 7918123 pushed by yairm210
December 16, 2024 08:54 2m 12s master
master
December 16, 2024 08:54 2m 12s
Update ConstructionAutomation.kt (#12659) Conflict marking #8589: Commit e7b73c0 pushed by yairm210
December 16, 2024 08:53 13s master
master
December 16, 2024 08:53 13s
Prevent incorrect settler retreat (#12652) Conflict marking #8588: Commit 203222a pushed by yairm210
December 16, 2024 08:53 4m 11s master
master
December 16, 2024 08:53 4m 11s
Make pantheon cost respect game speed modifer (#12635) Conflict marking #8587: Commit b55e02f pushed by yairm210
December 16, 2024 08:53 2m 11s master
master
December 16, 2024 08:53 2m 11s
Simulation: Save Stat support Conflict marking #8586: Pull request #12663 synchronize by itanasi
December 16, 2024 08:03 14s
December 16, 2024 08:03 14s
Update Croatian translation Conflict marking #8585: Pull request #12651 synchronize by metablaster
December 16, 2024 08:01 9s
December 16, 2024 08:01 9s
Update Croatian translation Conflict marking #8584: Pull request #12651 synchronize by metablaster
December 16, 2024 08:00 14s
December 16, 2024 08:00 14s
Simulation: Save Stat support Conflict marking #8583: Pull request #12663 synchronize by itanasi
December 16, 2024 07:33 13s
December 16, 2024 07:33 13s
Simulation: Save Stat support Conflict marking #8582: Pull request #12663 synchronize by itanasi
December 16, 2024 07:13 11s
December 16, 2024 07:13 11s
Simulation: Save Stat support Conflict marking #8581: Pull request #12663 synchronize by itanasi
December 16, 2024 07:02 11s
December 16, 2024 07:02 11s
Simulation: Save Stat support Conflict marking #8580: Pull request #12663 synchronize by itanasi
December 16, 2024 06:59 11s
December 16, 2024 06:59 11s
Simulation: Save Stat support Conflict marking #8579: Pull request #12663 synchronize by itanasi
December 16, 2024 06:38 11s
December 16, 2024 06:38 11s
Quick edit so Simulation report is in consistent order (#12661) Conflict marking #8578: Commit f07444e pushed by yairm210
December 16, 2024 04:42 2m 12s master
master
December 16, 2024 04:42 2m 12s
Rebalance Food Weights Conflict marking #8577: Pull request #12582 synchronize by itanasi
December 16, 2024 04:04 14s
December 16, 2024 04:04 14s
Update Croatian translation Conflict marking #8576: Pull request #12651 synchronize by metablaster
December 15, 2024 23:14 12s
December 15, 2024 23:14 12s
Update Croatian translation Conflict marking #8575: Pull request #12651 synchronize by metablaster
December 15, 2024 23:13 10s
December 15, 2024 23:13 10s
UI: standardised alignment and creation of options checkboxes, Unciv-themed slider buttons, multiplayer settings server text field layout and spacing Conflict marking #8574: Pull request #12650 synchronize by Toxile
December 15, 2024 22:40 12s
December 15, 2024 22:40 12s
UI: standardised alignment and creation of options checkboxes, Unciv-themed slider buttons, multiplayer settings server text field layout and spacing Conflict marking #8573: Pull request #12650 synchronize by Toxile
December 15, 2024 22:38 11s
December 15, 2024 22:38 11s
Resolved #12637 - Paused music no longer resumes on game resume Conflict marking #8572: Commit b06708f pushed by yairm210
December 15, 2024 20:13 2m 10s master
master
December 15, 2024 20:13 2m 10s