Merge branch 'master' of https://github.com/Anuken/Mindustry into v105

2020-05-26 13:33:21 +02:00
parent b2382ac429 90f38fd135
commit 34d9193cd8
64 changed files with 2777 additions and 2142 deletions
--- a/core/assets/icons/icons.properties
+++ b/core/assets/icons/icons.properties
@@ -233,3 +233,5 @@
 63511=naval-factory|block-naval-factory-medium
 63510=air-factory|block-air-factory-medium
 63509=basic-reconstructor|block-basic-reconstructor-medium
+63508=block-loader|block-block-loader-medium
+63507=block-unloader|block-block-unloader-medium
--- a/core/assets/sprites/block_colors.png
+++ b/core/assets/sprites/block_colors.png
--- a/core/assets/sprites/sprites.atlas
+++ b/core/assets/sprites/sprites.atlas
--- a/core/assets/sprites/sprites.png
+++ b/core/assets/sprites/sprites.png
--- a/core/assets/sprites/sprites2.png
+++ b/core/assets/sprites/sprites2.png
--- a/core/assets/sprites/sprites4.png
+++ b/core/assets/sprites/sprites4.png
--- a/core/assets/sprites/sprites5.png
+++ b/core/assets/sprites/sprites5.png