Skip to content

Actions: Ouaz/Unciv

Actions

Conflict marking

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
124 workflow runs
124 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Update French.properties Conflict marking #121: Commit f308e82 pushed by Ouaz
December 15, 2023 20:02 14s patch-1
patch-1
December 15, 2023 20:02 14s
Update French.properties Conflict marking #120: Commit 8b12b4a pushed by Ouaz
December 13, 2023 23:51 17s patch-1
patch-1
December 13, 2023 23:51 17s
Add modified nation descriptions (vanilla) Conflict marking #119: Commit daf0536 pushed by Ouaz
December 8, 2023 19:31 1m 52s patch-2
patch-2
December 8, 2023 19:31 1m 52s
Update French.properties Conflict marking #118: Commit 160ad4d pushed by Ouaz
December 7, 2023 22:05 13s patch-1
patch-1
December 7, 2023 22:05 13s
Update French.properties Conflict marking #117: Commit 27f7625 pushed by Ouaz
December 4, 2023 22:30 14s patch-1
patch-1
December 4, 2023 22:30 14s
More improvements to UI Tips article Conflict marking #116: Commit 32c232b pushed by Ouaz
December 1, 2023 19:06 14s patch-3
patch-3
December 1, 2023 19:06 14s
Correct fix for Carthage article Conflict marking #115: Commit 02ab36f pushed by Ouaz
December 1, 2023 18:41 10s patch-4
patch-4
December 1, 2023 18:41 10s
Fix Carthage article Conflict marking #114: Commit 75c8673 pushed by Ouaz
November 30, 2023 22:42 12s patch-4
patch-4
November 30, 2023 22:42 12s
Improve UI Tips article Conflict marking #113: Commit 2eb6ecb pushed by Ouaz
November 30, 2023 22:05 14s patch-3
patch-3
November 30, 2023 22:05 14s
Update French.properties Conflict marking #112: Commit 8aa8ef6 pushed by Ouaz
November 30, 2023 19:54 13s patch-1
patch-1
November 30, 2023 19:54 13s
Add an "UI tips" civilopedia article Conflict marking #111: Commit a2f945d pushed by Ouaz
November 29, 2023 22:01 12s patch-3
patch-3
November 29, 2023 22:01 12s
Update French.properties Conflict marking #110: Commit 02088f0 pushed by Ouaz
November 29, 2023 20:19 10s patch-1
patch-1
November 29, 2023 20:19 10s
Update French.properties Conflict marking #109: Commit c5b0c1a pushed by Ouaz
November 28, 2023 21:31 11s patch-1
patch-1
November 28, 2023 21:31 11s
Update French.properties Conflict marking #108: Commit 72bee49 pushed by Ouaz
November 27, 2023 21:20 11s patch-1
patch-1
November 27, 2023 21:20 11s
Update French.properties Conflict marking #107: Commit 3e3cb52 pushed by Ouaz
November 23, 2023 18:37 11s patch-1
patch-1
November 23, 2023 18:37 11s
Update French.properties Conflict marking #106: Commit 003f51a pushed by Ouaz
November 20, 2023 21:52 14s patch-1
patch-1
November 20, 2023 21:52 14s
Fix missing unit type translations Conflict marking #105: Commit 91c186e pushed by Ouaz
November 20, 2023 21:24 13s patch-3
patch-3
November 20, 2023 21:24 13s
Revert changes in template.properties Conflict marking #104: Commit d4d16da pushed by Ouaz
November 20, 2023 21:20 13s patch-3
patch-3
November 20, 2023 21:20 13s
Add back "general" unit types Conflict marking #103: Commit 81fb3a8 pushed by Ouaz
November 19, 2023 20:00 13s patch-3
patch-3
November 19, 2023 20:00 13s
Update French.properties Conflict marking #102: Commit 0c8f77a pushed by Ouaz
November 19, 2023 19:29 14s patch-1
patch-1
November 19, 2023 19:29 14s
Update French.properties Conflict marking #101: Commit cbdeac9 pushed by Ouaz
November 14, 2023 19:57 37s patch-1
patch-1
November 14, 2023 19:57 37s
Update French.properties Conflict marking #100: Commit 23fc0d4 pushed by Ouaz
November 3, 2023 19:47 16s patch-1
patch-1
November 3, 2023 19:47 16s
Update French.properties Conflict marking #99: Commit ea144b8 pushed by Ouaz
October 30, 2023 16:58 16s patch-1
patch-1
October 30, 2023 16:58 16s
Update French.properties Conflict marking #98: Commit 4eb69d6 pushed by Ouaz
October 23, 2023 18:41 12s patch-1
patch-1
October 23, 2023 18:41 12s