diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..751553b --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +*.bak diff --git a/Makefile b/Makefile index 1e1fb04..c4e3eb0 100644 --- a/Makefile +++ b/Makefile @@ -1,16 +1,15 @@ - -.PHONY: zip install +.PHONY: copy install v = bztitanium_$(shell jq -r .version info.json) + copy: rm -rf ../$(v) mkdir -p ../$(v) cp -rf * ../$(v) rm -f ../$(v).zip - cd ..; zip -9 -r -y $(v).zip $(v) -x "*.xcf" -x "*.git*" + cd ..; zip -9 -r -y $(v).zip $(v) -x "*.xcf" -x "*.git*" -x "*.bak" install: copy cp -f ../$(v).zip ../../mods/ - diff --git a/changelog.txt b/changelog.txt index 7adf6b9..1010f7a 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,4 +1,9 @@ --------------------------------------------------------------------------------------------------- +Version: 0.6.5 +Date: 2020-11-08 + Changes: + - Deadlock stacking & crating recipes +--------------------------------------------------------------------------------------------------- Version: 0.6.4 Date: 2020-11-08 Changes: diff --git a/data-final-fixes.lua b/data-final-fixes.lua index be37fba..69b3541 100644 --- a/data-final-fixes.lua +++ b/data-final-fixes.lua @@ -1,3 +1,4 @@ require("titanium-recipe-final") +require("titanium-recipe-final-stacking") require("titanium-recipe-final-transport") require("titanium-data-final-settings") diff --git a/graphics/icons/titanium-ore-stacked.png b/graphics/icons/titanium-ore-stacked.png new file mode 100644 index 0000000..ba12c3d Binary files /dev/null and b/graphics/icons/titanium-ore-stacked.png differ diff --git a/graphics/icons/titanium-ore-stacked.xcf b/graphics/icons/titanium-ore-stacked.xcf new file mode 100644 index 0000000..7510904 Binary files /dev/null and b/graphics/icons/titanium-ore-stacked.xcf differ diff --git a/graphics/icons/titanium-plate-stacked.png b/graphics/icons/titanium-plate-stacked.png new file mode 100644 index 0000000..48fb179 Binary files /dev/null and b/graphics/icons/titanium-plate-stacked.png differ diff --git a/graphics/icons/titanium-plate-stacked.xcf b/graphics/icons/titanium-plate-stacked.xcf new file mode 100644 index 0000000..210422d Binary files /dev/null and b/graphics/icons/titanium-plate-stacked.xcf differ diff --git a/info.json b/info.json index f4916a2..996c7dd 100644 --- a/info.json +++ b/info.json @@ -1,19 +1,21 @@ { "name": "bztitanium", - "version": "0.6.4", + "version": "0.6.5", "factorio_version": "1.0", "title": "Titanium", "author": "Brevven", "contact": "", "homepage": "", "dependencies": [ - "base >= 0.18", - "? aai-industry", - "? space-exploration", - "? Krastorio2", + "base >= 1.0.0", + "? aai-industry", + "? space-exploration", + "? Krastorio2", "? FactorioExtended-Plus-Core", - "? Pre0-17-60Oil", - "? Deadlock-SE-bridge" + "? Pre0-17-60Oil", + "? Deadlock-SE-bridge", + "? deadlock-beltboxes-loaders", + "? DeadlockCrating" ], "description": "Adds titanium to the base game.\n\nTitanium is used in Low Density Structures, Flying Robot Frames and a few other places.\n\nCompatible with Krastorio 2, Space Exploration, Aircraft, FE+ and other mods." } diff --git a/titanium-recipe-final-stacking.lua b/titanium-recipe-final-stacking.lua new file mode 100644 index 0000000..6ba6a30 --- /dev/null +++ b/titanium-recipe-final-stacking.lua @@ -0,0 +1,12 @@ +-- Deadlock stacking recipes +if deadlock then + deadlock.add_stack("titanium-ore", "__bztitanium__/graphics/icons/titanium-ore-stacked.png", "deadlock-stacking-2", 32) + deadlock.add_stack("titanium-plate", "__bztitanium__/graphics/icons/titanium-plate-stacked.png" , "deadlock-stacking-2", 32) +end + +-- Deadlock crating recipes +if deadlock_crating then + deadlock_crating.add_crate("titanium-ore", "deadlock-crating-2") + deadlock_crating.add_crate("titanium-plate", "deadlock-crating-2") +end +