From 90a34264d8c08212d7d1349e1d091b47f085b3b7 Mon Sep 17 00:00:00 2001
From: ZwerOxotnik <zweroxotnik@gmail.com>
Date: Mon, 28 Oct 2024 02:50:54 +0300
Subject: [PATCH] Update to 0.17.5

---
 LICENCE                  |  2 +-
 README.md                |  2 +-
 changelog.txt            |  5 +++++
 data-api/fakes.lua       | 10 +++++-----
 experimental/lazyAPI.lua | 11 ++++++-----
 info.json                |  2 +-
 static-libs              |  2 +-
 7 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/LICENCE b/LICENCE
index bb37fba..0d9dfce 100644
--- a/LICENCE
+++ b/LICENCE
@@ -1,4 +1,4 @@
-Copyright (C) 2018-2023 ZwerOxotnik <zweroxotnik@gmail.com>
+Copyright (C) 2018-2024 ZwerOxotnik <zweroxotnik@gmail.com>
 
 This project is licensed under the European Union Public License (EUPL)
 The license is available in the 23 official languages of the EU. The English version is included here.
diff --git a/README.md b/README.md
index 76ca80e..80c3156 100644
--- a/README.md
+++ b/README.md
@@ -230,7 +230,7 @@ FAQ
 If you want to download from this source, then use commands below (requires [git](https://git-scm.com/downloads)).
 
 ```bash
-git clone --recurse-submodules -j8 https://github.com/ZwerOxotnik/zk-lib
+git clone --recurse-submodules -j8 https://github.com/ZwerOxotnik/zk-lib zk-lib
 cd zk-lib
 ```
 
diff --git a/changelog.txt b/changelog.txt
index 707e8e4..2cd7eb1 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,4 +1,9 @@
 ---------------------------------------------------------------------------------------------------
+Version: 0.17.5
+Date: 28. 10. 2024
+  Scripting:
+    - Fixed collision layers
+---------------------------------------------------------------------------------------------------
 Version: 0.17.4
 Date: 27. 10. 2024
   Scripting:
diff --git a/data-api/fakes.lua b/data-api/fakes.lua
index b42bba5..4b9bda8 100644
--- a/data-api/fakes.lua
+++ b/data-api/fakes.lua
@@ -68,11 +68,11 @@ fakes.create_fake_walkable_tile = function(name)
 	local new_tile = util.table.deepcopy(tiles[fake_tile_name])
 	new_tile.name = fake_tile_name
 	new_tile.collision_mask = {
-		"water-tile",
-		"ground-tile",
-		"item-layer",
-		"resource-layer",
-		"object-layer"
+		"water_tile",
+		"ground_tile",
+		"item",
+		"resource",
+		"object"
 	}
 	new_tile.autoplace = nil
 	new_tile.localised_name = {"", {"tile-name." .. name}, " [fake-W]"}
diff --git a/experimental/lazyAPI.lua b/experimental/lazyAPI.lua
index 3d5c29f..b9f3b8d 100644
--- a/experimental/lazyAPI.lua
+++ b/experimental/lazyAPI.lua
@@ -481,11 +481,12 @@ for _, sound_name in pairs(lazyAPI.all_common_sound_fields) do
 	lazyAPI.all_sound_fields[#lazyAPI.all_sound_fields+1] = sound_name
 end
 
+-- TODO: update for Factorio 2.0!!!
 -- TODO: add more functions to compare these values etc.
--- https://wiki.factorio.com/Types/RenderLayer
+-- https://lua-api.factorio.com/latest/types/RenderLayer.html
 -- The order from lowest to highest:
 lazyAPI.RenderLayers = {
-	"water-tile", "ground-tile", "tile-transition", "decals",
+	"water_tile", "ground_tile", "tile-transition", "decals",
 	"lower-radius-visualization", "radius-visualization",
 	"transport-belt-integration", "resource", "building-smoke",
 	"decorative", "ground-patch", "ground-patch-higher",
@@ -767,9 +768,9 @@ lazyAPI.all_SpriteVariations_fields = {
 
 -- https://wiki.factorio.com/Types/CollisionMask
 lazyAPI.collision_mask_layers = {
-	"ground-tile", "water-tile", "resource-layer", "doodad-layer",
-	"floor-layer", "rail-layer", "transport-belt-layer", "item-layer",
-	"ghost-layer", "object-layer", "player-layer", "train-layer",
+	"ground_tile", "water_tile", "resource", "doodad",
+	"floor", "rail", "transport_belt", "item",
+	"ghost", "object", "player", "train",
 }
 for i=13, 55 do
 	table.insert(lazyAPI.collision_mask_layers, "layer-" .. i)
diff --git a/info.json b/info.json
index 4a4436b..54b911a 100644
--- a/info.json
+++ b/info.json
@@ -1,6 +1,6 @@
 {
     "name": "zk-lib",
-    "version": "0.17.4",
+    "version": "0.17.5",
     "factorio_version": "2.0",
     "title": "ZwerOxotnik's extendable mod with 8 addons",
     "author": "ZwerOxotnik",
diff --git a/static-libs b/static-libs
index 3049f89..3c6bfe3 160000
--- a/static-libs
+++ b/static-libs
@@ -1 +1 @@
-Subproject commit 3049f891ae56560712d3ba38809d07c740728414
+Subproject commit 3c6bfe3c6bc68459c1009540cb10f296ce0ff13f