diff --git a/assets/modules/basegame/blocks/terrain.tga.gz b/assets/modules/basegame/blocks/terrain.tga.gz index 4d4754267..e78fcb486 100644 --- a/assets/modules/basegame/blocks/terrain.tga.gz +++ b/assets/modules/basegame/blocks/terrain.tga.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f82613049541ade37c2996b55d3034b0df07f0b6e938b5f9b804e2b7d07059c8 -size 3016276 +oid sha256:5f3f38e4d38dc1428e59b3ce0bc73785f626ce040a04bf2f6460a142a3a1e548 +size 3016150 diff --git a/src/net/torvald/terrarum/worlddrawer/BlocksDrawer.kt b/src/net/torvald/terrarum/worlddrawer/BlocksDrawer.kt index bbb3e6a01..d34e4d210 100644 --- a/src/net/torvald/terrarum/worlddrawer/BlocksDrawer.kt +++ b/src/net/torvald/terrarum/worlddrawer/BlocksDrawer.kt @@ -81,7 +81,6 @@ object BlocksDrawer { * These are the tiles that only connects to itself, will not connect to colour variants */ private val TILES_CONNECT_SELF = hashSetOf( - Block.ICE_MAGICAL, Block.GLASS_CRUDE, Block.GLASS_CLEAN, Block.ILLUMINATOR_BLACK, @@ -116,12 +115,6 @@ object BlocksDrawer { Block.ILLUMINATOR_TAN_OFF, Block.ILLUMINATOR_WHITE_OFF, Block.ILLUMINATOR_YELLOW, - Block.SANDSTONE, - Block.SANDSTONE_BLACK, - Block.SANDSTONE_DESERT, - Block.SANDSTONE_RED, - Block.SANDSTONE_WHITE, - Block.SANDSTONE_GREEN, Block.DAYLIGHT_CAPACITOR ) @@ -158,6 +151,7 @@ object BlocksDrawer { Block.GRAVEL_GREY, Block.SNOW, Block.ICE_NATURAL, + Block.ICE_MAGICAL, Block.ORE_COPPER, Block.ORE_IRON, Block.ORE_GOLD, @@ -165,6 +159,13 @@ object BlocksDrawer { Block.ORE_ILMENITE, Block.ORE_AURICHALCUM, + Block.SANDSTONE, + Block.SANDSTONE_BLACK, + Block.SANDSTONE_DESERT, + Block.SANDSTONE_RED, + Block.SANDSTONE_WHITE, + Block.SANDSTONE_GREEN, + Block.WATER, Block.WATER_1, Block.WATER_2, diff --git a/work_files/graphics/terrain/terrain.psd.gz b/work_files/graphics/terrain/terrain.psd.gz index f6b1c7a7e..ecee1b6f6 100644 --- a/work_files/graphics/terrain/terrain.psd.gz +++ b/work_files/graphics/terrain/terrain.psd.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:15b2082681b36feed17d6cff5cf5db44bafb1695a8bcfa8fd65f19ec1c4d5caf -size 522828 +oid sha256:af7f1d94a7452b1e36831bb442f04ced1016665900182816710d9c8aa200e5dd +size 522969 diff --git a/work_files/graphics/terrain/wall.psd.gz b/work_files/graphics/terrain/wall.psd.gz deleted file mode 100644 index 3592144aa..000000000 --- a/work_files/graphics/terrain/wall.psd.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5f67c2fe8cf2b733a7397bae45657f9a2f93b10be4a9b393a3459fa27e544ced -size 1174999 diff --git a/work_files/graphics/terrain/wall_old.png b/work_files/graphics/terrain/wall_old.png deleted file mode 100644 index 3881823a8..000000000 Binary files a/work_files/graphics/terrain/wall_old.png and /dev/null differ diff --git a/work_files/graphics/terrain/wall_old.psd b/work_files/graphics/terrain/wall_old.psd deleted file mode 100755 index 1f0b0346d..000000000 --- a/work_files/graphics/terrain/wall_old.psd +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6f83e141878742e37928f80417407d006fd18e7a5b605ed7b7c7b252d29cead0 -size 143964