From 72b48dd116599fb86f44723f2f23a2b634e33618 Mon Sep 17 00:00:00 2001 From: James Date: Thu, 28 Mar 2024 14:24:12 -0500 Subject: [PATCH 1/2] Remove duplicate sprite error in trident and hex2t tilesets --- data/hex2t.tilespec | 2 +- data/trident.tilespec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/hex2t.tilespec b/data/hex2t.tilespec index 987a8d3307..59fcd9d666 100644 --- a/data/hex2t.tilespec +++ b/data/hex2t.tilespec @@ -151,7 +151,7 @@ files = "misc/governments.spec", "misc/specialists.spec", "trident/buildings.spec", - "misc/wonders.spec", +; "misc/wonders.spec", "misc/flags.spec", "misc/shields.spec", "misc/cursors.spec", diff --git a/data/trident.tilespec b/data/trident.tilespec index 7a18342479..53e81b7584 100644 --- a/data/trident.tilespec +++ b/data/trident.tilespec @@ -153,7 +153,7 @@ files = "trident/grid.spec", "trident/roads.spec", "trident/buildings.spec", - "misc/wonders.spec", +; "misc/wonders.spec", "misc/space.spec", "misc/techs.spec", "misc/treaty.spec", From 047fc18ba9e49ce05b7c0c48103dc8f2cbca3463 Mon Sep 17 00:00:00 2001 From: James Date: Thu, 28 Mar 2024 17:08:42 -0500 Subject: [PATCH 2/2] Remove wonders line instead of comment per review --- data/hex2t.tilespec | 1 - data/trident.tilespec | 1 - 2 files changed, 2 deletions(-) diff --git a/data/hex2t.tilespec b/data/hex2t.tilespec index 59fcd9d666..87a86b1c68 100644 --- a/data/hex2t.tilespec +++ b/data/hex2t.tilespec @@ -151,7 +151,6 @@ files = "misc/governments.spec", "misc/specialists.spec", "trident/buildings.spec", -; "misc/wonders.spec", "misc/flags.spec", "misc/shields.spec", "misc/cursors.spec", diff --git a/data/trident.tilespec b/data/trident.tilespec index 53e81b7584..d43d3351ba 100644 --- a/data/trident.tilespec +++ b/data/trident.tilespec @@ -153,7 +153,6 @@ files = "trident/grid.spec", "trident/roads.spec", "trident/buildings.spec", -; "misc/wonders.spec", "misc/space.spec", "misc/techs.spec", "misc/treaty.spec",