From 1daff914c5f53ffb8151303c8b8119c2dcc5162c Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Wed, 10 Jun 2020 10:23:14 -0700 Subject: Sync with upstream --- 14_tiles2_32x32_22365-27564.png | Bin 3753420 -> 3755229 bytes 1_tiles_32x32_0-5199.png | Bin 4727334 -> 4727061 bytes tile_config.json | 6 +++--- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/14_tiles2_32x32_22365-27564.png b/14_tiles2_32x32_22365-27564.png index 0b14c7d..6d7a478 100644 Binary files a/14_tiles2_32x32_22365-27564.png and b/14_tiles2_32x32_22365-27564.png differ diff --git a/1_tiles_32x32_0-5199.png b/1_tiles_32x32_0-5199.png index 11face8..f4bb974 100644 Binary files a/1_tiles_32x32_0-5199.png and b/1_tiles_32x32_0-5199.png differ diff --git a/tile_config.json b/tile_config.json index 4f5f148..33b83e8 100644 --- a/tile_config.json +++ b/tile_config.json @@ -47039,13 +47039,13 @@ "rotates": false }, { - "id": [ "556", "bp_556" ], + "id": [ "!556", "!bp_556" ], "fg": 61, "bg": 957, "rotates": false }, { - "id": [ "556_incendiary", "bp_556_incendiary" ], + "id": [ "!556_incendiary", "!bp_556_incendiary" ], "fg": 62, "bg": 957, "rotates": false @@ -53990,7 +53990,7 @@ "rotates": false }, { - "id": ["8mm_bootleg_jsp", "270win_jsp", "reloaded_270win_jsp", "bp_270win_jsp" ], + "id": ["8mm_bootleg_jsp", "270win_jsp", "!reloaded_270win_jsp", "!bp_270win_jsp" ], "fg": 3937, "bg": 957, "rotates": false -- cgit v1.2.1