diff --git a/.travis.yml b/.travis.yml index 6b1dfd72ac..11dbe8cd1e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ script: - git clone --depth=1 --branch=master https://github.com/Anuken/MindustryBuilds ../MindustryBuilds - cd ../MindustryBuilds - echo ${TRAVIS_TAG} -- if [ -n "$TRAVIS_TAG" ]; then echo versionName=5-fdroid-${TRAVIS_TAG:1}$'\n'versionCode=${TRAVIS_TAG:1} > version_fdroid.txt; git add .; git commit -m "Updating to build ${TRAVIS_TAG}"; fi +- if [ -n "$TRAVIS_TAG" ]; then echo versionName=6-fdroid-${TRAVIS_TAG:1}$'\n'versionCode=${TRAVIS_TAG:1} > version_fdroid.txt; git add .; git commit -m "Updating to build ${TRAVIS_TAG}"; fi - git tag ${TRAVIS_BUILD_NUMBER} - git config --global user.name "Build Uploader" - if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then git push https://Anuken:${GH_PUSH_TOKEN}@github.com/Anuken/MindustryBuilds ${TRAVIS_BUILD_NUMBER}; git push https://Anuken:${GH_PUSH_TOKEN}@github.com/Anuken/MindustryBuilds; fi diff --git a/android/build.gradle b/android/build.gradle index 59b698955a..3ec6b34cfe 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -76,7 +76,7 @@ android{ targetSdkVersion 29 versionName versionNameResult - versionCode vcode + versionCode = (System.getenv("TRAVIS_BUILD_ID") != null ? System.getenv("TRAVIS_BUILD_ID").toInteger() : vcode) if(project.hasProperty("release")){ props['androidBuildCode'] = (vcode + 1).toString() @@ -98,15 +98,20 @@ android{ storePassword RELEASE_STORE_PASSWORD keyAlias RELEASE_KEY_ALIAS keyPassword RELEASE_KEY_PASSWORD + }else if(System.getenv("CI") == "true"){ + storeFile = file("../../bekeystore.jks") + storePassword = System.getenv("keystore_password") + keyAlias = System.getenv("keystore_alias") + keyPassword = System.getenv("keystore_alias_password") }else{ println("No keystore property found. Releases will be unsigned.") } } } - if(project.hasProperty("RELEASE_STORE_FILE")) { - buildTypes { - release { + if(project.hasProperty("RELEASE_STORE_FILE") || System.getenv("CI") == "true"){ + buildTypes{ + release{ signingConfig signingConfigs.release } } diff --git a/core/assets-raw/sprites/blocks/environment/cliff0.png b/core/assets-raw/sprites/blocks/environment/cliff0.png new file mode 100644 index 0000000000..17b24f68e1 Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/cliff0.png differ diff --git a/core/assets-raw/sprites/blocks/environment/cliff1.png b/core/assets-raw/sprites/blocks/environment/cliff1.png new file mode 100644 index 0000000000..03ff8dbf3d Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/cliff1.png differ diff --git a/core/assets-raw/sprites/blocks/environment/cliff2.png b/core/assets-raw/sprites/blocks/environment/cliff2.png new file mode 100644 index 0000000000..dbf002cee5 Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/cliff2.png differ diff --git a/core/assets-raw/sprites/blocks/environment/cliff3.png b/core/assets-raw/sprites/blocks/environment/cliff3.png new file mode 100644 index 0000000000..e78a6f27ce Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/cliff3.png differ diff --git a/core/assets-raw/sprites/blocks/environment/cliff4.png b/core/assets-raw/sprites/blocks/environment/cliff4.png new file mode 100644 index 0000000000..7800c59677 Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/cliff4.png differ diff --git a/core/assets-raw/sprites/blocks/environment/cliff5.png b/core/assets-raw/sprites/blocks/environment/cliff5.png new file mode 100644 index 0000000000..2e71f802f2 Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/cliff5.png differ diff --git a/core/assets-raw/sprites/blocks/environment/cliff6.png b/core/assets-raw/sprites/blocks/environment/cliff6.png new file mode 100644 index 0000000000..fceb598e3e Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/cliff6.png differ diff --git a/core/assets-raw/sprites/blocks/environment/cliff7.png b/core/assets-raw/sprites/blocks/environment/cliff7.png new file mode 100644 index 0000000000..5978387bbe Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/cliff7.png differ diff --git a/core/assets-raw/sprites/blocks/environment/dune-wall1.png b/core/assets-raw/sprites/blocks/environment/dune-wall1.png index 923945dd74..64d13b3f24 100644 Binary files a/core/assets-raw/sprites/blocks/environment/dune-wall1.png and b/core/assets-raw/sprites/blocks/environment/dune-wall1.png differ diff --git a/core/assets-raw/sprites/blocks/environment/dune-wall2.png b/core/assets-raw/sprites/blocks/environment/dune-wall2.png index 85783da449..5e3efcaae0 100644 Binary files a/core/assets-raw/sprites/blocks/environment/dune-wall2.png and b/core/assets-raw/sprites/blocks/environment/dune-wall2.png differ diff --git a/core/assets-raw/sprites/blocks/environment/space.png b/core/assets-raw/sprites/blocks/environment/space.png new file mode 100644 index 0000000000..bc38442fd1 Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/space.png differ diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 7869dcf8e3..651576c3de 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -20,7 +20,7 @@ gameover = Game Over gameover.pvp = The[accent] {0}[] team is victorious! highscore = [accent]New highscore! copied = Copied. -indev.popup = [accent]v6[] is currently in [accent]alpha[].\n[lightgray]This means:[]\n[scarlet]- The campaign is completely unfinished[]\n- Content is missing\n - Most [scarlet]Unit AI[] does not work properly\n- Many units are unfinished\n- Everything you see is subject to change or removal.\n\nReport bugs or crashes on [accent]Github[]. +indev.popup = [accent]v6[] is currently in [accent]alpha[].\n[lightgray]This means:[]\n[scarlet]- The campaign is completely unfinished[]\n- SFX and music are unfinished/missing\n- Everything you see is subject to change or removal.\n\nReport bugs or crashes on [accent]Github[]. indev.notready = This part of the game isn't ready yet load.sound = Sounds @@ -291,6 +291,8 @@ waiting = [lightgray]Waiting... waiting.players = Waiting for players... wave.enemies = [lightgray]{0} Enemies Remaining wave.enemy = [lightgray]{0} Enemy Remaining +wave.guardianwarn = Guardian approaching in [accent]{0}[] waves. +wave.guardianwarn.one = Guardian approaching in [accent]{0}[] wave. loadimage = Load Image saveimage = Save Image unknown = Unknown @@ -329,6 +331,7 @@ editor.generation = Generation: editor.ingame = Edit In-Game editor.publish.workshop = Publish On Workshop editor.newmap = New Map +editor.center = Center workshop = Workshop waves.title = Waves waves.remove = Remove @@ -572,6 +575,7 @@ info.title = Info error.title = [scarlet]An error has occured error.crashtitle = An error has occured unit.nobuild = [scarlet]Unit can't build +lastaccessed = [lightgray]Last Accessed: {0} blocks.input = Input blocks.output = Output blocks.booster = Booster @@ -627,6 +631,7 @@ bar.powerbalance = Power: {0}/s bar.powerstored = Stored: {0}/{1} bar.poweramount = Power: {0} bar.poweroutput = Power Output: {0} +bar.powerlines = Connections: {0}/{1} bar.items = Items: {0} bar.capacity = Capacity: {0} bar.unitcap = {0} {1}/{2} @@ -943,6 +948,7 @@ block.cliff.name = Cliff block.sand-boulder.name = Sand Boulder block.grass.name = Grass block.slag.name = Slag +block.space.name = Space block.salt.name = Salt block.salt-wall.name = Salt Wall block.pebbles.name = Pebbles @@ -988,6 +994,7 @@ block.darksand-water.name = Dark Sand Water block.char.name = Char block.dacite.name = Dacite block.dacite-wall.name = Dacite Wall +block.dacite-boulder.name = Dacite Boulder block.ice-snow.name = Ice Snow block.stone-wall.name = Stone Wall block.ice-wall.name = Ice Wall @@ -1261,7 +1268,7 @@ block.rotary-pump.description = An advanced pump. Pumps more liquid, but require block.thermal-pump.description = The ultimate pump. block.conduit.description = Basic liquid transport block. Moves liquids forward. Used in conjunction with pumps and other conduits. block.pulse-conduit.description = An advanced liquid transport block. Transports liquids faster and stores more than standard conduits. -block.plated-conduit.description = Moves liquids at the same rate as pulse conduits, but possesses more armor. Does not accept fluids from the sides by anything other than conduits.\nLeaks less. +block.plated-conduit.description = Moves liquids at the same rate as pulse conduits, but possesses more armor. Does not accept fluids from the sides by anything other than conduits.\nDoes not leak. block.liquid-router.description = Accepts liquids from one direction and outputs them to up to 3 other directions equally. Can also store a certain amount of liquid. Useful for splitting the liquids from one source to multiple targets. block.liquid-tank.description = Stores a large amount of liquids. Use for creating buffers in situations with non-constant demand of materials or as a safeguard for cooling vital blocks. block.liquid-junction.description = Acts as a bridge for two crossing conduits. Useful in situations with two different conduits carrying different liquids to different locations. diff --git a/core/assets/icons/icons.properties b/core/assets/icons/icons.properties index b07514ea1b..417ed98b34 100755 --- a/core/assets/icons/icons.properties +++ b/core/assets/icons/icons.properties @@ -313,3 +313,4 @@ 63423=memory-bank|block-memory-bank-medium 63422=foreshadow|block-foreshadow-medium 63421=tsunami|block-tsunami-medium +63420=space|block-space-medium diff --git a/core/assets/maps/caldera.msav b/core/assets/maps/caldera.msav index 4ed0889f5e..fae2a2e862 100644 Binary files a/core/assets/maps/caldera.msav and b/core/assets/maps/caldera.msav differ diff --git a/core/assets/maps/craters.msav b/core/assets/maps/craters.msav index b879701ae6..b10b354bf0 100644 Binary files a/core/assets/maps/craters.msav and b/core/assets/maps/craters.msav differ diff --git a/core/assets/maps/fork.msav b/core/assets/maps/fork.msav index 0a6a82d226..f4bf6985fe 100644 Binary files a/core/assets/maps/fork.msav and b/core/assets/maps/fork.msav differ diff --git a/core/assets/maps/fortress.msav b/core/assets/maps/fortress.msav index c5f58e0380..db60a0490d 100644 Binary files a/core/assets/maps/fortress.msav and b/core/assets/maps/fortress.msav differ diff --git a/core/assets/maps/glacier.msav b/core/assets/maps/glacier.msav index 1494079697..83a4f07437 100644 Binary files a/core/assets/maps/glacier.msav and b/core/assets/maps/glacier.msav differ diff --git a/core/assets/maps/islands.msav b/core/assets/maps/islands.msav index 48e13f8b6f..1b833e98d0 100644 Binary files a/core/assets/maps/islands.msav and b/core/assets/maps/islands.msav differ diff --git a/core/assets/maps/labyrinth.msav b/core/assets/maps/labyrinth.msav index 7501a592ad..d63ca28bf9 100644 Binary files a/core/assets/maps/labyrinth.msav and b/core/assets/maps/labyrinth.msav differ diff --git a/core/assets/maps/maze.msav b/core/assets/maps/maze.msav index ea34efa876..25386f23c4 100644 Binary files a/core/assets/maps/maze.msav and b/core/assets/maps/maze.msav differ diff --git a/core/assets/maps/shattered.msav b/core/assets/maps/shattered.msav index cad5016e9d..a822e2d121 100644 Binary files a/core/assets/maps/shattered.msav and b/core/assets/maps/shattered.msav differ diff --git a/core/assets/maps/tendrils.msav b/core/assets/maps/tendrils.msav index 178c11a03e..3034fb5ec1 100644 Binary files a/core/assets/maps/tendrils.msav and b/core/assets/maps/tendrils.msav differ diff --git a/core/assets/maps/triad.msav b/core/assets/maps/triad.msav index a693b02cba..fd25effa9c 100644 Binary files a/core/assets/maps/triad.msav and b/core/assets/maps/triad.msav differ diff --git a/core/assets/maps/veins.msav b/core/assets/maps/veins.msav index 6ad97e728a..744dbaf99d 100644 Binary files a/core/assets/maps/veins.msav and b/core/assets/maps/veins.msav differ diff --git a/core/assets/maps/wasteland.msav b/core/assets/maps/wasteland.msav index f7bb73595e..b00e76fd12 100644 Binary files a/core/assets/maps/wasteland.msav and b/core/assets/maps/wasteland.msav differ diff --git a/core/assets/shaders/space.frag b/core/assets/shaders/space.frag new file mode 100755 index 0000000000..4b95cf7438 --- /dev/null +++ b/core/assets/shaders/space.frag @@ -0,0 +1,23 @@ +#define HIGHP +#define NSCALE 2700.0 +#define CAMSCALE (NSCALE*5.0) + +uniform sampler2D u_texture; +uniform sampler2D u_stars; + +uniform vec2 u_campos; +uniform vec2 u_ccampos; +uniform vec2 u_resolution; +uniform float u_time; + +varying vec2 v_texCoords; + +void main(){ + vec2 c = v_texCoords.xy; + vec2 coords = vec2(c.x * u_resolution.x, c.y * u_resolution.y); + + vec4 color = texture2D(u_texture, c); + color.rgb = texture2D(u_stars, coords/NSCALE + vec2(-0.1, -0.1) + u_ccampos / CAMSCALE).rgb; + + gl_FragColor = color; +} \ No newline at end of file diff --git a/core/assets/sprites/block_colors.png b/core/assets/sprites/block_colors.png index ccbd6ed7e2..3e19c96e61 100644 Binary files a/core/assets/sprites/block_colors.png and b/core/assets/sprites/block_colors.png differ diff --git a/core/assets/sprites/fallback/sprites.atlas b/core/assets/sprites/fallback/sprites.atlas index 13e8478d73..fd8aece5ae 100644 --- a/core/assets/sprites/fallback/sprites.atlas +++ b/core/assets/sprites/fallback/sprites.atlas @@ -7862,1456 +7862,3318 @@ filter: nearest,nearest repeat: none basalt-edge rotate: false - xy: 1, 395 + xy: 1, 399 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 basalt1 rotate: false - xy: 1561, 459 + xy: 2005, 463 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 basalt2 rotate: false - xy: 1595, 459 + xy: 1299, 265 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 basalt3 rotate: false - xy: 1629, 459 + xy: 1333, 265 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 char1 rotate: false - xy: 1663, 459 + xy: 1367, 265 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 char2 rotate: false - xy: 1697, 459 + xy: 1401, 265 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 char3 rotate: false - xy: 1731, 459 + xy: 1435, 265 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cliff rotate: false - xy: 1765, 459 + xy: 1469, 265 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 +cliff0 + rotate: false + xy: 589, 137 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask1 + rotate: false + xy: 589, 137 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask129 + rotate: false + xy: 589, 137 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask131 + rotate: false + xy: 589, 137 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask3 + rotate: false + xy: 589, 137 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliff1 + rotate: false + xy: 687, 235 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask130 + rotate: false + xy: 687, 235 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask2 + rotate: false + xy: 687, 235 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliff2 + rotate: false + xy: 785, 333 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask12 + rotate: false + xy: 785, 333 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask132 + rotate: false + xy: 785, 333 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask134 + rotate: false + xy: 785, 333 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask14 + rotate: false + xy: 785, 333 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask140 + rotate: false + xy: 785, 333 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask142 + rotate: false + xy: 785, 333 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask4 + rotate: false + xy: 785, 333 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask6 + rotate: false + xy: 785, 333 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliff3 + rotate: false + xy: 883, 431 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliff4 + rotate: false + xy: 589, 71 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliff5 + rotate: false + xy: 949, 431 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliff6 + rotate: false + xy: 1015, 431 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliff7 + rotate: false + xy: 1081, 431 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask0 + rotate: false + xy: 1147, 431 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask128 + rotate: false + xy: 1147, 431 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask10 + rotate: false + xy: 1411, 431 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask138 + rotate: false + xy: 1411, 431 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask112 + rotate: false + xy: 1709, 365 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask120 + rotate: false + xy: 1709, 365 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask113 + rotate: false + xy: 1775, 365 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask115 + rotate: false + xy: 1775, 365 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask121 + rotate: false + xy: 1775, 365 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask123 + rotate: false + xy: 1775, 365 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask114 + rotate: false + xy: 1841, 365 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask122 + rotate: false + xy: 1841, 365 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask116 + rotate: false + xy: 1907, 365 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask118 + rotate: false + xy: 1907, 365 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask117 + rotate: false + xy: 787, 169 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask119 + rotate: false + xy: 787, 169 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask124 + rotate: false + xy: 787, 103 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask126 + rotate: false + xy: 787, 103 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask125 + rotate: false + xy: 787, 37 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask127 + rotate: false + xy: 787, 37 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask16 + rotate: false + xy: 1477, 431 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask144 + rotate: false + xy: 1477, 431 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask152 + rotate: false + xy: 1477, 431 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask176 + rotate: false + xy: 1477, 431 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask184 + rotate: false + xy: 1477, 431 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask24 + rotate: false + xy: 1477, 431 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask48 + rotate: false + xy: 1477, 431 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask56 + rotate: false + xy: 1477, 431 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask17 + rotate: false + xy: 1543, 431 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask145 + rotate: false + xy: 1543, 431 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask147 + rotate: false + xy: 1543, 431 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask153 + rotate: false + xy: 1543, 431 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask155 + rotate: false + xy: 1543, 431 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask177 + rotate: false + xy: 1543, 431 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask179 + rotate: false + xy: 1543, 431 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask185 + rotate: false + xy: 1543, 431 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask187 + rotate: false + xy: 1543, 431 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask19 + rotate: false + xy: 1543, 431 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask25 + rotate: false + xy: 1543, 431 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask27 + rotate: false + xy: 1543, 431 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask49 + rotate: false + xy: 1543, 431 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask51 + rotate: false + xy: 1543, 431 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask57 + rotate: false + xy: 1543, 431 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask59 + rotate: false + xy: 1543, 431 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask18 + rotate: false + xy: 1609, 431 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask146 + rotate: false + xy: 1609, 431 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask154 + rotate: false + xy: 1609, 431 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask178 + rotate: false + xy: 1609, 431 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask186 + rotate: false + xy: 1609, 431 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask26 + rotate: false + xy: 1609, 431 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask50 + rotate: false + xy: 1609, 431 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask58 + rotate: false + xy: 1609, 431 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask192 + rotate: false + xy: 885, 267 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask224 + rotate: false + xy: 885, 267 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask193 + rotate: false + xy: 853, 201 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask195 + rotate: false + xy: 853, 201 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask225 + rotate: false + xy: 853, 201 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask227 + rotate: false + xy: 853, 201 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask194 + rotate: false + xy: 853, 135 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask226 + rotate: false + xy: 853, 135 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask196 + rotate: false + xy: 853, 69 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask198 + rotate: false + xy: 853, 69 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask204 + rotate: false + xy: 853, 69 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask206 + rotate: false + xy: 853, 69 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask228 + rotate: false + xy: 853, 69 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask230 + rotate: false + xy: 853, 69 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask236 + rotate: false + xy: 853, 69 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask238 + rotate: false + xy: 853, 69 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask197 + rotate: false + xy: 951, 299 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask199 + rotate: false + xy: 951, 299 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask205 + rotate: false + xy: 951, 299 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask207 + rotate: false + xy: 951, 299 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask229 + rotate: false + xy: 951, 299 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask231 + rotate: false + xy: 951, 299 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask237 + rotate: false + xy: 951, 299 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask239 + rotate: false + xy: 951, 299 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask20 + rotate: false + xy: 1675, 431 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask148 + rotate: false + xy: 1675, 431 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask150 + rotate: false + xy: 1675, 431 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask180 + rotate: false + xy: 1675, 431 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask182 + rotate: false + xy: 1675, 431 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask22 + rotate: false + xy: 1675, 431 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask52 + rotate: false + xy: 1675, 431 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask54 + rotate: false + xy: 1675, 431 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask200 + rotate: false + xy: 1017, 299 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask232 + rotate: false + xy: 1017, 299 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask201 + rotate: false + xy: 1083, 299 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask203 + rotate: false + xy: 1083, 299 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask233 + rotate: false + xy: 1083, 299 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask235 + rotate: false + xy: 1083, 299 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask202 + rotate: false + xy: 1149, 299 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask234 + rotate: false + xy: 1149, 299 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask208 + rotate: false + xy: 1215, 299 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask216 + rotate: false + xy: 1215, 299 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask209 + rotate: false + xy: 1281, 299 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask211 + rotate: false + xy: 1281, 299 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask217 + rotate: false + xy: 1281, 299 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask219 + rotate: false + xy: 1281, 299 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask21 + rotate: false + xy: 1741, 431 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask149 + rotate: false + xy: 1741, 431 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask151 + rotate: false + xy: 1741, 431 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask181 + rotate: false + xy: 1741, 431 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask183 + rotate: false + xy: 1741, 431 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask23 + rotate: false + xy: 1741, 431 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask53 + rotate: false + xy: 1741, 431 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask55 + rotate: false + xy: 1741, 431 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask210 + rotate: false + xy: 1347, 299 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask218 + rotate: false + xy: 1347, 299 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask212 + rotate: false + xy: 1413, 299 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask214 + rotate: false + xy: 1413, 299 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask213 + rotate: false + xy: 1479, 299 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask215 + rotate: false + xy: 1479, 299 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask220 + rotate: false + xy: 1545, 299 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask222 + rotate: false + xy: 1545, 299 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask221 + rotate: false + xy: 1611, 299 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask223 + rotate: false + xy: 1611, 299 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask240 + rotate: false + xy: 1677, 299 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask248 + rotate: false + xy: 1677, 299 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask241 + rotate: false + xy: 1743, 299 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask243 + rotate: false + xy: 1743, 299 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask249 + rotate: false + xy: 1743, 299 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask251 + rotate: false + xy: 1743, 299 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask242 + rotate: false + xy: 1809, 299 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask250 + rotate: false + xy: 1809, 299 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask244 + rotate: false + xy: 1875, 299 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask246 + rotate: false + xy: 1875, 299 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask245 + rotate: false + xy: 1973, 365 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask247 + rotate: false + xy: 1973, 365 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask252 + rotate: false + xy: 1941, 299 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask254 + rotate: false + xy: 1941, 299 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask253 + rotate: false + xy: 919, 201 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask255 + rotate: false + xy: 919, 201 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask28 + rotate: false + xy: 1807, 431 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask156 + rotate: false + xy: 1807, 431 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask158 + rotate: false + xy: 1807, 431 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask188 + rotate: false + xy: 1807, 431 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask190 + rotate: false + xy: 1807, 431 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask30 + rotate: false + xy: 1807, 431 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask60 + rotate: false + xy: 1807, 431 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask62 + rotate: false + xy: 1807, 431 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask29 + rotate: false + xy: 1873, 431 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask157 + rotate: false + xy: 1873, 431 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask159 + rotate: false + xy: 1873, 431 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask189 + rotate: false + xy: 1873, 431 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask191 + rotate: false + xy: 1873, 431 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask31 + rotate: false + xy: 1873, 431 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask61 + rotate: false + xy: 1873, 431 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask63 + rotate: false + xy: 1873, 431 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask32 + rotate: false + xy: 1939, 431 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask160 + rotate: false + xy: 1939, 431 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask33 + rotate: false + xy: 589, 5 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask161 + rotate: false + xy: 589, 5 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask163 + rotate: false + xy: 589, 5 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask35 + rotate: false + xy: 589, 5 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask34 + rotate: false + xy: 655, 137 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask162 + rotate: false + xy: 655, 137 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask36 + rotate: false + xy: 655, 71 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask164 + rotate: false + xy: 655, 71 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask166 + rotate: false + xy: 655, 71 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask172 + rotate: false + xy: 655, 71 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask174 + rotate: false + xy: 655, 71 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask38 + rotate: false + xy: 655, 71 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask44 + rotate: false + xy: 655, 71 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask46 + rotate: false + xy: 655, 71 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask37 + rotate: false + xy: 655, 5 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask165 + rotate: false + xy: 655, 5 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask167 + rotate: false + xy: 655, 5 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask173 + rotate: false + xy: 655, 5 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask175 + rotate: false + xy: 655, 5 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask39 + rotate: false + xy: 655, 5 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask45 + rotate: false + xy: 655, 5 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask47 + rotate: false + xy: 655, 5 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask40 + rotate: false + xy: 753, 235 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask168 + rotate: false + xy: 753, 235 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask41 + rotate: false + xy: 721, 169 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask169 + rotate: false + xy: 721, 169 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask171 + rotate: false + xy: 721, 169 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask43 + rotate: false + xy: 721, 169 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask42 + rotate: false + xy: 721, 103 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask170 + rotate: false + xy: 721, 103 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask5 + rotate: false + xy: 1213, 431 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask13 + rotate: false + xy: 1213, 431 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask133 + rotate: false + xy: 1213, 431 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask135 + rotate: false + xy: 1213, 431 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask141 + rotate: false + xy: 1213, 431 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask143 + rotate: false + xy: 1213, 431 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask15 + rotate: false + xy: 1213, 431 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask7 + rotate: false + xy: 1213, 431 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask64 + rotate: false + xy: 721, 37 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask96 + rotate: false + xy: 721, 37 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask65 + rotate: false + xy: 851, 333 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask67 + rotate: false + xy: 851, 333 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask97 + rotate: false + xy: 851, 333 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask99 + rotate: false + xy: 851, 333 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask66 + rotate: false + xy: 819, 267 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask98 + rotate: false + xy: 819, 267 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask68 + rotate: false + xy: 917, 365 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask100 + rotate: false + xy: 917, 365 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask102 + rotate: false + xy: 917, 365 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask108 + rotate: false + xy: 917, 365 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask110 + rotate: false + xy: 917, 365 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask70 + rotate: false + xy: 917, 365 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask76 + rotate: false + xy: 917, 365 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask78 + rotate: false + xy: 917, 365 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask69 + rotate: false + xy: 983, 365 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask101 + rotate: false + xy: 983, 365 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask103 + rotate: false + xy: 983, 365 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask109 + rotate: false + xy: 983, 365 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask111 + rotate: false + xy: 983, 365 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask71 + rotate: false + xy: 983, 365 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask77 + rotate: false + xy: 983, 365 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask79 + rotate: false + xy: 983, 365 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask72 + rotate: false + xy: 1049, 365 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask104 + rotate: false + xy: 1049, 365 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask73 + rotate: false + xy: 1115, 365 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask105 + rotate: false + xy: 1115, 365 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask107 + rotate: false + xy: 1115, 365 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask75 + rotate: false + xy: 1115, 365 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask74 + rotate: false + xy: 1181, 365 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask106 + rotate: false + xy: 1181, 365 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask8 + rotate: false + xy: 1279, 431 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask136 + rotate: false + xy: 1279, 431 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask80 + rotate: false + xy: 1247, 365 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask88 + rotate: false + xy: 1247, 365 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask81 + rotate: false + xy: 1313, 365 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask83 + rotate: false + xy: 1313, 365 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask89 + rotate: false + xy: 1313, 365 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask91 + rotate: false + xy: 1313, 365 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask82 + rotate: false + xy: 1379, 365 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask90 + rotate: false + xy: 1379, 365 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask84 + rotate: false + xy: 1445, 365 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask86 + rotate: false + xy: 1445, 365 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask85 + rotate: false + xy: 1511, 365 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask87 + rotate: false + xy: 1511, 365 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask9 + rotate: false + xy: 1345, 431 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask11 + rotate: false + xy: 1345, 431 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask137 + rotate: false + xy: 1345, 431 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask139 + rotate: false + xy: 1345, 431 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask92 + rotate: false + xy: 1577, 365 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask94 + rotate: false + xy: 1577, 365 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask93 + rotate: false + xy: 1643, 365 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask95 + rotate: false + xy: 1643, 365 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 coal1 rotate: false - xy: 1799, 459 + xy: 1503, 265 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 coal2 rotate: false - xy: 1833, 459 + xy: 1537, 265 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 coal3 rotate: false - xy: 1867, 459 + xy: 1571, 265 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 copper1 rotate: false - xy: 1901, 459 + xy: 1605, 265 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 copper2 rotate: false - xy: 1935, 459 + xy: 1639, 265 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 copper3 rotate: false - xy: 1969, 459 + xy: 1673, 265 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 craters1 rotate: false - xy: 2003, 459 + xy: 1707, 265 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 craters2 rotate: false - xy: 491, 1 + xy: 1741, 265 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 craters3 rotate: false - xy: 557, 67 + xy: 1775, 265 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 craters4 rotate: false - xy: 655, 165 + xy: 1809, 265 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 craters5 rotate: false - xy: 753, 263 + xy: 1843, 265 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 craters6 rotate: false - xy: 851, 361 + xy: 1877, 265 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dacite-edge rotate: false - xy: 1, 297 + xy: 1, 301 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 dacite-wall-large rotate: false - xy: 491, 35 + xy: 919, 135 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 dacite-wall1 rotate: false - xy: 851, 327 + xy: 755, 3 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dacite-wall2 rotate: false - xy: 1411, 409 + xy: 789, 3 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dacite1 rotate: false - xy: 525, 1 + xy: 1911, 265 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dacite2 rotate: false - xy: 655, 131 + xy: 1945, 265 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dacite3 rotate: false - xy: 753, 229 + xy: 721, 3 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dark-metal-large rotate: false - xy: 589, 133 + xy: 919, 69 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 dark-metal1 rotate: false - xy: 1445, 409 + xy: 853, 35 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dark-metal2 rotate: false - xy: 1479, 409 + xy: 887, 35 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dark-panel-1 rotate: false - xy: 1513, 409 + xy: 921, 35 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dark-panel-1-edge rotate: false - xy: 99, 395 + xy: 99, 399 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 dark-panel-2 rotate: false - xy: 1561, 425 + xy: 2007, 331 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dark-panel-2-edge rotate: false - xy: 1, 199 + xy: 1, 203 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 dark-panel-3 rotate: false - xy: 1595, 425 + xy: 985, 67 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dark-panel-3-edge rotate: false - xy: 99, 297 + xy: 99, 301 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 dark-panel-4 rotate: false - xy: 1629, 425 + xy: 1019, 67 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dark-panel-4-edge rotate: false - xy: 197, 395 + xy: 197, 399 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 dark-panel-5 rotate: false - xy: 1663, 425 + xy: 1053, 67 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dark-panel-5-edge rotate: false - xy: 1, 101 + xy: 1, 105 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 dark-panel-6 rotate: false - xy: 1697, 425 + xy: 1087, 67 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dark-panel-6-edge rotate: false - xy: 99, 199 + xy: 99, 203 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 darksand-edge rotate: false - xy: 197, 297 + xy: 197, 301 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 darksand-tainted-water rotate: false - xy: 1833, 425 + xy: 1233, 199 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 darksand-tainted-water-edge rotate: false - xy: 295, 395 + xy: 295, 399 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 darksand-tainted-water1 rotate: false - xy: 1867, 425 + xy: 1233, 165 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 darksand-tainted-water2 rotate: false - xy: 1901, 425 + xy: 1233, 131 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 darksand-tainted-water3 rotate: false - xy: 1935, 425 + xy: 1299, 231 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 darksand-water rotate: false - xy: 1969, 425 + xy: 1333, 231 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 darksand-water-edge rotate: false - xy: 1, 3 + xy: 1, 7 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 darksand-water1 rotate: false - xy: 2003, 425 + xy: 1367, 231 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 darksand-water2 rotate: false - xy: 591, 99 + xy: 1401, 231 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 darksand-water3 rotate: false - xy: 591, 65 + xy: 1435, 231 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 darksand1 rotate: false - xy: 1731, 425 + xy: 1121, 67 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 darksand2 rotate: false - xy: 1765, 425 + xy: 1183, 99 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 darksand3 rotate: false - xy: 1799, 425 + xy: 2007, 297 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 deepwater rotate: false - xy: 625, 97 + xy: 1469, 231 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 deepwater-edge rotate: false - xy: 99, 101 + xy: 99, 105 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 dirt-edge rotate: false - xy: 197, 199 + xy: 197, 203 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 dirt-wall-large rotate: false - xy: 687, 231 + xy: 985, 233 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 dirt-wall1 rotate: false - xy: 787, 295 + xy: 1605, 231 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dirt-wall2 rotate: false - xy: 787, 261 + xy: 1639, 231 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dirt1 rotate: false - xy: 625, 63 + xy: 1503, 231 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dirt2 rotate: false - xy: 659, 97 + xy: 1537, 231 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dirt3 rotate: false - xy: 659, 63 + xy: 1571, 231 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dune-wall-large rotate: false - xy: 785, 329 + xy: 985, 167 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 dune-wall1 rotate: false - xy: 787, 227 + xy: 1673, 231 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dune-wall2 rotate: false - xy: 821, 293 + xy: 1707, 231 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 edge rotate: false - xy: 821, 259 + xy: 1741, 231 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 edge-stencil rotate: false - xy: 295, 297 + xy: 295, 301 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 edgier rotate: false - xy: 821, 225 + xy: 1775, 231 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 grass-edge rotate: false - xy: 393, 395 + xy: 393, 399 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 grass1 rotate: false - xy: 855, 293 + xy: 1809, 231 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 grass2 rotate: false - xy: 855, 259 + xy: 1843, 231 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 grass3 rotate: false - xy: 855, 225 + xy: 1877, 231 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 hotrock1 rotate: false - xy: 1547, 391 + xy: 1911, 231 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 hotrock2 rotate: false - xy: 1581, 391 + xy: 1945, 231 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 hotrock3 rotate: false - xy: 1615, 391 + xy: 1217, 97 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ice-edge rotate: false - xy: 99, 3 + xy: 99, 7 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 ice-snow-edge rotate: false - xy: 197, 101 + xy: 197, 105 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 ice-snow1 rotate: false - xy: 1751, 391 + xy: 2013, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ice-snow2 rotate: false - xy: 1785, 391 + xy: 2013, 229 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ice-snow3 rotate: false - xy: 1819, 391 + xy: 1155, 65 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ice-wall-large rotate: false - xy: 883, 427 + xy: 1051, 233 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 ice-wall1 rotate: false - xy: 1853, 391 + xy: 1189, 63 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ice-wall2 rotate: false - xy: 1887, 391 + xy: 1223, 63 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ice1 rotate: false - xy: 1649, 391 + xy: 1251, 97 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ice2 rotate: false - xy: 1683, 391 + xy: 1979, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ice3 rotate: false - xy: 1717, 391 + xy: 1979, 229 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 lead1 rotate: false - xy: 1921, 391 + xy: 1257, 63 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 lead2 rotate: false - xy: 1955, 391 + xy: 823, 1 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 lead3 rotate: false - xy: 1989, 391 + xy: 857, 1 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 magmarock1 rotate: false - xy: 689, 197 + xy: 891, 1 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 magmarock2 rotate: false - xy: 689, 163 + xy: 925, 1 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 magmarock3 rotate: false - xy: 723, 195 + xy: 1267, 197 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor rotate: false - xy: 723, 161 + xy: 1267, 163 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-2 rotate: false - xy: 757, 193 + xy: 1301, 197 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-2-edge rotate: false - xy: 295, 199 + xy: 295, 203 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 metal-floor-3 rotate: false - xy: 757, 159 + xy: 1301, 163 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-3-edge rotate: false - xy: 393, 297 + xy: 393, 301 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 metal-floor-5 rotate: false - xy: 791, 191 + xy: 1335, 197 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-5-edge rotate: false - xy: 491, 395 + xy: 491, 399 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 metal-floor-damaged-edge rotate: false - xy: 197, 3 + xy: 197, 7 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 metal-floor-damaged1 rotate: false - xy: 825, 191 + xy: 1335, 163 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-damaged2 rotate: false - xy: 791, 157 + xy: 1369, 197 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-damaged3 rotate: false - xy: 825, 157 + xy: 1369, 163 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-edge rotate: false - xy: 295, 101 + xy: 295, 105 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 moss-edge rotate: false - xy: 393, 199 + xy: 393, 203 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 moss1 rotate: false - xy: 859, 191 + xy: 1403, 197 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 moss2 rotate: false - xy: 859, 157 + xy: 1403, 163 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 moss3 rotate: false - xy: 885, 393 + xy: 1437, 197 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mud-edge rotate: false - xy: 491, 297 + xy: 491, 301 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 mud1 rotate: false - xy: 885, 359 + xy: 1437, 163 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mud2 rotate: false - xy: 919, 393 + xy: 1471, 197 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mud3 rotate: false - xy: 953, 393 + xy: 1471, 163 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal1 rotate: false - xy: 919, 359 + xy: 1505, 197 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal2 rotate: false - xy: 987, 393 + xy: 1505, 163 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal3 rotate: false - xy: 953, 359 + xy: 1539, 197 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper1 rotate: false - xy: 1021, 393 + xy: 1539, 163 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper2 rotate: false - xy: 987, 359 + xy: 1573, 197 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper3 rotate: false - xy: 1055, 393 + xy: 1573, 163 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead1 rotate: false - xy: 1021, 359 + xy: 1607, 197 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead2 rotate: false - xy: 1089, 393 + xy: 1607, 163 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead3 rotate: false - xy: 1055, 359 + xy: 1641, 197 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap1 rotate: false - xy: 1123, 393 + xy: 1641, 163 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap2 rotate: false - xy: 1089, 359 + xy: 1675, 197 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap3 rotate: false - xy: 1157, 393 + xy: 1675, 163 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium1 rotate: false - xy: 1123, 359 + xy: 1709, 197 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium2 rotate: false - xy: 1191, 393 + xy: 1709, 163 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium3 rotate: false - xy: 1157, 359 + xy: 1743, 197 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium1 rotate: false - xy: 1225, 393 + xy: 1743, 163 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium2 rotate: false - xy: 1191, 359 + xy: 1777, 197 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium3 rotate: false - xy: 1259, 393 + xy: 1777, 163 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pebbles1 rotate: false - xy: 1225, 359 + xy: 1811, 197 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pebbles2 rotate: false - xy: 1293, 393 + xy: 1811, 163 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pebbles3 rotate: false - xy: 1259, 359 + xy: 1845, 197 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pine rotate: false - xy: 1411, 443 + xy: 1183, 183 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 salt rotate: false - xy: 1327, 393 + xy: 1845, 163 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 salt-edge rotate: false - xy: 589, 395 + xy: 589, 399 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 salt-wall-large rotate: false - xy: 949, 427 + xy: 985, 101 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 salt-wall1 rotate: false - xy: 1293, 359 + xy: 1879, 197 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 salt-wall2 rotate: false - xy: 1361, 393 + xy: 1879, 163 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand-edge rotate: false - xy: 295, 3 + xy: 295, 7 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 sand-wall-large rotate: false - xy: 1015, 427 + xy: 1051, 167 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 sand-wall1 rotate: false - xy: 1429, 375 + xy: 1319, 129 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand-wall2 rotate: false - xy: 1463, 375 + xy: 1353, 129 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand-water rotate: false - xy: 1497, 375 + xy: 1387, 129 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand-water-edge rotate: false - xy: 393, 101 + xy: 393, 105 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 sand-water1 rotate: false - xy: 1395, 341 + xy: 1421, 129 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand-water2 rotate: false - xy: 1429, 341 + xy: 1455, 129 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand-water3 rotate: false - xy: 1463, 341 + xy: 1489, 129 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand1 rotate: false - xy: 1327, 359 + xy: 1913, 197 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand2 rotate: false - xy: 1361, 359 + xy: 1913, 163 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand3 rotate: false - xy: 1395, 375 + xy: 1285, 129 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap1 rotate: false - xy: 1497, 341 + xy: 1523, 129 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap2 rotate: false - xy: 1531, 357 + xy: 1557, 129 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap3 rotate: false - xy: 1565, 357 + xy: 1591, 129 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shale-edge rotate: false - xy: 491, 199 + xy: 491, 203 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 shale-wall-large rotate: false - xy: 1081, 427 + xy: 1117, 233 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 shale-wall1 rotate: false - xy: 1701, 357 + xy: 1727, 129 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shale-wall2 rotate: false - xy: 1735, 357 + xy: 1761, 129 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shale1 rotate: false - xy: 1599, 357 + xy: 1625, 129 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shale2 rotate: false - xy: 1633, 357 + xy: 1659, 129 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shale3 rotate: false - xy: 1667, 357 + xy: 1693, 129 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shrubs-large rotate: false - xy: 1147, 427 + xy: 1051, 101 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 shrubs1 rotate: false - xy: 1769, 357 + xy: 1795, 129 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shrubs2 rotate: false - xy: 1803, 357 + xy: 1829, 129 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 slag rotate: false - xy: 1837, 357 + xy: 1863, 129 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 slag-edge rotate: false - xy: 589, 297 + xy: 589, 301 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 snow-edge rotate: false - xy: 687, 395 + xy: 687, 399 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 snow-pine rotate: false - xy: 1461, 443 + xy: 1249, 249 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 snow-wall-large rotate: false - xy: 1213, 427 + xy: 1117, 167 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 snow-wall1 rotate: false - xy: 1973, 357 + xy: 1325, 95 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snow-wall2 rotate: false - xy: 1531, 323 + xy: 1359, 95 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snow1 rotate: false - xy: 1871, 357 + xy: 1897, 129 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snow2 rotate: false - xy: 1905, 357 + xy: 1931, 129 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snow3 rotate: false - xy: 1939, 357 + xy: 1291, 95 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 +space + rotate: false + xy: 1393, 95 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +space-edge + rotate: false + xy: 393, 7 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 spawn rotate: false - xy: 1565, 323 + xy: 1427, 95 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spore-moss-edge rotate: false - xy: 393, 3 + xy: 491, 105 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 spore-moss1 rotate: false - xy: 1599, 323 + xy: 1461, 95 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spore-moss2 rotate: false - xy: 1633, 323 + xy: 1495, 95 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spore-moss3 rotate: false - xy: 1667, 323 + xy: 1529, 95 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spore-pine rotate: false - xy: 1511, 443 + xy: 1183, 133 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 spore-wall-large rotate: false - xy: 1279, 427 + xy: 1183, 233 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-wall1 rotate: false - xy: 1701, 323 + xy: 1563, 95 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spore-wall2 rotate: false - xy: 1735, 323 + xy: 1597, 95 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stone-edge rotate: false - xy: 491, 101 + xy: 589, 203 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 stone-wall-large rotate: false - xy: 1345, 427 + xy: 1117, 101 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 stone-wall1 rotate: false - xy: 1871, 323 + xy: 1733, 95 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stone-wall2 rotate: false - xy: 1905, 323 + xy: 1767, 95 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stone1 rotate: false - xy: 1769, 323 + xy: 1631, 95 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stone2 rotate: false - xy: 1803, 323 + xy: 1665, 95 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stone3 rotate: false - xy: 1837, 323 + xy: 1699, 95 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 tainted-water rotate: false - xy: 1939, 323 + xy: 1801, 95 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 tainted-water-edge rotate: false - xy: 589, 199 + xy: 687, 301 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 tar rotate: false - xy: 1973, 323 + xy: 1835, 95 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 tar-edge rotate: false - xy: 687, 297 + xy: 785, 399 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 tendrils1 rotate: false - xy: 2007, 357 + xy: 1869, 95 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 tendrils2 rotate: false - xy: 2007, 323 + xy: 1903, 95 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 tendrils3 rotate: false - xy: 889, 325 + xy: 1291, 61 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium1 rotate: false - xy: 923, 325 + xy: 1325, 61 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium2 rotate: false - xy: 889, 291 + xy: 1359, 61 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium3 rotate: false - xy: 957, 325 + xy: 1393, 61 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium1 rotate: false - xy: 889, 257 + xy: 1427, 61 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium2 rotate: false - xy: 923, 291 + xy: 1461, 61 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium3 rotate: false - xy: 991, 325 + xy: 1495, 61 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 water rotate: false - xy: 923, 257 + xy: 1529, 61 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 water-edge rotate: false - xy: 785, 395 + xy: 491, 7 size: 96, 96 orig: 96, 96 offset: 0, 0 @@ -10505,128 +12367,142 @@ editor-snow3 orig: 32, 32 offset: 0, 0 index: -1 -editor-spawn +editor-space rotate: false xy: 559, 269 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 +space-icon-editor + rotate: false + xy: 559, 269 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-spawn + rotate: false + xy: 593, 303 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 editor-spore-moss1 - rotate: false - xy: 593, 303 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -spore-moss-icon-editor - rotate: false - xy: 593, 303 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-spore-moss2 rotate: false xy: 593, 269 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -editor-spore-moss3 +spore-moss-icon-editor + rotate: false + xy: 593, 269 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-spore-moss2 rotate: false xy: 627, 401 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 +editor-spore-moss3 + rotate: false + xy: 627, 367 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 editor-stone1 - rotate: false - xy: 627, 367 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -stone-icon-editor - rotate: false - xy: 627, 367 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-stone2 rotate: false xy: 661, 401 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -editor-stone3 +stone-icon-editor + rotate: false + xy: 661, 401 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-stone2 rotate: false xy: 627, 333 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -editor-tainted-water +editor-stone3 rotate: false xy: 661, 367 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 +editor-tainted-water + rotate: false + xy: 695, 401 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 tainted-water-icon-editor rotate: false - xy: 661, 367 + xy: 695, 401 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-tar rotate: false - xy: 695, 401 + xy: 627, 299 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 tar-icon-editor rotate: false - xy: 695, 401 + xy: 627, 299 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-tendrils1 rotate: false - xy: 627, 299 + xy: 661, 333 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-tendrils2 rotate: false - xy: 661, 333 + xy: 695, 367 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-tendrils3 rotate: false - xy: 695, 367 + xy: 729, 401 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-water rotate: false - xy: 729, 401 + xy: 661, 299 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 water-icon-editor rotate: false - xy: 729, 401 + xy: 661, 299 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -10675,7 +12551,7 @@ ground-factory-icon-editor index: -1 hail-icon-editor rotate: false - xy: 661, 299 + xy: 695, 333 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -10689,14 +12565,14 @@ hyper-processor-icon-editor index: -1 ice-wall-icon-editor rotate: false - xy: 695, 333 + xy: 729, 367 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 illuminator-icon-editor rotate: false - xy: 729, 367 + xy: 763, 401 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -10710,35 +12586,35 @@ impact-reactor-icon-editor index: -1 incinerator-icon-editor rotate: false - xy: 763, 401 + xy: 695, 299 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 inverted-sorter-icon-editor rotate: false - xy: 695, 299 + xy: 729, 333 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-source-icon-editor rotate: false - xy: 729, 333 + xy: 763, 367 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-void-icon-editor rotate: false - xy: 763, 367 + xy: 797, 401 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 junction-icon-editor rotate: false - xy: 797, 401 + xy: 729, 299 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -10787,21 +12663,21 @@ launch-pad-large-icon-editor index: -1 liquid-junction-icon-editor rotate: false - xy: 729, 299 + xy: 763, 333 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-icon-editor rotate: false - xy: 763, 333 + xy: 797, 367 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-source-icon-editor rotate: false - xy: 797, 367 + xy: 831, 401 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -10815,7 +12691,7 @@ liquid-tank-icon-editor index: -1 liquid-void-icon-editor rotate: false - xy: 831, 401 + xy: 763, 299 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -10850,7 +12726,7 @@ mechanical-drill-icon-editor index: -1 mechanical-pump-icon-editor rotate: false - xy: 763, 299 + xy: 797, 333 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -10864,7 +12740,7 @@ meltdown-icon-editor index: -1 melter-icon-editor rotate: false - xy: 797, 333 + xy: 831, 367 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -10878,7 +12754,7 @@ memory-bank-icon-editor index: -1 memory-cell-icon-editor rotate: false - xy: 831, 367 + xy: 865, 401 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -10892,21 +12768,21 @@ mend-projector-icon-editor index: -1 mender-icon-editor rotate: false - xy: 865, 401 + xy: 797, 299 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 message-icon-editor rotate: false - xy: 797, 299 + xy: 831, 333 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 micro-processor-icon-editor rotate: false - xy: 831, 333 + xy: 865, 367 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -10955,7 +12831,7 @@ overdrive-projector-icon-editor index: -1 overflow-gate-icon-editor rotate: false - xy: 865, 367 + xy: 831, 299 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -10983,28 +12859,28 @@ payload-router-icon-editor index: -1 pebbles-icon-editor rotate: false - xy: 831, 299 + xy: 865, 333 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-icon-editor rotate: false - xy: 865, 333 + xy: 865, 299 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-icon-editor rotate: false - xy: 865, 299 + xy: 627, 265 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-wall-icon-editor rotate: false - xy: 627, 265 + xy: 661, 265 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -11039,14 +12915,14 @@ plastanium-compressor-icon-editor index: -1 plastanium-conveyor-icon-editor rotate: false - xy: 661, 265 + xy: 695, 265 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-wall-icon-editor rotate: false - xy: 695, 265 + xy: 729, 265 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -11060,7 +12936,7 @@ plastanium-wall-large-icon-editor index: -1 plated-conduit-icon-editor rotate: false - xy: 729, 265 + xy: 763, 265 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -11074,7 +12950,7 @@ pneumatic-drill-icon-editor index: -1 power-node-icon-editor rotate: false - xy: 763, 265 + xy: 797, 265 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -11088,28 +12964,28 @@ power-node-large-icon-editor index: -1 power-source-icon-editor rotate: false - xy: 797, 265 + xy: 831, 265 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 power-void-icon-editor rotate: false - xy: 831, 265 + xy: 865, 265 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-icon-editor rotate: false - xy: 865, 265 + xy: 899, 401 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulverizer-icon-editor rotate: false - xy: 899, 401 + xy: 899, 367 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -11123,7 +12999,7 @@ pyratite-mixer-icon-editor index: -1 repair-point-icon-editor rotate: false - xy: 899, 367 + xy: 899, 333 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -11151,7 +13027,7 @@ rotary-pump-icon-editor index: -1 router-icon-editor rotate: false - xy: 899, 333 + xy: 899, 299 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -11165,7 +13041,7 @@ rtg-generator-icon-editor index: -1 salt-wall-icon-editor rotate: false - xy: 899, 299 + xy: 899, 265 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -11179,21 +13055,21 @@ salvo-icon-editor index: -1 sand-boulder-icon-editor rotate: false - xy: 899, 265 + xy: 459, 235 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand-wall-icon-editor rotate: false - xy: 459, 235 + xy: 459, 201 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand-water-icon-editor rotate: false - xy: 459, 201 + xy: 493, 235 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -11207,7 +13083,7 @@ scatter-icon-editor index: -1 scorch-icon-editor rotate: false - xy: 493, 235 + xy: 459, 167 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -11228,7 +13104,7 @@ scrap-wall-huge-icon-editor index: -1 scrap-wall-icon-editor rotate: false - xy: 459, 167 + xy: 493, 201 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -11256,28 +13132,28 @@ separator-icon-editor index: -1 shale-boulder-icon-editor rotate: false - xy: 493, 201 + xy: 527, 235 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shale-wall-icon-editor rotate: false - xy: 527, 235 + xy: 493, 167 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shock-mine-icon-editor rotate: false - xy: 493, 167 + xy: 527, 201 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shrubs-icon-editor rotate: false - xy: 527, 201 + xy: 561, 235 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -11305,7 +13181,7 @@ snow-boulder-icon-editor index: -1 snow-icon-editor rotate: false - xy: 561, 235 + xy: 527, 167 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -11319,14 +13195,14 @@ snow-pine-icon-editor index: -1 snow-wall-icon-editor rotate: false - xy: 527, 167 + xy: 561, 201 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 solar-panel-icon-editor rotate: false - xy: 561, 201 + xy: 561, 167 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -11340,14 +13216,14 @@ solar-panel-large-icon-editor index: -1 sorter-icon-editor rotate: false - xy: 561, 167 + xy: 463, 133 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spawn-icon-editor rotate: false - xy: 463, 133 + xy: 463, 99 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -11382,7 +13258,7 @@ spore-press-icon-editor index: -1 spore-wall-icon-editor rotate: false - xy: 463, 99 + xy: 497, 133 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -11396,7 +13272,7 @@ steam-generator-icon-editor index: -1 stone-wall-icon-editor rotate: false - xy: 497, 133 + xy: 497, 99 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -11410,7 +13286,7 @@ surge-tower-icon-editor index: -1 surge-wall-icon-editor rotate: false - xy: 497, 99 + xy: 531, 133 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -11431,14 +13307,14 @@ swarmer-icon-editor index: -1 switch-icon-editor rotate: false - xy: 531, 133 + xy: 531, 99 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 tendrils-icon-editor rotate: false - xy: 531, 99 + xy: 565, 133 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -11473,7 +13349,7 @@ thorium-reactor-icon-editor index: -1 thorium-wall-icon-editor rotate: false - xy: 565, 133 + xy: 565, 99 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -11494,14 +13370,14 @@ thruster-icon-editor index: -1 titanium-conveyor-icon-editor rotate: false - xy: 565, 99 + xy: 469, 65 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-wall-icon-editor rotate: false - xy: 469, 65 + xy: 469, 31 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -11522,14 +13398,14 @@ tsunami-icon-editor index: -1 underflow-gate-icon-editor rotate: false - xy: 469, 31 + xy: 503, 65 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unloader-icon-editor rotate: false - xy: 503, 65 + xy: 503, 31 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -11584,7 +13460,7 @@ alpha-bg index: -1 bar rotate: false - xy: 1048, 560 + xy: 950, 175 size: 27, 36 split: 9, 9, 9, 9 orig: 27, 36 @@ -11592,7 +13468,7 @@ bar index: -1 bar-top rotate: false - xy: 1455, 483 + xy: 950, 213 size: 27, 36 split: 9, 10, 9, 10 orig: 27, 36 @@ -11607,21 +13483,21 @@ block-additive-reconstructor-large index: -1 block-additive-reconstructor-medium rotate: false - xy: 1627, 618 + xy: 1571, 647 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-additive-reconstructor-small rotate: false - xy: 1013, 359 + xy: 2023, 789 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-additive-reconstructor-tiny rotate: false - xy: 327, 1 + xy: 1549, 553 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -11642,21 +13518,21 @@ block-air-factory-large index: -1 block-air-factory-medium rotate: false - xy: 1665, 647 + xy: 1605, 647 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-air-factory-small rotate: false - xy: 2023, 881 + xy: 1489, 399 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-air-factory-tiny rotate: false - xy: 881, 1 + xy: 1009, 47 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -11670,28 +13546,28 @@ block-air-factory-xlarge index: -1 block-alloy-smelter-large rotate: false - xy: 651, 274 + xy: 651, 283 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-alloy-smelter-medium rotate: false - xy: 1699, 647 + xy: 1639, 647 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-alloy-smelter-small rotate: false - xy: 2023, 855 + xy: 950, 115 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-alloy-smelter-tiny rotate: false - xy: 899, 1 + xy: 301, 1 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -11705,28 +13581,28 @@ block-alloy-smelter-xlarge index: -1 block-arc-large rotate: false - xy: 551, 141 + xy: 596, 191 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-arc-medium rotate: false - xy: 2014, 907 + xy: 1825, 689 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-arc-small rotate: false - xy: 2023, 829 + xy: 979, 204 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-arc-tiny rotate: false - xy: 917, 1 + xy: 319, 1 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -11740,28 +13616,28 @@ block-arc-xlarge index: -1 block-armored-conveyor-large rotate: false - xy: 451, 74 + xy: 646, 241 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-armored-conveyor-medium rotate: false - xy: 1909, 689 + xy: 881, 571 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-armored-conveyor-small rotate: false - xy: 2023, 803 + xy: 979, 178 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-armored-conveyor-tiny rotate: false - xy: 935, 1 + xy: 337, 1 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -11775,28 +13651,28 @@ block-armored-conveyor-xlarge index: -1 block-basalt-large rotate: false - xy: 646, 232 + xy: 701, 324 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-basalt-medium rotate: false - xy: 1989, 857 + xy: 915, 571 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-basalt-small rotate: false - xy: 781, 690 + xy: 979, 152 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-basalt-tiny rotate: false - xy: 953, 1 + xy: 1403, 333 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -11810,35 +13686,35 @@ block-basalt-xlarge index: -1 block-battery-large rotate: false - xy: 401, 34 + xy: 501, 74 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-battery-large-large rotate: false - xy: 443, 32 + xy: 693, 282 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-battery-large-medium rotate: false - xy: 1661, 613 + xy: 877, 537 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-battery-large-small rotate: false - xy: 1251, 427 + xy: 1455, 367 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-battery-large-tiny rotate: false - xy: 971, 1 + xy: 331, 598 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -11852,21 +13728,21 @@ block-battery-large-xlarge index: -1 block-battery-medium rotate: false - xy: 1695, 613 + xy: 911, 537 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-battery-small rotate: false - xy: 1420, 461 + xy: 1421, 346 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-battery-tiny rotate: false - xy: 989, 1 + xy: 309, 672 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -11880,28 +13756,28 @@ block-battery-xlarge index: -1 block-blast-drill-large rotate: false - xy: 501, 100 + xy: 688, 240 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-blast-drill-medium rotate: false - xy: 351, 6 + xy: 877, 503 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-blast-drill-small rotate: false - xy: 1277, 427 + xy: 485, 6 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-blast-drill-tiny rotate: false - xy: 1007, 1 + xy: 331, 580 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -11915,28 +13791,28 @@ block-blast-drill-xlarge index: -1 block-blast-mixer-large rotate: false - xy: 543, 99 + xy: 451, 35 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-blast-mixer-medium rotate: false - xy: 881, 563 + xy: 911, 503 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-blast-mixer-small rotate: false - xy: 1303, 427 + xy: 1013, 325 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-blast-mixer-tiny rotate: false - xy: 1025, 1 + xy: 1681, 345 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -11950,28 +13826,28 @@ block-blast-mixer-xlarge index: -1 block-block-forge-large rotate: false - xy: 593, 133 + xy: 493, 32 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-block-forge-medium rotate: false - xy: 915, 563 + xy: 877, 469 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-block-forge-small rotate: false - xy: 1329, 427 + xy: 1039, 325 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-block-forge-tiny rotate: false - xy: 1043, 1 + xy: 355, 6 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -11985,28 +13861,28 @@ block-block-forge-xlarge index: -1 block-block-loader-large rotate: false - xy: 585, 91 + xy: 401, 8 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-block-loader-medium rotate: false - xy: 877, 529 + xy: 911, 469 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-block-loader-small rotate: false - xy: 1484, 489 + xy: 1065, 325 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-block-loader-tiny rotate: false - xy: 1061, 1 + xy: 373, 6 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12020,28 +13896,28 @@ block-block-loader-xlarge index: -1 block-block-unloader-large rotate: false - xy: 493, 58 + xy: 551, 91 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-block-unloader-medium rotate: false - xy: 877, 495 + xy: 877, 435 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-block-unloader-small rotate: false - xy: 1510, 489 + xy: 1091, 325 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-block-unloader-tiny rotate: false - xy: 1079, 1 + xy: 1421, 328 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12055,28 +13931,28 @@ block-block-unloader-xlarge index: -1 block-boulder-large rotate: false - xy: 535, 57 + xy: 751, 536 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-boulder-medium rotate: false - xy: 911, 529 + xy: 911, 435 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-boulder-small rotate: false - xy: 1355, 433 + xy: 1117, 325 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-boulder-tiny rotate: false - xy: 1097, 1 + xy: 1403, 315 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12090,28 +13966,28 @@ block-boulder-xlarge index: -1 block-bridge-conduit-large rotate: false - xy: 577, 49 + xy: 751, 494 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-bridge-conduit-medium rotate: false - xy: 877, 461 + xy: 877, 401 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-bridge-conduit-small rotate: false - xy: 1115, 393 + xy: 1143, 325 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-bridge-conduit-tiny rotate: false - xy: 331, 598 + xy: 1421, 310 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12125,28 +14001,28 @@ block-bridge-conduit-xlarge index: -1 block-bridge-conveyor-large rotate: false - xy: 485, 16 + xy: 793, 536 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-bridge-conveyor-medium rotate: false - xy: 911, 495 + xy: 911, 401 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-bridge-conveyor-small rotate: false - xy: 1081, 375 + xy: 1169, 325 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-bridge-conveyor-tiny rotate: false - xy: 1096, 193 + xy: 1371, 307 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12160,28 +14036,28 @@ block-bridge-conveyor-xlarge index: -1 block-char-large rotate: false - xy: 527, 15 + xy: 751, 452 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-char-medium rotate: false - xy: 877, 427 + xy: 1673, 647 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-char-small rotate: false - xy: 1076, 349 + xy: 1195, 325 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-char-tiny rotate: false - xy: 464, 14 + xy: 1373, 289 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12195,28 +14071,28 @@ block-char-xlarge index: -1 block-cliff-large rotate: false - xy: 569, 7 + xy: 793, 494 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-cliff-medium rotate: false - xy: 911, 461 + xy: 1707, 649 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-cliff-small rotate: false - xy: 1446, 457 + xy: 1221, 325 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-cliff-tiny rotate: false - xy: 309, 672 + xy: 1373, 271 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12230,28 +14106,28 @@ block-cliff-xlarge index: -1 block-coal-centrifuge-large rotate: false - xy: 751, 536 + xy: 835, 536 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-coal-centrifuge-medium rotate: false - xy: 877, 393 + xy: 1741, 658 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-coal-centrifuge-small rotate: false - xy: 1472, 457 + xy: 1007, 299 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-coal-centrifuge-tiny rotate: false - xy: 1534, 221 + xy: 1373, 253 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12265,28 +14141,28 @@ block-coal-centrifuge-xlarge index: -1 block-combustion-generator-large rotate: false - xy: 751, 494 + xy: 751, 410 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-combustion-generator-medium rotate: false - xy: 911, 427 + xy: 1909, 731 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-combustion-generator-small rotate: false - xy: 1498, 463 + xy: 1033, 299 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-combustion-generator-tiny rotate: false - xy: 1552, 221 + xy: 1373, 235 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12300,28 +14176,28 @@ block-combustion-generator-xlarge index: -1 block-command-center-large rotate: false - xy: 793, 536 + xy: 793, 452 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-command-center-medium rotate: false - xy: 911, 393 + xy: 1867, 709 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-command-center-small rotate: false - xy: 1524, 463 + xy: 1059, 299 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-command-center-tiny rotate: false - xy: 331, 580 + xy: 1439, 323 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12335,28 +14211,28 @@ block-command-center-xlarge index: -1 block-conduit-large rotate: false - xy: 751, 452 + xy: 835, 494 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-conduit-medium rotate: false - xy: 877, 359 + xy: 1499, 597 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-conduit-small rotate: false - xy: 1107, 367 + xy: 1085, 299 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-conduit-tiny rotate: false - xy: 1510, 195 + xy: 1457, 323 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12370,28 +14246,28 @@ block-conduit-xlarge index: -1 block-container-large rotate: false - xy: 793, 494 + xy: 751, 368 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-container-medium rotate: false - xy: 911, 359 + xy: 1951, 749 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-container-small rotate: false - xy: 1102, 341 + xy: 1111, 299 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-container-tiny rotate: false - xy: 1563, 495 + xy: 1475, 323 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12405,28 +14281,28 @@ block-container-xlarge index: -1 block-conveyor-large rotate: false - xy: 835, 536 + xy: 793, 410 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-conveyor-medium rotate: false - xy: 872, 325 + xy: 1007, 589 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-conveyor-small rotate: false - xy: 1102, 315 + xy: 1137, 299 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-conveyor-tiny rotate: false - xy: 1570, 216 + xy: 1493, 323 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12440,35 +14316,35 @@ block-conveyor-xlarge index: -1 block-copper-wall-large rotate: false - xy: 751, 410 + xy: 835, 452 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-copper-wall-large-large rotate: false - xy: 793, 452 + xy: 793, 368 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-copper-wall-large-medium rotate: false - xy: 906, 325 + xy: 1041, 589 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-copper-wall-large-small rotate: false - xy: 1102, 289 + xy: 1163, 299 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-copper-wall-large-tiny rotate: false - xy: 1534, 203 + xy: 1439, 305 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12482,21 +14358,21 @@ block-copper-wall-large-xlarge index: -1 block-copper-wall-medium rotate: false - xy: 869, 291 + xy: 1075, 589 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-copper-wall-small rotate: false - xy: 1102, 263 + xy: 1189, 299 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-copper-wall-tiny rotate: false - xy: 1552, 203 + xy: 1457, 305 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12510,28 +14386,28 @@ block-copper-wall-xlarge index: -1 block-core-foundation-large rotate: false - xy: 835, 494 + xy: 835, 410 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-core-foundation-medium rotate: false - xy: 903, 291 + xy: 1109, 589 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-core-foundation-small rotate: false - xy: 1096, 237 + xy: 1215, 299 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-core-foundation-tiny rotate: false - xy: 1570, 198 + xy: 1475, 305 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12545,28 +14421,28 @@ block-core-foundation-xlarge index: -1 block-core-nucleus-large rotate: false - xy: 793, 410 + xy: 835, 368 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-core-nucleus-medium rotate: false - xy: 1133, 589 + xy: 1143, 589 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-core-nucleus-small rotate: false - xy: 1096, 211 + xy: 1009, 273 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-core-nucleus-tiny rotate: false - xy: 1588, 216 + xy: 1493, 305 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12580,28 +14456,28 @@ block-core-nucleus-xlarge index: -1 block-core-shard-large rotate: false - xy: 835, 452 + xy: 646, 199 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-core-shard-medium rotate: false - xy: 1167, 589 + xy: 1177, 589 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-core-shard-small rotate: false - xy: 1141, 393 + xy: 1009, 247 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-core-shard-tiny rotate: false - xy: 1588, 198 + xy: 2029, 661 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12615,28 +14491,28 @@ block-core-shard-xlarge index: -1 block-craters-large rotate: false - xy: 835, 410 + xy: 688, 198 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-craters-medium rotate: false - xy: 1201, 589 + xy: 1211, 589 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-craters-small rotate: false - xy: 1133, 367 + xy: 1035, 273 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-craters-tiny rotate: false - xy: 1510, 177 + xy: 1365, 47 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12650,28 +14526,28 @@ block-craters-xlarge index: -1 block-cryofluid-mixer-large rotate: false - xy: 751, 368 + xy: 543, 49 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-cryofluid-mixer-medium rotate: false - xy: 1235, 589 + xy: 1245, 589 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-cryofluid-mixer-small rotate: false - xy: 1128, 341 + xy: 1035, 247 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-cryofluid-mixer-tiny rotate: false - xy: 1528, 185 + xy: 1365, 29 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12685,28 +14561,28 @@ block-cryofluid-mixer-xlarge index: -1 block-cultivator-large rotate: false - xy: 793, 368 + xy: 535, 7 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-cultivator-medium rotate: false - xy: 1269, 589 + xy: 1279, 589 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-cultivator-small rotate: false - xy: 1128, 315 + xy: 1061, 273 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-cultivator-tiny rotate: false - xy: 1546, 185 + xy: 1365, 11 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12720,28 +14596,28 @@ block-cultivator-xlarge index: -1 block-cyclone-large rotate: false - xy: 835, 368 + xy: 596, 149 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-cyclone-medium rotate: false - xy: 1303, 589 + xy: 1313, 589 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-cyclone-small rotate: false - xy: 1128, 289 + xy: 1061, 247 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-cyclone-tiny rotate: false - xy: 1528, 167 + xy: 2030, 883 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12755,28 +14631,28 @@ block-cyclone-xlarge index: -1 block-dacite-boulder-large rotate: false - xy: 746, 326 + xy: 638, 157 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-dacite-boulder-medium rotate: false - xy: 1337, 589 + xy: 1347, 589 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-dacite-boulder-small rotate: false - xy: 1128, 263 + xy: 1087, 273 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-dacite-boulder-tiny rotate: false - xy: 1546, 167 + xy: 2030, 865 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12790,56 +14666,56 @@ block-dacite-boulder-xlarge index: -1 block-dacite-large rotate: false - xy: 788, 326 + xy: 680, 156 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-dacite-medium rotate: false - xy: 1371, 589 + xy: 1381, 589 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-dacite-small rotate: false - xy: 1122, 237 + xy: 1087, 247 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-dacite-tiny rotate: false - xy: 1564, 180 + xy: 1373, 217 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-dacite-wall-large rotate: false - xy: 830, 326 + xy: 594, 107 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-dacite-wall-medium rotate: false - xy: 1405, 589 + xy: 1415, 589 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-dacite-wall-small rotate: false - xy: 1122, 211 + xy: 1113, 273 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-dacite-wall-tiny rotate: false - xy: 1582, 180 + xy: 1697, 397 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12860,28 +14736,28 @@ block-dacite-xlarge index: -1 block-dark-metal-large rotate: false - xy: 701, 284 + xy: 593, 65 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-dark-metal-medium rotate: false - xy: 1439, 589 + xy: 949, 571 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-dark-metal-small rotate: false - xy: 1167, 395 + xy: 1113, 247 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-dark-metal-tiny rotate: false - xy: 1564, 162 + xy: 1697, 379 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12895,28 +14771,28 @@ block-dark-metal-xlarge index: -1 block-dark-panel-1-large rotate: false - xy: 743, 284 + xy: 638, 115 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-dark-panel-1-medium rotate: false - xy: 1473, 589 + xy: 945, 537 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-dark-panel-1-small rotate: false - xy: 1193, 398 + xy: 1139, 273 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-dark-panel-1-tiny rotate: false - xy: 1582, 162 + xy: 1347, 209 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12930,28 +14806,28 @@ block-dark-panel-1-xlarge index: -1 block-dark-panel-2-large rotate: false - xy: 785, 284 + xy: 680, 114 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-dark-panel-2-medium rotate: false - xy: 1507, 589 + xy: 945, 503 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-dark-panel-2-small rotate: false - xy: 1219, 399 + xy: 1139, 247 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-dark-panel-2-tiny rotate: false - xy: 1600, 180 + xy: 1343, 191 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12965,28 +14841,28 @@ block-dark-panel-2-xlarge index: -1 block-dark-panel-3-large rotate: false - xy: 827, 284 + xy: 743, 324 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-dark-panel-3-medium rotate: false - xy: 1541, 589 + xy: 945, 469 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-dark-panel-3-small rotate: false - xy: 1159, 367 + xy: 1165, 273 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-dark-panel-3-tiny rotate: false - xy: 1600, 162 + xy: 1343, 173 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -13000,28 +14876,28 @@ block-dark-panel-3-xlarge index: -1 block-dark-panel-4-large rotate: false - xy: 635, 133 + xy: 735, 282 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-dark-panel-4-medium rotate: false - xy: 1575, 589 + xy: 945, 435 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-dark-panel-4-small rotate: false - xy: 1154, 341 + xy: 1165, 247 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-dark-panel-4-tiny rotate: false - xy: 1330, 205 + xy: 1343, 155 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -13035,28 +14911,28 @@ block-dark-panel-4-xlarge index: -1 block-dark-panel-5-large rotate: false - xy: 627, 91 + xy: 730, 240 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-dark-panel-5-medium rotate: false - xy: 1943, 681 + xy: 945, 401 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-dark-panel-5-small rotate: false - xy: 1154, 315 + xy: 1191, 273 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-dark-panel-5-tiny rotate: false - xy: 1348, 205 + xy: 1343, 137 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -13070,28 +14946,28 @@ block-dark-panel-5-xlarge index: -1 block-dark-panel-6-large rotate: false - xy: 619, 49 + xy: 730, 198 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-dark-panel-6-medium rotate: false - xy: 949, 563 + xy: 1901, 697 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-dark-panel-6-small rotate: false - xy: 1154, 289 + xy: 1191, 247 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-dark-panel-6-tiny rotate: false - xy: 1408, 210 + xy: 1343, 119 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -13105,49 +14981,49 @@ block-dark-panel-6-xlarge index: -1 block-darksand-large rotate: false - xy: 611, 7 + xy: 722, 156 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-darksand-medium rotate: false - xy: 945, 529 + xy: 1859, 675 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-darksand-small rotate: false - xy: 1154, 263 + xy: 1217, 273 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-darksand-tainted-water-large rotate: false - xy: 669, 91 + xy: 722, 114 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-darksand-tainted-water-medium rotate: false - xy: 945, 495 + xy: 1893, 663 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-darksand-tainted-water-small rotate: false - xy: 1148, 237 + xy: 1217, 247 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-darksand-tainted-water-tiny rotate: false - xy: 1426, 205 + xy: 1655, 324 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -13161,35 +15037,35 @@ block-darksand-tainted-water-xlarge index: -1 block-darksand-tiny rotate: false - xy: 1536, 495 + xy: 1652, 306 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-darksand-water-large rotate: false - xy: 661, 49 + xy: 785, 326 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-darksand-water-medium rotate: false - xy: 945, 461 + xy: 1943, 715 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-darksand-water-small rotate: false - xy: 1148, 211 + xy: 1009, 221 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-darksand-water-tiny rotate: false - xy: 1550, 477 + xy: 1673, 324 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -13210,28 +15086,28 @@ block-darksand-xlarge index: -1 block-deepwater-large rotate: false - xy: 653, 7 + xy: 827, 326 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-deepwater-medium rotate: false - xy: 945, 427 + xy: 1935, 681 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-deepwater-small rotate: false - xy: 1581, 524 + xy: 1035, 221 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-deepwater-tiny rotate: false - xy: 1568, 477 + xy: 1670, 306 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -13245,28 +15121,28 @@ block-deepwater-xlarge index: -1 block-differential-generator-large rotate: false - xy: 703, 49 + xy: 577, 7 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-differential-generator-medium rotate: false - xy: 945, 393 + xy: 1927, 647 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-differential-generator-small rotate: false - xy: 1607, 524 + xy: 1061, 221 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-differential-generator-tiny rotate: false - xy: 1586, 480 + xy: 1691, 327 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -13280,28 +15156,28 @@ block-differential-generator-xlarge index: -1 block-diode-large rotate: false - xy: 695, 7 + xy: 777, 282 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-diode-medium rotate: false - xy: 945, 359 + xy: 1741, 624 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-diode-small rotate: false - xy: 1633, 519 + xy: 1087, 221 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-diode-tiny rotate: false - xy: 1604, 480 + xy: 1511, 319 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -13315,56 +15191,56 @@ block-diode-xlarge index: -1 block-dirt-large rotate: false - xy: 737, 7 + xy: 772, 240 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-dirt-medium rotate: false - xy: 940, 325 + xy: 1707, 615 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-dirt-small rotate: false - xy: 1659, 519 + xy: 1113, 221 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-dirt-tiny rotate: false - xy: 1563, 459 + xy: 1529, 319 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-dirt-wall-large rotate: false - xy: 646, 190 + xy: 772, 198 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-dirt-wall-medium rotate: false - xy: 937, 291 + xy: 1741, 590 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-dirt-wall-small rotate: false - xy: 1685, 519 + xy: 1139, 221 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-dirt-wall-tiny rotate: false - xy: 1563, 441 + xy: 1547, 319 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -13385,28 +15261,28 @@ block-dirt-xlarge index: -1 block-disassembler-large rotate: false - xy: 821, 933 + xy: 764, 156 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-disassembler-medium rotate: false - xy: 1609, 584 + xy: 1993, 815 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-disassembler-small rotate: false - xy: 1711, 519 + xy: 1165, 221 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-disassembler-tiny rotate: false - xy: 1563, 423 + xy: 1511, 301 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -13420,28 +15296,28 @@ block-disassembler-xlarge index: -1 block-distributor-large rotate: false - xy: 863, 933 + xy: 764, 114 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-distributor-medium rotate: false - xy: 1643, 579 + xy: 1989, 781 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-distributor-small rotate: false - xy: 1737, 519 + xy: 1191, 221 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-distributor-tiny rotate: false - xy: 1563, 405 + xy: 1529, 301 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -13455,35 +15331,35 @@ block-distributor-xlarge index: -1 block-door-large rotate: false - xy: 905, 933 + xy: 819, 284 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-door-large-large rotate: false - xy: 947, 933 + xy: 869, 326 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-door-large-medium rotate: false - xy: 1677, 579 + xy: 1985, 747 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-door-large-small rotate: false - xy: 1763, 519 + xy: 1217, 221 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-door-large-tiny rotate: false - xy: 1563, 387 + xy: 1547, 301 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -13497,21 +15373,21 @@ block-door-large-xlarge index: -1 block-door-medium rotate: false - xy: 1711, 579 + xy: 1977, 713 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-door-small rotate: false - xy: 1789, 519 + xy: 1005, 195 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-door-tiny rotate: false - xy: 1581, 459 + xy: 1565, 307 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -13525,28 +15401,28 @@ block-door-xlarge index: -1 block-dune-wall-large rotate: false - xy: 989, 933 + xy: 861, 284 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-dune-wall-medium rotate: false - xy: 1729, 613 + xy: 1969, 679 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-dune-wall-small rotate: false - xy: 1815, 519 + xy: 1005, 169 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-dune-wall-tiny rotate: false - xy: 1581, 441 + xy: 1583, 307 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -13560,28 +15436,28 @@ block-dune-wall-xlarge index: -1 block-duo-large rotate: false - xy: 1031, 933 + xy: 806, 156 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-duo-medium rotate: false - xy: 1733, 647 + xy: 1961, 645 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-duo-small rotate: false - xy: 1841, 519 + xy: 1031, 195 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-duo-tiny rotate: false - xy: 1581, 423 + xy: 1601, 298 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -13595,28 +15471,28 @@ block-duo-xlarge index: -1 block-exponential-reconstructor-large rotate: false - xy: 1073, 933 + xy: 806, 114 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-exponential-reconstructor-medium rotate: false - xy: 1745, 579 + xy: 1775, 658 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-exponential-reconstructor-small rotate: false - xy: 1867, 519 + xy: 1031, 169 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-exponential-reconstructor-tiny rotate: false - xy: 1581, 405 + xy: 1565, 289 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -13630,28 +15506,28 @@ block-exponential-reconstructor-xlarge index: -1 block-force-projector-large rotate: false - xy: 1115, 933 + xy: 903, 284 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-force-projector-medium rotate: false - xy: 1763, 613 + xy: 1775, 624 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-force-projector-small rotate: false - xy: 1893, 519 + xy: 1057, 195 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-force-projector-tiny rotate: false - xy: 1581, 387 + xy: 1583, 289 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -13665,28 +15541,28 @@ block-force-projector-xlarge index: -1 block-foreshadow-large rotate: false - xy: 1157, 933 + xy: 821, 933 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-foreshadow-medium rotate: false - xy: 1767, 647 + xy: 1775, 590 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-foreshadow-small rotate: false - xy: 1919, 519 + xy: 1057, 169 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-foreshadow-tiny rotate: false - xy: 1575, 369 + xy: 1601, 280 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -13700,28 +15576,28 @@ block-foreshadow-xlarge index: -1 block-fuse-large rotate: false - xy: 1199, 933 + xy: 863, 933 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-fuse-medium rotate: false - xy: 1779, 579 + xy: 1809, 655 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-fuse-small rotate: false - xy: 1945, 519 + xy: 1083, 195 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-fuse-tiny rotate: false - xy: 1575, 351 + xy: 1619, 293 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -13735,28 +15611,28 @@ block-fuse-xlarge index: -1 block-graphite-press-large rotate: false - xy: 1241, 933 + xy: 905, 933 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-graphite-press-medium rotate: false - xy: 1797, 613 + xy: 1809, 621 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-graphite-press-small rotate: false - xy: 1971, 519 + xy: 1083, 169 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-graphite-press-tiny rotate: false - xy: 1575, 333 + xy: 1619, 275 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -13770,28 +15646,28 @@ block-graphite-press-xlarge index: -1 block-grass-large rotate: false - xy: 1283, 933 + xy: 947, 933 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-grass-medium rotate: false - xy: 1801, 647 + xy: 1809, 587 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-grass-small rotate: false - xy: 1997, 519 + xy: 1109, 195 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-grass-tiny rotate: false - xy: 1575, 315 + xy: 1361, 191 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -13805,28 +15681,28 @@ block-grass-xlarge index: -1 block-ground-factory-large rotate: false - xy: 1325, 933 + xy: 989, 933 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-ground-factory-medium rotate: false - xy: 1813, 579 + xy: 1843, 641 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ground-factory-small rotate: false - xy: 2023, 519 + xy: 1109, 169 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-ground-factory-tiny rotate: false - xy: 1599, 462 + xy: 1361, 173 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -13840,28 +15716,28 @@ block-ground-factory-xlarge index: -1 block-hail-large rotate: false - xy: 1367, 933 + xy: 1031, 933 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-hail-medium rotate: false - xy: 1831, 613 + xy: 1843, 607 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-hail-small rotate: false - xy: 1581, 498 + xy: 1135, 195 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-hail-tiny rotate: false - xy: 1599, 444 + xy: 1361, 155 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -13875,28 +15751,28 @@ block-hail-xlarge index: -1 block-hotrock-large rotate: false - xy: 1409, 933 + xy: 1073, 933 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-hotrock-medium rotate: false - xy: 1835, 647 + xy: 1843, 573 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-hotrock-small rotate: false - xy: 1607, 498 + xy: 1135, 169 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-hotrock-tiny rotate: false - xy: 1599, 426 + xy: 1361, 137 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -13910,28 +15786,28 @@ block-hotrock-xlarge index: -1 block-hyper-processor-large rotate: false - xy: 1451, 933 + xy: 1115, 933 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-hyper-processor-medium rotate: false - xy: 1847, 579 + xy: 1877, 629 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-hyper-processor-small rotate: false - xy: 1633, 493 + xy: 1161, 195 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-hyper-processor-tiny rotate: false - xy: 1599, 408 + xy: 1361, 119 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -13945,49 +15821,49 @@ block-hyper-processor-xlarge index: -1 block-ice-large rotate: false - xy: 1493, 933 + xy: 1157, 933 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-ice-medium rotate: false - xy: 1865, 613 + xy: 1877, 595 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ice-small rotate: false - xy: 1659, 493 + xy: 1161, 169 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-ice-snow-large rotate: false - xy: 1535, 933 + xy: 1199, 933 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-ice-snow-medium rotate: false - xy: 1869, 647 + xy: 1877, 561 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ice-snow-small rotate: false - xy: 1685, 493 + xy: 1187, 195 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-ice-snow-tiny rotate: false - xy: 1599, 390 + xy: 1366, 101 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -14001,35 +15877,35 @@ block-ice-snow-xlarge index: -1 block-ice-tiny rotate: false - xy: 1593, 369 + xy: 1379, 199 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-ice-wall-large rotate: false - xy: 1577, 933 + xy: 1241, 933 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-ice-wall-medium rotate: false - xy: 1903, 655 + xy: 1911, 613 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ice-wall-small rotate: false - xy: 1711, 493 + xy: 1187, 169 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-ice-wall-tiny rotate: false - xy: 1593, 351 + xy: 1379, 181 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -14050,28 +15926,28 @@ block-ice-xlarge index: -1 block-illuminator-large rotate: false - xy: 1619, 933 + xy: 1283, 933 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-illuminator-medium rotate: false - xy: 1937, 647 + xy: 1911, 579 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-illuminator-small rotate: false - xy: 1737, 493 + xy: 1213, 195 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-illuminator-tiny rotate: false - xy: 1593, 333 + xy: 1379, 163 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -14085,28 +15961,28 @@ block-illuminator-xlarge index: -1 block-impact-reactor-large rotate: false - xy: 1661, 933 + xy: 1325, 933 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-impact-reactor-medium rotate: false - xy: 1881, 579 + xy: 1945, 611 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-impact-reactor-small rotate: false - xy: 1763, 493 + xy: 1213, 169 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-impact-reactor-tiny rotate: false - xy: 1593, 315 + xy: 1379, 145 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -14120,28 +15996,28 @@ block-impact-reactor-xlarge index: -1 block-incinerator-large rotate: false - xy: 1703, 933 + xy: 1367, 933 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-incinerator-medium rotate: false - xy: 1899, 613 + xy: 1945, 577 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-incinerator-small rotate: false - xy: 1789, 493 + xy: 1005, 143 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-incinerator-tiny rotate: false - xy: 1596, 297 + xy: 1379, 127 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -14155,28 +16031,28 @@ block-incinerator-xlarge index: -1 block-inverted-sorter-large rotate: false - xy: 1745, 933 + xy: 1409, 933 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-inverted-sorter-medium rotate: false - xy: 1933, 613 + xy: 1911, 545 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-inverted-sorter-small rotate: false - xy: 1815, 493 + xy: 1031, 143 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-inverted-sorter-tiny rotate: false - xy: 1596, 279 + xy: 1384, 109 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -14190,28 +16066,28 @@ block-inverted-sorter-xlarge index: -1 block-item-source-large rotate: false - xy: 1787, 933 + xy: 1451, 933 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-item-source-medium rotate: false - xy: 1915, 579 + xy: 1945, 543 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-item-source-small rotate: false - xy: 1841, 493 + xy: 1057, 143 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-item-source-tiny rotate: false - xy: 1596, 261 + xy: 1384, 91 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -14225,28 +16101,28 @@ block-item-source-xlarge index: -1 block-item-void-large rotate: false - xy: 1829, 933 + xy: 1493, 933 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-item-void-medium rotate: false - xy: 1949, 579 + xy: 1979, 611 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-item-void-small rotate: false - xy: 1867, 493 + xy: 1083, 143 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-item-void-tiny rotate: false - xy: 1596, 243 + xy: 1373, 73 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -14260,28 +16136,28 @@ block-item-void-xlarge index: -1 block-junction-large rotate: false - xy: 1871, 933 + xy: 1535, 933 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-junction-medium rotate: false - xy: 1967, 613 + xy: 1979, 577 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-junction-small rotate: false - xy: 1893, 493 + xy: 1109, 143 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-junction-tiny rotate: false - xy: 1617, 462 + xy: 1391, 73 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -14295,28 +16171,28 @@ block-junction-xlarge index: -1 block-kiln-large rotate: false - xy: 1913, 933 + xy: 1577, 933 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-kiln-medium rotate: false - xy: 1971, 647 + xy: 1979, 543 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-kiln-small rotate: false - xy: 1919, 493 + xy: 1135, 143 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-kiln-tiny rotate: false - xy: 1617, 444 + xy: 1383, 55 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -14330,28 +16206,28 @@ block-kiln-xlarge index: -1 block-lancer-large rotate: false - xy: 1955, 933 + xy: 1619, 933 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-lancer-medium rotate: false - xy: 1977, 681 + xy: 1995, 645 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-lancer-small rotate: false - xy: 1945, 493 + xy: 1161, 143 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-lancer-tiny rotate: false - xy: 1617, 426 + xy: 1383, 37 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -14365,28 +16241,28 @@ block-lancer-xlarge index: -1 block-large-logic-display-large rotate: false - xy: 845, 891 + xy: 1661, 933 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-large-logic-display-medium rotate: false - xy: 1983, 579 + xy: 2003, 679 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-large-logic-display-small rotate: false - xy: 1971, 493 + xy: 1187, 143 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-large-logic-display-tiny rotate: false - xy: 1617, 408 + xy: 1383, 19 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -14400,28 +16276,28 @@ block-large-logic-display-xlarge index: -1 block-laser-drill-large rotate: false - xy: 887, 891 + xy: 1703, 933 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-laser-drill-medium rotate: false - xy: 2001, 613 + xy: 2011, 713 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-laser-drill-small rotate: false - xy: 1997, 493 + xy: 1213, 143 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-laser-drill-tiny rotate: false - xy: 1617, 390 + xy: 1383, 1 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -14435,35 +16311,35 @@ block-laser-drill-xlarge index: -1 block-launch-pad-large rotate: false - xy: 929, 891 + xy: 1745, 933 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-launch-pad-large-large rotate: false - xy: 971, 891 + xy: 1787, 933 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-launch-pad-large-medium rotate: false - xy: 2005, 647 + xy: 2013, 611 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-launch-pad-large-small rotate: false - xy: 2023, 493 + xy: 979, 126 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-launch-pad-large-tiny rotate: false - xy: 1611, 372 + xy: 1401, 55 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -14477,21 +16353,21 @@ block-launch-pad-large-xlarge index: -1 block-launch-pad-medium rotate: false - xy: 1989, 823 + xy: 2013, 577 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-launch-pad-small rotate: false - xy: 1355, 407 + xy: 976, 100 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-launch-pad-tiny rotate: false - xy: 1611, 354 + xy: 1401, 37 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -14505,28 +16381,28 @@ block-launch-pad-xlarge index: -1 block-liquid-junction-large rotate: false - xy: 1013, 891 + xy: 1829, 933 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-liquid-junction-medium rotate: false - xy: 1988, 789 + xy: 2013, 543 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-liquid-junction-small rotate: false - xy: 1381, 433 + xy: 1005, 117 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-liquid-junction-tiny rotate: false - xy: 1611, 336 + xy: 1401, 19 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -14540,28 +16416,28 @@ block-liquid-junction-xlarge index: -1 block-liquid-router-large rotate: false - xy: 1055, 891 + xy: 1871, 933 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-liquid-router-medium rotate: false - xy: 1987, 755 + xy: 1536, 605 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-liquid-router-small rotate: false - xy: 1381, 407 + xy: 1031, 117 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-liquid-router-tiny rotate: false - xy: 1611, 318 + xy: 1401, 1 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -14575,28 +16451,28 @@ block-liquid-router-xlarge index: -1 block-liquid-source-large rotate: false - xy: 1097, 891 + xy: 1913, 933 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-liquid-source-medium rotate: false - xy: 1986, 721 + xy: 1571, 613 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-liquid-source-small rotate: false - xy: 1407, 434 + xy: 1057, 117 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-liquid-source-tiny rotate: false - xy: 1614, 300 + xy: 1703, 561 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -14610,28 +16486,28 @@ block-liquid-source-xlarge index: -1 block-liquid-tank-large rotate: false - xy: 1139, 891 + xy: 1955, 933 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-liquid-tank-medium rotate: false - xy: 869, 257 + xy: 1605, 613 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-liquid-tank-small rotate: false - xy: 1407, 408 + xy: 1083, 117 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-liquid-tank-tiny rotate: false - xy: 1614, 282 + xy: 1721, 563 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -14645,28 +16521,28 @@ block-liquid-tank-xlarge index: -1 block-liquid-void-large rotate: false - xy: 1181, 891 + xy: 845, 891 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-liquid-void-medium rotate: false - xy: 903, 257 + xy: 1639, 613 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-liquid-void-small rotate: false - xy: 1433, 431 + xy: 1109, 117 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-liquid-void-tiny rotate: false - xy: 1614, 264 + xy: 1688, 306 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -14680,28 +16556,28 @@ block-liquid-void-xlarge index: -1 block-logic-display-large rotate: false - xy: 1223, 891 + xy: 887, 891 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-logic-display-medium rotate: false - xy: 937, 257 + xy: 1673, 613 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-logic-display-small rotate: false - xy: 1459, 431 + xy: 1135, 117 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-logic-display-tiny rotate: false - xy: 1614, 246 + xy: 1637, 288 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -14715,28 +16591,28 @@ block-logic-display-xlarge index: -1 block-logic-processor-large rotate: false - xy: 1265, 891 + xy: 929, 891 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-logic-processor-medium rotate: false - xy: 1091, 571 + xy: 1707, 581 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-logic-processor-small rotate: false - xy: 1433, 405 + xy: 1161, 117 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-logic-processor-tiny rotate: false - xy: 1629, 372 + xy: 1655, 288 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -14750,28 +16626,28 @@ block-logic-processor-xlarge index: -1 block-magmarock-large rotate: false - xy: 1307, 891 + xy: 971, 891 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-magmarock-medium rotate: false - xy: 1125, 555 + xy: 1741, 556 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-magmarock-small rotate: false - xy: 1459, 405 + xy: 1187, 117 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-magmarock-tiny rotate: false - xy: 1629, 354 + xy: 1673, 288 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -14785,28 +16661,28 @@ block-magmarock-xlarge index: -1 block-mass-driver-large rotate: false - xy: 1349, 891 + xy: 1013, 891 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-mass-driver-medium rotate: false - xy: 1159, 555 + xy: 1775, 556 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-mass-driver-small rotate: false - xy: 1485, 431 + xy: 1213, 117 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-mass-driver-tiny rotate: false - xy: 1629, 336 + xy: 1691, 288 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -14820,28 +16696,28 @@ block-mass-driver-xlarge index: -1 block-mechanical-drill-large rotate: false - xy: 1391, 891 + xy: 1055, 891 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-mechanical-drill-medium rotate: false - xy: 1193, 555 + xy: 1809, 553 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-mechanical-drill-small rotate: false - xy: 1485, 405 + xy: 1002, 91 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-mechanical-drill-tiny rotate: false - xy: 1629, 318 + xy: 1637, 270 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -14855,28 +16731,28 @@ block-mechanical-drill-xlarge index: -1 block-mechanical-pump-large rotate: false - xy: 1433, 891 + xy: 1097, 891 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-mechanical-pump-medium rotate: false - xy: 1227, 555 + xy: 1843, 539 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-mechanical-pump-small rotate: false - xy: 1511, 437 + xy: 1028, 91 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-mechanical-pump-tiny rotate: false - xy: 1632, 300 + xy: 1655, 270 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -14890,28 +16766,28 @@ block-mechanical-pump-xlarge index: -1 block-meltdown-large rotate: false - xy: 1475, 891 + xy: 1139, 891 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-meltdown-medium rotate: false - xy: 1261, 555 + xy: 1877, 527 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-meltdown-small rotate: false - xy: 1511, 411 + xy: 1054, 91 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-meltdown-tiny rotate: false - xy: 1632, 282 + xy: 1673, 270 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -14925,28 +16801,28 @@ block-meltdown-xlarge index: -1 block-melter-large rotate: false - xy: 1517, 891 + xy: 1181, 891 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-melter-medium rotate: false - xy: 1295, 555 + xy: 1911, 511 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-melter-small rotate: false - xy: 1537, 437 + xy: 1080, 91 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-melter-tiny rotate: false - xy: 1632, 264 + xy: 1691, 270 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -14960,28 +16836,28 @@ block-melter-xlarge index: -1 block-memory-bank-large rotate: false - xy: 1559, 891 + xy: 1223, 891 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-memory-bank-medium rotate: false - xy: 1329, 555 + xy: 1945, 509 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-memory-bank-small rotate: false - xy: 1537, 411 + xy: 1106, 91 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-memory-bank-tiny rotate: false - xy: 1632, 246 + xy: 1721, 545 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -14995,28 +16871,28 @@ block-memory-bank-xlarge index: -1 block-memory-cell-large rotate: false - xy: 1601, 891 + xy: 1265, 891 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-memory-cell-medium rotate: false - xy: 1363, 555 + xy: 1979, 509 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-memory-cell-small rotate: false - xy: 1185, 369 + xy: 1132, 91 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-memory-cell-tiny rotate: false - xy: 1635, 475 + xy: 1739, 538 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -15030,28 +16906,28 @@ block-memory-cell-xlarge index: -1 block-mend-projector-large rotate: false - xy: 1643, 891 + xy: 1307, 891 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-mend-projector-medium rotate: false - xy: 1397, 555 + xy: 2013, 509 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-mend-projector-small rotate: false - xy: 1174, 237 + xy: 1158, 91 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-mend-projector-tiny rotate: false - xy: 1635, 457 + xy: 1757, 538 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -15065,28 +16941,28 @@ block-mend-projector-xlarge index: -1 block-mender-large rotate: false - xy: 1685, 891 + xy: 1349, 891 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-mender-medium rotate: false - xy: 1431, 555 + xy: 1449, 576 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-mender-small rotate: false - xy: 1174, 211 + xy: 1184, 91 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-mender-tiny rotate: false - xy: 1653, 475 + xy: 1775, 538 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -15100,28 +16976,28 @@ block-mender-xlarge index: -1 block-message-large rotate: false - xy: 1727, 891 + xy: 1391, 891 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-message-medium rotate: false - xy: 1465, 555 + xy: 1570, 579 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-message-small rotate: false - xy: 1245, 399 + xy: 1210, 91 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-message-tiny rotate: false - xy: 1635, 439 + xy: 1705, 527 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -15135,28 +17011,28 @@ block-message-xlarge index: -1 block-metal-floor-2-large rotate: false - xy: 1769, 891 + xy: 1433, 891 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-metal-floor-2-medium rotate: false - xy: 1499, 555 + xy: 1604, 579 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-metal-floor-2-small rotate: false - xy: 1271, 401 + xy: 1009, 65 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-metal-floor-2-tiny rotate: false - xy: 1653, 457 + xy: 1705, 509 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -15170,28 +17046,28 @@ block-metal-floor-2-xlarge index: -1 block-metal-floor-3-large rotate: false - xy: 1811, 891 + xy: 1475, 891 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-metal-floor-3-medium rotate: false - xy: 1533, 555 + xy: 1638, 579 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-metal-floor-3-small rotate: false - xy: 1297, 401 + xy: 1035, 65 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-metal-floor-3-tiny rotate: false - xy: 1671, 475 + xy: 1704, 491 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -15205,28 +17081,28 @@ block-metal-floor-3-xlarge index: -1 block-metal-floor-5-large rotate: false - xy: 1853, 891 + xy: 1517, 891 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-metal-floor-5-medium rotate: false - xy: 1567, 555 + xy: 1672, 579 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-metal-floor-5-small rotate: false - xy: 1323, 401 + xy: 1061, 65 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-metal-floor-5-tiny rotate: false - xy: 1635, 421 + xy: 1704, 473 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -15240,28 +17116,28 @@ block-metal-floor-5-xlarge index: -1 block-metal-floor-damaged-large rotate: false - xy: 1895, 891 + xy: 1559, 891 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-metal-floor-damaged-medium rotate: false - xy: 1601, 550 + xy: 636, 81 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-metal-floor-damaged-small rotate: false - xy: 1511, 385 + xy: 1087, 65 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-metal-floor-damaged-tiny rotate: false - xy: 1653, 439 + xy: 1704, 455 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -15275,28 +17151,28 @@ block-metal-floor-damaged-xlarge index: -1 block-metal-floor-large rotate: false - xy: 1937, 891 + xy: 1601, 891 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-metal-floor-medium rotate: false - xy: 1635, 545 + xy: 670, 80 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-metal-floor-small rotate: false - xy: 1537, 385 + xy: 1113, 65 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-metal-floor-tiny rotate: false - xy: 1671, 457 + xy: 1704, 437 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -15310,28 +17186,28 @@ block-metal-floor-xlarge index: -1 block-micro-processor-large rotate: false - xy: 859, 849 + xy: 1643, 891 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-micro-processor-medium rotate: false - xy: 1669, 545 + xy: 704, 80 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-micro-processor-small rotate: false - xy: 1180, 341 + xy: 1139, 65 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-micro-processor-tiny rotate: false - xy: 1689, 475 + xy: 1704, 419 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -15345,28 +17221,28 @@ block-micro-processor-xlarge index: -1 block-moss-large rotate: false - xy: 859, 807 + xy: 1685, 891 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-moss-medium rotate: false - xy: 1703, 545 + xy: 738, 80 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-moss-small rotate: false - xy: 1180, 315 + xy: 1165, 65 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-moss-tiny rotate: false - xy: 1635, 403 + xy: 1715, 401 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -15380,28 +17256,28 @@ block-moss-xlarge index: -1 block-mud-large rotate: false - xy: 901, 849 + xy: 1727, 891 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-mud-medium rotate: false - xy: 1737, 545 + xy: 772, 80 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-mud-small rotate: false - xy: 1180, 289 + xy: 1191, 65 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-mud-tiny rotate: false - xy: 1653, 421 + xy: 1715, 383 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -15415,28 +17291,28 @@ block-mud-xlarge index: -1 block-multi-press-large rotate: false - xy: 859, 765 + xy: 1769, 891 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-multi-press-medium rotate: false - xy: 1771, 545 + xy: 806, 80 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-multi-press-small rotate: false - xy: 1180, 263 + xy: 1217, 65 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-multi-press-tiny rotate: false - xy: 1671, 439 + xy: 1715, 365 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -15450,28 +17326,28 @@ block-multi-press-xlarge index: -1 block-multiplicative-reconstructor-large rotate: false - xy: 901, 807 + xy: 1811, 891 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-multiplicative-reconstructor-medium rotate: false - xy: 1805, 545 + xy: 635, 47 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-multiplicative-reconstructor-small rotate: false - xy: 1200, 237 + xy: 1447, 341 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-multiplicative-reconstructor-tiny rotate: false - xy: 1689, 457 + xy: 1723, 520 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -15485,28 +17361,28 @@ block-multiplicative-reconstructor-xlarge index: -1 block-naval-factory-large rotate: false - xy: 943, 849 + xy: 1853, 891 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-naval-factory-medium rotate: false - xy: 1839, 545 + xy: 669, 46 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-naval-factory-small rotate: false - xy: 1200, 211 + xy: 1236, 91 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-naval-factory-tiny rotate: false - xy: 1707, 475 + xy: 1741, 520 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -15520,28 +17396,28 @@ block-naval-factory-xlarge index: -1 block-oil-extractor-large rotate: false - xy: 859, 723 + xy: 1895, 891 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-oil-extractor-medium rotate: false - xy: 1873, 545 + xy: 703, 46 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-oil-extractor-small rotate: false - xy: 1211, 372 + xy: 1243, 65 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-oil-extractor-tiny rotate: false - xy: 1653, 403 + xy: 1759, 520 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -15555,28 +17431,28 @@ block-oil-extractor-xlarge index: -1 block-ore-coal-large rotate: false - xy: 901, 765 + xy: 1937, 891 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-ore-coal-medium rotate: false - xy: 1907, 545 + xy: 737, 46 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-coal-small rotate: false - xy: 1237, 373 + xy: 1523, 545 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-ore-coal-tiny rotate: false - xy: 1671, 421 + xy: 1777, 520 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -15590,28 +17466,28 @@ block-ore-coal-xlarge index: -1 block-ore-copper-large rotate: false - xy: 943, 807 + xy: 859, 849 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-ore-copper-medium rotate: false - xy: 1941, 545 + xy: 771, 46 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-copper-small rotate: false - xy: 1263, 373 + xy: 1523, 519 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-ore-copper-tiny rotate: false - xy: 1689, 439 + xy: 1723, 502 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -15625,28 +17501,28 @@ block-ore-copper-xlarge index: -1 block-ore-lead-large rotate: false - xy: 985, 849 + xy: 859, 807 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-ore-lead-medium rotate: false - xy: 1975, 545 + xy: 805, 46 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-lead-small rotate: false - xy: 1289, 375 + xy: 1522, 493 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-ore-lead-tiny rotate: false - xy: 1707, 457 + xy: 1741, 502 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -15660,28 +17536,28 @@ block-ore-lead-xlarge index: -1 block-ore-scrap-large rotate: false - xy: 859, 681 + xy: 901, 849 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-ore-scrap-medium rotate: false - xy: 2009, 545 + xy: 619, 13 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-scrap-small rotate: false - xy: 1315, 375 + xy: 1522, 467 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-ore-scrap-tiny rotate: false - xy: 1725, 475 + xy: 1759, 502 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -15695,28 +17571,28 @@ block-ore-scrap-xlarge index: -1 block-ore-thorium-large rotate: false - xy: 901, 723 + xy: 859, 765 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-ore-thorium-medium rotate: false - xy: 974, 325 + xy: 653, 12 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-thorium-small rotate: false - xy: 1341, 375 + xy: 1522, 441 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-ore-thorium-tiny rotate: false - xy: 1671, 403 + xy: 1777, 502 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -15730,28 +17606,28 @@ block-ore-thorium-xlarge index: -1 block-ore-titanium-large rotate: false - xy: 943, 765 + xy: 943, 849 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-ore-titanium-medium rotate: false - xy: 971, 291 + xy: 687, 12 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-titanium-small rotate: false - xy: 1367, 381 + xy: 1522, 415 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-ore-titanium-tiny rotate: false - xy: 1689, 421 + xy: 1722, 484 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -15765,28 +17641,28 @@ block-ore-titanium-xlarge index: -1 block-overdrive-dome-large rotate: false - xy: 985, 807 + xy: 901, 807 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-overdrive-dome-medium rotate: false - xy: 971, 257 + xy: 721, 12 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-overdrive-dome-small rotate: false - xy: 1393, 381 + xy: 1515, 389 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-overdrive-dome-tiny rotate: false - xy: 1707, 439 + xy: 1722, 466 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -15800,28 +17676,28 @@ block-overdrive-dome-xlarge index: -1 block-overdrive-projector-large rotate: false - xy: 1027, 849 + xy: 859, 723 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-overdrive-projector-medium rotate: false - xy: 688, 240 + xy: 755, 12 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-overdrive-projector-small rotate: false - xy: 1419, 379 + xy: 1489, 373 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-overdrive-projector-tiny rotate: false - xy: 1725, 457 + xy: 1740, 484 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -15835,28 +17711,28 @@ block-overdrive-projector-xlarge index: -1 block-overflow-gate-large rotate: false - xy: 901, 681 + xy: 985, 849 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-overflow-gate-medium rotate: false - xy: 688, 206 + xy: 789, 12 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-overflow-gate-small rotate: false - xy: 1445, 379 + xy: 1515, 363 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-overflow-gate-tiny rotate: false - xy: 1743, 475 + xy: 1722, 448 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -15870,28 +17746,28 @@ block-overflow-gate-xlarge index: -1 block-parallax-large rotate: false - xy: 943, 723 + xy: 943, 807 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-parallax-medium rotate: false - xy: 722, 250 + xy: 823, 12 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-parallax-small rotate: false - xy: 1471, 379 + xy: 1241, 299 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-parallax-tiny rotate: false - xy: 1689, 403 + xy: 1740, 466 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -15905,28 +17781,28 @@ block-parallax-xlarge index: -1 block-payload-conveyor-large rotate: false - xy: 985, 765 + xy: 901, 765 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-payload-conveyor-medium rotate: false - xy: 756, 250 + xy: 839, 46 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-payload-conveyor-small rotate: false - xy: 1367, 355 + xy: 1247, 325 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-payload-conveyor-tiny rotate: false - xy: 1707, 421 + xy: 1758, 484 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -15940,28 +17816,28 @@ block-payload-conveyor-xlarge index: -1 block-payload-router-large rotate: false - xy: 1027, 807 + xy: 859, 681 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-payload-router-medium rotate: false - xy: 722, 216 + xy: 840, 80 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-payload-router-small rotate: false - xy: 1393, 355 + xy: 1243, 273 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-payload-router-tiny rotate: false - xy: 1725, 439 + xy: 1722, 430 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -15975,28 +17851,28 @@ block-payload-router-xlarge index: -1 block-pebbles-large rotate: false - xy: 1069, 849 + xy: 1027, 849 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-pebbles-medium rotate: false - xy: 790, 250 + xy: 857, 12 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-pebbles-small rotate: false - xy: 1419, 353 + xy: 1243, 247 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-pebbles-tiny rotate: false - xy: 1743, 457 + xy: 1740, 448 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -16010,28 +17886,28 @@ block-pebbles-xlarge index: -1 block-phase-conduit-large rotate: false - xy: 943, 681 + xy: 985, 807 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-phase-conduit-medium rotate: false - xy: 756, 216 + xy: 873, 46 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-phase-conduit-small rotate: false - xy: 1445, 353 + xy: 1243, 221 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-phase-conduit-tiny rotate: false - xy: 1761, 475 + xy: 1758, 466 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -16045,28 +17921,28 @@ block-phase-conduit-xlarge index: -1 block-phase-conveyor-large rotate: false - xy: 985, 723 + xy: 943, 765 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-phase-conveyor-medium rotate: false - xy: 824, 250 + xy: 891, 12 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-phase-conveyor-small rotate: false - xy: 1471, 353 + xy: 1239, 195 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-phase-conveyor-tiny rotate: false - xy: 1707, 403 + xy: 1776, 484 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -16080,35 +17956,35 @@ block-phase-conveyor-xlarge index: -1 block-phase-wall-large rotate: false - xy: 1027, 765 + xy: 901, 723 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-phase-wall-large-large rotate: false - xy: 1069, 807 + xy: 1069, 849 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-phase-wall-large-medium rotate: false - xy: 790, 216 + xy: 814, 248 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-phase-wall-large-small rotate: false - xy: 1497, 359 + xy: 1239, 169 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-phase-wall-large-tiny rotate: false - xy: 1725, 421 + xy: 1740, 430 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -16122,21 +17998,21 @@ block-phase-wall-large-xlarge index: -1 block-phase-wall-medium rotate: false - xy: 824, 216 + xy: 814, 214 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-phase-wall-small rotate: false - xy: 1523, 359 + xy: 1239, 143 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-phase-wall-tiny rotate: false - xy: 1743, 439 + xy: 1758, 448 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -16150,28 +18026,28 @@ block-phase-wall-xlarge index: -1 block-phase-weaver-large rotate: false - xy: 1111, 849 + xy: 1027, 807 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-phase-weaver-medium rotate: false - xy: 858, 223 + xy: 848, 250 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-phase-weaver-small rotate: false - xy: 1549, 359 + xy: 1239, 117 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-phase-weaver-tiny rotate: false - xy: 1761, 457 + xy: 1776, 466 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -16185,28 +18061,28 @@ block-phase-weaver-xlarge index: -1 block-pine-large rotate: false - xy: 985, 681 + xy: 985, 765 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-pine-medium rotate: false - xy: 892, 223 + xy: 848, 216 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-pine-small rotate: false - xy: 1497, 333 + xy: 1273, 325 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-pine-tiny rotate: false - xy: 1779, 475 + xy: 1758, 430 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -16220,28 +18096,28 @@ block-pine-xlarge index: -1 block-plastanium-compressor-large rotate: false - xy: 1027, 723 + xy: 943, 723 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-plastanium-compressor-medium rotate: false - xy: 926, 223 + xy: 882, 250 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-plastanium-compressor-small rotate: false - xy: 1523, 333 + xy: 1267, 299 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-plastanium-compressor-tiny rotate: false - xy: 1725, 403 + xy: 1776, 448 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -16255,28 +18131,28 @@ block-plastanium-compressor-xlarge index: -1 block-plastanium-conveyor-large rotate: false - xy: 1069, 765 + xy: 901, 681 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-plastanium-conveyor-medium rotate: false - xy: 960, 223 + xy: 882, 216 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-plastanium-conveyor-small rotate: false - xy: 1549, 333 + xy: 1269, 273 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-plastanium-conveyor-tiny rotate: false - xy: 1743, 421 + xy: 1776, 430 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -16290,35 +18166,35 @@ block-plastanium-conveyor-xlarge index: -1 block-plastanium-wall-large rotate: false - xy: 1111, 807 + xy: 1111, 849 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-plastanium-wall-large-large rotate: false - xy: 1153, 849 + xy: 1069, 807 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-plastanium-wall-large-medium rotate: false - xy: 688, 172 + xy: 916, 250 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-plastanium-wall-large-small rotate: false - xy: 1119, 185 + xy: 1269, 247 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-plastanium-wall-large-tiny rotate: false - xy: 1761, 439 + xy: 1733, 412 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -16332,21 +18208,21 @@ block-plastanium-wall-large-xlarge index: -1 block-plastanium-wall-medium rotate: false - xy: 722, 182 + xy: 916, 216 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-plastanium-wall-small rotate: false - xy: 1119, 159 + xy: 1269, 221 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-plastanium-wall-tiny rotate: false - xy: 1779, 457 + xy: 1733, 394 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -16360,28 +18236,28 @@ block-plastanium-wall-xlarge index: -1 block-plated-conduit-large rotate: false - xy: 1027, 681 + xy: 1027, 765 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-plated-conduit-medium rotate: false - xy: 756, 182 + xy: 848, 182 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-plated-conduit-small rotate: false - xy: 1145, 185 + xy: 1265, 195 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-plated-conduit-tiny rotate: false - xy: 1797, 475 + xy: 1751, 412 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -16395,28 +18271,28 @@ block-plated-conduit-xlarge index: -1 block-pneumatic-drill-large rotate: false - xy: 1069, 723 + xy: 985, 723 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-pneumatic-drill-medium rotate: false - xy: 790, 182 + xy: 848, 148 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-pneumatic-drill-small rotate: false - xy: 1119, 133 + xy: 1265, 169 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-pneumatic-drill-tiny rotate: false - xy: 1743, 403 + xy: 1733, 376 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -16430,35 +18306,35 @@ block-pneumatic-drill-xlarge index: -1 block-power-node-large rotate: false - xy: 1111, 765 + xy: 943, 681 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-power-node-large-large rotate: false - xy: 1153, 807 + xy: 1153, 849 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-power-node-large-medium rotate: false - xy: 824, 182 + xy: 848, 114 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-power-node-large-small rotate: false - xy: 1145, 159 + xy: 1265, 143 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-power-node-large-tiny rotate: false - xy: 1761, 421 + xy: 1751, 394 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -16472,21 +18348,21 @@ block-power-node-large-xlarge index: -1 block-power-node-medium rotate: false - xy: 858, 189 + xy: 874, 80 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-power-node-small rotate: false - xy: 1171, 185 + xy: 1265, 117 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-power-node-tiny rotate: false - xy: 1779, 439 + xy: 1769, 412 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -16500,28 +18376,28 @@ block-power-node-xlarge index: -1 block-power-source-large rotate: false - xy: 1195, 849 + xy: 1111, 807 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-power-source-medium rotate: false - xy: 892, 189 + xy: 882, 182 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-power-source-small rotate: false - xy: 1119, 107 + xy: 1262, 91 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-power-source-tiny rotate: false - xy: 1797, 457 + xy: 1751, 376 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -16535,28 +18411,28 @@ block-power-source-xlarge index: -1 block-power-void-large rotate: false - xy: 1069, 681 + xy: 1069, 765 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-power-void-medium rotate: false - xy: 926, 189 + xy: 916, 182 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-power-void-small rotate: false - xy: 1145, 133 + xy: 1299, 325 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-power-void-tiny rotate: false - xy: 1815, 475 + xy: 1769, 394 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -16570,28 +18446,28 @@ block-power-void-xlarge index: -1 block-pulse-conduit-large rotate: false - xy: 1111, 723 + xy: 1027, 723 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-pulse-conduit-medium rotate: false - xy: 960, 189 + xy: 882, 148 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-pulse-conduit-small rotate: false - xy: 1171, 159 + xy: 1293, 299 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-pulse-conduit-tiny rotate: false - xy: 1761, 403 + xy: 1769, 376 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -16605,28 +18481,28 @@ block-pulse-conduit-xlarge index: -1 block-pulverizer-large rotate: false - xy: 1153, 765 + xy: 985, 681 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-pulverizer-medium rotate: false - xy: 677, 138 + xy: 882, 114 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-pulverizer-small rotate: false - xy: 1197, 185 + xy: 1295, 273 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-pulverizer-tiny rotate: false - xy: 1779, 421 + xy: 1733, 358 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -16640,28 +18516,28 @@ block-pulverizer-xlarge index: -1 block-pyratite-mixer-large rotate: false - xy: 1195, 807 + xy: 1195, 849 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-pyratite-mixer-medium rotate: false - xy: 994, 223 + xy: 916, 148 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-pyratite-mixer-small rotate: false - xy: 1119, 81 + xy: 1295, 247 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-pyratite-mixer-tiny rotate: false - xy: 1797, 439 + xy: 1751, 358 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -16675,28 +18551,28 @@ block-pyratite-mixer-xlarge index: -1 block-repair-point-large rotate: false - xy: 1237, 849 + xy: 1153, 807 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-repair-point-medium rotate: false - xy: 994, 189 + xy: 916, 114 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-repair-point-small rotate: false - xy: 1145, 107 + xy: 1295, 221 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-repair-point-tiny rotate: false - xy: 1815, 457 + xy: 1769, 358 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -16710,28 +18586,28 @@ block-repair-point-xlarge index: -1 block-resupply-point-large rotate: false - xy: 1111, 681 + xy: 1111, 765 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-resupply-point-medium rotate: false - xy: 711, 138 + xy: 908, 80 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-resupply-point-small rotate: false - xy: 1171, 133 + xy: 1291, 195 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-resupply-point-tiny rotate: false - xy: 1833, 475 + xy: 1787, 412 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -16745,28 +18621,28 @@ block-resupply-point-xlarge index: -1 block-ripple-large rotate: false - xy: 1153, 723 + xy: 1069, 723 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-ripple-medium rotate: false - xy: 711, 104 + xy: 907, 46 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ripple-small rotate: false - xy: 1197, 159 + xy: 1291, 169 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-ripple-tiny rotate: false - xy: 1779, 403 + xy: 1787, 394 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -16780,28 +18656,28 @@ block-ripple-xlarge index: -1 block-rotary-pump-large rotate: false - xy: 1195, 765 + xy: 1027, 681 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-rotary-pump-medium rotate: false - xy: 745, 148 + xy: 925, 12 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-rotary-pump-small rotate: false - xy: 1119, 55 + xy: 1291, 143 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-rotary-pump-tiny rotate: false - xy: 1797, 421 + xy: 1787, 376 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -16815,28 +18691,28 @@ block-rotary-pump-xlarge index: -1 block-router-large rotate: false - xy: 1237, 807 + xy: 1237, 849 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-router-medium rotate: false - xy: 779, 148 + xy: 941, 46 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-router-small rotate: false - xy: 1145, 81 + xy: 1291, 117 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-router-tiny rotate: false - xy: 1815, 439 + xy: 1787, 358 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -16850,28 +18726,28 @@ block-router-xlarge index: -1 block-rtg-generator-large rotate: false - xy: 1279, 849 + xy: 1195, 807 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-rtg-generator-medium rotate: false - xy: 745, 114 + xy: 942, 80 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-rtg-generator-small rotate: false - xy: 1171, 107 + xy: 1288, 91 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-rtg-generator-tiny rotate: false - xy: 1833, 457 + xy: 1794, 484 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -16885,56 +18761,56 @@ block-rtg-generator-xlarge index: -1 block-salt-large rotate: false - xy: 1153, 681 + xy: 1153, 765 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-salt-medium rotate: false - xy: 779, 114 + xy: 959, 12 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-salt-small rotate: false - xy: 1197, 133 + xy: 1269, 65 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-salt-tiny rotate: false - xy: 1851, 475 + xy: 1794, 466 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-salt-wall-large rotate: false - xy: 1195, 723 + xy: 1111, 723 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-salt-wall-medium rotate: false - xy: 813, 148 + xy: 975, 46 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-salt-wall-small rotate: false - xy: 1119, 29 + xy: 1325, 331 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-salt-wall-tiny rotate: false - xy: 1797, 403 + xy: 1794, 448 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -16955,28 +18831,28 @@ block-salt-xlarge index: -1 block-salvo-large rotate: false - xy: 1237, 765 + xy: 1069, 681 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-salvo-medium rotate: false - xy: 813, 114 + xy: 993, 12 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-salvo-small rotate: false - xy: 1145, 55 + xy: 1351, 331 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-salvo-tiny rotate: false - xy: 1815, 421 + xy: 1794, 430 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -16990,28 +18866,28 @@ block-salvo-xlarge index: -1 block-sand-boulder-large rotate: false - xy: 1279, 807 + xy: 1279, 849 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-sand-boulder-medium rotate: false - xy: 745, 80 + xy: 1533, 571 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-sand-boulder-small rotate: false - xy: 1171, 81 + xy: 1295, 65 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-sand-boulder-tiny rotate: false - xy: 1833, 439 + xy: 1805, 412 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -17025,56 +18901,56 @@ block-sand-boulder-xlarge index: -1 block-sand-large rotate: false - xy: 1321, 849 + xy: 1237, 807 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-sand-medium rotate: false - xy: 779, 80 + xy: 1483, 563 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-sand-small rotate: false - xy: 1197, 107 + xy: 1377, 325 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-sand-tiny rotate: false - xy: 1851, 457 + xy: 1805, 394 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-sand-wall-large rotate: false - xy: 1195, 681 + xy: 1195, 765 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-sand-wall-medium rotate: false - xy: 813, 80 + xy: 1567, 545 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-sand-wall-small rotate: false - xy: 1145, 29 + xy: 1314, 91 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-sand-wall-tiny rotate: false - xy: 1869, 475 + xy: 1805, 376 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -17088,28 +18964,28 @@ block-sand-wall-xlarge index: -1 block-sand-water-large rotate: false - xy: 1237, 723 + xy: 1153, 723 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-sand-water-medium rotate: false - xy: 847, 148 + xy: 1601, 545 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-sand-water-small rotate: false - xy: 1171, 55 + xy: 1321, 65 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-sand-water-tiny rotate: false - xy: 1815, 403 + xy: 1805, 358 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -17130,28 +19006,28 @@ block-sand-xlarge index: -1 block-scatter-large rotate: false - xy: 1279, 765 + xy: 1111, 681 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-scatter-medium rotate: false - xy: 847, 114 + xy: 1635, 545 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-scatter-small rotate: false - xy: 1197, 81 + xy: 1549, 519 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-scatter-tiny rotate: false - xy: 1833, 421 + xy: 1391, 287 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -17165,28 +19041,28 @@ block-scatter-xlarge index: -1 block-scorch-large rotate: false - xy: 1321, 807 + xy: 1321, 849 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-scorch-medium rotate: false - xy: 847, 80 + xy: 1669, 545 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-scorch-small rotate: false - xy: 1171, 29 + xy: 1548, 493 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-scorch-tiny rotate: false - xy: 1851, 439 + xy: 1391, 269 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -17200,28 +19076,28 @@ block-scorch-xlarge index: -1 block-scrap-wall-gigantic-large rotate: false - xy: 1363, 849 + xy: 1279, 807 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-scrap-wall-gigantic-medium rotate: false - xy: 881, 155 + xy: 979, 537 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-scrap-wall-gigantic-small rotate: false - xy: 1197, 55 + xy: 1575, 519 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-scrap-wall-gigantic-tiny rotate: false - xy: 1869, 457 + xy: 1391, 251 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -17235,28 +19111,28 @@ block-scrap-wall-gigantic-xlarge index: -1 block-scrap-wall-huge-large rotate: false - xy: 1237, 681 + xy: 1237, 765 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-scrap-wall-huge-medium rotate: false - xy: 881, 121 + xy: 979, 503 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-scrap-wall-huge-small rotate: false - xy: 1197, 29 + xy: 1548, 467 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-scrap-wall-huge-tiny rotate: false - xy: 1887, 475 + xy: 1391, 233 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -17270,35 +19146,35 @@ block-scrap-wall-huge-xlarge index: -1 block-scrap-wall-large rotate: false - xy: 1279, 723 + xy: 1195, 723 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-scrap-wall-large-large rotate: false - xy: 1321, 765 + xy: 1153, 681 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-scrap-wall-large-medium rotate: false - xy: 915, 155 + xy: 979, 469 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-scrap-wall-large-small rotate: false - xy: 1119, 3 + xy: 1574, 493 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-scrap-wall-large-tiny rotate: false - xy: 1833, 403 + xy: 1409, 292 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -17312,21 +19188,21 @@ block-scrap-wall-large-xlarge index: -1 block-scrap-wall-medium rotate: false - xy: 881, 87 + xy: 979, 435 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-scrap-wall-small rotate: false - xy: 1145, 3 + xy: 1601, 519 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-scrap-wall-tiny rotate: false - xy: 1851, 421 + xy: 1409, 274 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -17340,28 +19216,28 @@ block-scrap-wall-xlarge index: -1 block-segment-large rotate: false - xy: 1363, 807 + xy: 1363, 849 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-segment-medium rotate: false - xy: 915, 121 + xy: 979, 401 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-segment-small rotate: false - xy: 1171, 3 + xy: 1548, 441 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-segment-tiny rotate: false - xy: 1869, 439 + xy: 1409, 256 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -17375,28 +19251,28 @@ block-segment-xlarge index: -1 block-separator-large rotate: false - xy: 1405, 849 + xy: 1321, 807 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-separator-medium rotate: false - xy: 949, 155 + xy: 1013, 555 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-separator-small rotate: false - xy: 1197, 3 + xy: 1574, 467 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-separator-tiny rotate: false - xy: 1887, 457 + xy: 1409, 238 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -17410,28 +19286,28 @@ block-separator-xlarge index: -1 block-shale-boulder-large rotate: false - xy: 1279, 681 + xy: 1279, 765 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-shale-boulder-medium rotate: false - xy: 915, 87 + xy: 1047, 555 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-shale-boulder-small rotate: false - xy: 1206, 343 + xy: 1600, 493 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-shale-boulder-tiny rotate: false - xy: 1905, 475 + xy: 1427, 287 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -17445,56 +19321,56 @@ block-shale-boulder-xlarge index: -1 block-shale-large rotate: false - xy: 1321, 723 + xy: 1237, 723 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-shale-medium rotate: false - xy: 949, 121 + xy: 1013, 521 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-shale-small rotate: false - xy: 1206, 317 + xy: 1627, 519 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-shale-tiny rotate: false - xy: 1851, 403 + xy: 1445, 287 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-shale-wall-large rotate: false - xy: 1363, 765 + xy: 1195, 681 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-shale-wall-medium rotate: false - xy: 983, 155 + xy: 1081, 555 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-shale-wall-small rotate: false - xy: 1206, 291 + xy: 1548, 415 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-shale-wall-tiny rotate: false - xy: 1869, 421 + xy: 1427, 269 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -17515,28 +19391,28 @@ block-shale-xlarge index: -1 block-shock-mine-large rotate: false - xy: 1405, 807 + xy: 1405, 849 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-shock-mine-medium rotate: false - xy: 949, 87 + xy: 1013, 487 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-shock-mine-small rotate: false - xy: 1206, 265 + xy: 1541, 389 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-shock-mine-tiny rotate: false - xy: 1887, 439 + xy: 1463, 287 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -17550,28 +19426,28 @@ block-shock-mine-xlarge index: -1 block-shrubs-large rotate: false - xy: 1447, 849 + xy: 1363, 807 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-shrubs-medium rotate: false - xy: 983, 121 + xy: 1047, 521 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-shrubs-small rotate: false - xy: 1226, 239 + xy: 1574, 441 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-shrubs-tiny rotate: false - xy: 1905, 457 + xy: 1427, 251 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -17585,28 +19461,28 @@ block-shrubs-xlarge index: -1 block-silicon-crucible-large rotate: false - xy: 1321, 681 + xy: 1321, 765 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-silicon-crucible-medium rotate: false - xy: 983, 87 + xy: 1115, 555 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-silicon-crucible-small rotate: false - xy: 1226, 213 + xy: 1600, 467 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-silicon-crucible-tiny rotate: false - xy: 1923, 475 + xy: 1445, 269 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -17620,28 +19496,28 @@ block-silicon-crucible-xlarge index: -1 block-silicon-smelter-large rotate: false - xy: 1363, 723 + xy: 1279, 723 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-silicon-smelter-medium rotate: false - xy: 1017, 155 + xy: 1013, 453 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-silicon-smelter-small rotate: false - xy: 1223, 185 + xy: 1626, 493 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-silicon-smelter-tiny rotate: false - xy: 1869, 403 + xy: 1481, 287 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -17655,28 +19531,28 @@ block-silicon-smelter-xlarge index: -1 block-slag-large rotate: false - xy: 1405, 765 + xy: 1237, 681 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-slag-medium rotate: false - xy: 1017, 121 + xy: 1047, 487 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-slag-small rotate: false - xy: 1223, 159 + xy: 1653, 519 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-slag-tiny rotate: false - xy: 1887, 421 + xy: 1445, 251 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -17690,28 +19566,28 @@ block-slag-xlarge index: -1 block-snow-boulder-large rotate: false - xy: 1447, 807 + xy: 1447, 849 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-snow-boulder-medium rotate: false - xy: 1017, 87 + xy: 1081, 521 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-snow-boulder-small rotate: false - xy: 1223, 133 + xy: 1541, 363 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-snow-boulder-tiny rotate: false - xy: 1905, 439 + xy: 1463, 269 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -17725,42 +19601,42 @@ block-snow-boulder-xlarge index: -1 block-snow-large rotate: false - xy: 1489, 849 + xy: 1405, 807 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-snow-medium rotate: false - xy: 881, 53 + xy: 1149, 555 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-snow-pine-large rotate: false - xy: 1363, 681 + xy: 1363, 765 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-snow-pine-medium rotate: false - xy: 915, 53 + xy: 1013, 419 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-snow-pine-small rotate: false - xy: 1223, 107 + xy: 1574, 415 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-snow-pine-tiny rotate: false - xy: 1923, 457 + xy: 1463, 251 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -17774,42 +19650,42 @@ block-snow-pine-xlarge index: -1 block-snow-small rotate: false - xy: 1223, 81 + xy: 1567, 389 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-snow-tiny rotate: false - xy: 1941, 475 + xy: 1481, 269 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-snow-wall-large rotate: false - xy: 1405, 723 + xy: 1321, 723 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-snow-wall-medium rotate: false - xy: 949, 53 + xy: 1047, 453 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-snow-wall-small rotate: false - xy: 1223, 55 + xy: 1600, 441 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-snow-wall-tiny rotate: false - xy: 1887, 403 + xy: 1481, 251 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -17830,35 +19706,35 @@ block-snow-xlarge index: -1 block-solar-panel-large rotate: false - xy: 1447, 765 + xy: 1279, 681 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-solar-panel-large-large rotate: false - xy: 1489, 807 + xy: 1489, 849 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-solar-panel-large-medium rotate: false - xy: 983, 53 + xy: 1081, 487 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-solar-panel-large-small rotate: false - xy: 1223, 29 + xy: 1626, 467 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-solar-panel-large-tiny rotate: false - xy: 1905, 421 + xy: 1427, 233 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -17872,21 +19748,21 @@ block-solar-panel-large-xlarge index: -1 block-solar-panel-medium rotate: false - xy: 1017, 53 + xy: 1115, 521 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-solar-panel-small rotate: false - xy: 1223, 3 + xy: 1652, 493 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-solar-panel-tiny rotate: false - xy: 1923, 439 + xy: 1445, 233 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -17900,28 +19776,28 @@ block-solar-panel-xlarge index: -1 block-sorter-large rotate: false - xy: 1531, 849 + xy: 1447, 807 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-sorter-medium rotate: false - xy: 979, 529 + xy: 1183, 555 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-sorter-small rotate: false - xy: 1289, 349 + xy: 1567, 363 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-sorter-tiny rotate: false - xy: 1941, 457 + xy: 1463, 233 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -17933,1304 +19809,1339 @@ block-sorter-xlarge orig: 48, 48 offset: 0, 0 index: -1 -block-spawn-large +block-space-large rotate: false - xy: 1405, 681 + xy: 1405, 765 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-spawn-medium +block-space-medium rotate: false - xy: 979, 495 + xy: 1047, 419 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-spawn-small +block-space-small rotate: false - xy: 1315, 349 + xy: 1600, 415 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-spawn-tiny +block-space-tiny rotate: false - xy: 1959, 475 + xy: 1481, 233 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-spawn-xlarge +block-space-xlarge rotate: false xy: 451, 566 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-spectre-large +block-spawn-large rotate: false - xy: 1447, 723 + xy: 1363, 723 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-spectre-medium +block-spawn-medium rotate: false - xy: 979, 461 + xy: 1081, 453 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-spectre-small +block-spawn-small rotate: false - xy: 1341, 349 + xy: 1593, 389 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-spectre-tiny +block-spawn-tiny rotate: false - xy: 1905, 403 + xy: 1409, 220 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-spectre-xlarge +block-spawn-xlarge rotate: false xy: 351, 416 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-spore-cluster-large +block-spectre-large rotate: false - xy: 1489, 765 + xy: 1321, 681 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-spore-cluster-medium +block-spectre-medium rotate: false - xy: 979, 427 + xy: 1115, 487 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-spore-cluster-small +block-spectre-small rotate: false - xy: 1367, 329 + xy: 1626, 441 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-spore-cluster-tiny +block-spectre-tiny rotate: false - xy: 1923, 421 + xy: 1427, 215 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-spore-cluster-xlarge +block-spectre-xlarge rotate: false xy: 401, 466 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-spore-moss-large +block-spore-cluster-large rotate: false - xy: 1531, 807 + xy: 1531, 849 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-spore-moss-medium +block-spore-cluster-medium rotate: false - xy: 979, 393 + xy: 1149, 521 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-spore-moss-small +block-spore-cluster-small rotate: false - xy: 1393, 329 + xy: 1652, 467 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-spore-moss-tiny +block-spore-cluster-tiny rotate: false - xy: 1941, 439 + xy: 1445, 215 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-spore-moss-xlarge +block-spore-cluster-xlarge rotate: false xy: 451, 516 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-spore-pine-large +block-spore-moss-large rotate: false - xy: 1573, 849 + xy: 1489, 807 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-spore-pine-medium +block-spore-moss-medium rotate: false - xy: 979, 359 + xy: 1217, 555 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-spore-pine-small +block-spore-moss-small rotate: false - xy: 1419, 327 + xy: 1593, 363 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-spore-pine-tiny +block-spore-moss-tiny rotate: false - xy: 1959, 457 + xy: 1463, 215 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-spore-pine-xlarge +block-spore-moss-xlarge rotate: false xy: 501, 566 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-spore-press-large +block-spore-pine-large rotate: false - xy: 1447, 681 + xy: 1447, 765 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-spore-press-medium +block-spore-pine-medium rotate: false - xy: 1008, 325 + xy: 1081, 419 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-spore-press-small +block-spore-pine-small rotate: false - xy: 1445, 327 + xy: 1626, 415 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-spore-press-tiny +block-spore-pine-tiny rotate: false - xy: 1977, 475 + xy: 1481, 215 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-spore-press-xlarge +block-spore-pine-xlarge rotate: false xy: 351, 366 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-spore-wall-large +block-spore-press-large rotate: false - xy: 1489, 723 + xy: 1405, 723 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-spore-wall-medium +block-spore-press-medium rotate: false - xy: 1005, 291 + xy: 1115, 453 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-spore-wall-small +block-spore-press-small rotate: false - xy: 1471, 327 + xy: 1619, 389 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-spore-wall-tiny +block-spore-press-tiny rotate: false - xy: 1923, 403 + xy: 1499, 283 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-spore-wall-xlarge +block-spore-press-xlarge rotate: false xy: 401, 416 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-steam-generator-large +block-spore-wall-large rotate: false - xy: 1531, 765 + xy: 1363, 681 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-steam-generator-medium +block-spore-wall-medium rotate: false - xy: 1005, 257 + xy: 1149, 487 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-steam-generator-small +block-spore-wall-small rotate: false - xy: 1497, 307 + xy: 1652, 441 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-steam-generator-tiny +block-spore-wall-tiny rotate: false - xy: 1941, 421 + xy: 1517, 283 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-steam-generator-xlarge +block-spore-wall-xlarge rotate: false xy: 451, 466 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-stone-large +block-steam-generator-large rotate: false - xy: 1573, 807 + xy: 1573, 849 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-stone-medium +block-steam-generator-medium rotate: false - xy: 1028, 223 + xy: 1183, 521 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-stone-small +block-steam-generator-small rotate: false - xy: 1523, 307 + xy: 1619, 363 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-stone-tiny +block-steam-generator-tiny rotate: false - xy: 1959, 439 + xy: 1499, 265 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-stone-wall-large - rotate: false - xy: 1615, 849 - size: 40, 40 - orig: 40, 40 - offset: 0, 0 - index: -1 -block-stone-wall-medium - rotate: false - xy: 1028, 189 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -block-stone-wall-small - rotate: false - xy: 1549, 307 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -block-stone-wall-tiny - rotate: false - xy: 1977, 457 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -block-stone-wall-xlarge +block-steam-generator-xlarge rotate: false xy: 501, 516 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-stone-xlarge +block-stone-large + rotate: false + xy: 1531, 807 + size: 40, 40 + orig: 40, 40 + offset: 0, 0 + index: -1 +block-stone-medium + rotate: false + xy: 1251, 555 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +block-stone-small + rotate: false + xy: 1652, 415 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +block-stone-tiny + rotate: false + xy: 1535, 283 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +block-stone-wall-large + rotate: false + xy: 1489, 765 + size: 40, 40 + orig: 40, 40 + offset: 0, 0 + index: -1 +block-stone-wall-medium + rotate: false + xy: 1115, 419 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +block-stone-wall-small + rotate: false + xy: 1645, 389 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +block-stone-wall-tiny + rotate: false + xy: 1499, 247 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +block-stone-wall-xlarge rotate: false xy: 551, 566 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-surge-tower-large - rotate: false - xy: 1489, 681 - size: 40, 40 - orig: 40, 40 - offset: 0, 0 - index: -1 -block-surge-tower-medium - rotate: false - xy: 1051, 155 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -block-surge-tower-small - rotate: false - xy: 1232, 346 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -block-surge-tower-tiny - rotate: false - xy: 1995, 475 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -block-surge-tower-xlarge +block-stone-xlarge rotate: false xy: 351, 316 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-surge-wall-large +block-surge-tower-large rotate: false - xy: 1531, 723 + xy: 1447, 723 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-surge-wall-large-large +block-surge-tower-medium rotate: false - xy: 1573, 765 - size: 40, 40 - orig: 40, 40 - offset: 0, 0 - index: -1 -block-surge-wall-large-medium - rotate: false - xy: 1051, 121 + xy: 1149, 453 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-surge-wall-large-small +block-surge-tower-small rotate: false - xy: 1232, 320 + xy: 1645, 363 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-surge-wall-large-tiny +block-surge-tower-tiny rotate: false - xy: 1941, 403 + xy: 1517, 265 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-surge-wall-large-xlarge +block-surge-tower-xlarge rotate: false xy: 401, 366 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-surge-wall-medium +block-surge-wall-large rotate: false - xy: 1051, 87 + xy: 1405, 681 + size: 40, 40 + orig: 40, 40 + offset: 0, 0 + index: -1 +block-surge-wall-large-large + rotate: false + xy: 1615, 849 + size: 40, 40 + orig: 40, 40 + offset: 0, 0 + index: -1 +block-surge-wall-large-medium + rotate: false + xy: 1183, 487 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-surge-wall-small +block-surge-wall-large-small rotate: false - xy: 1232, 294 + xy: 1679, 519 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-surge-wall-tiny +block-surge-wall-large-tiny rotate: false - xy: 1959, 421 + xy: 1499, 229 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-surge-wall-xlarge +block-surge-wall-large-xlarge rotate: false xy: 451, 416 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-swarmer-large +block-surge-wall-medium rotate: false - xy: 1615, 807 - size: 40, 40 - orig: 40, 40 - offset: 0, 0 - index: -1 -block-swarmer-medium - rotate: false - xy: 1051, 53 + xy: 1217, 521 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-swarmer-small +block-surge-wall-small rotate: false - xy: 1232, 268 + xy: 1678, 493 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-swarmer-tiny +block-surge-wall-tiny rotate: false - xy: 1977, 439 + xy: 1517, 247 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-swarmer-xlarge +block-surge-wall-xlarge rotate: false xy: 501, 466 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-switch-large +block-swarmer-large rotate: false - xy: 1657, 849 + xy: 1573, 807 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-switch-medium +block-swarmer-medium rotate: false - xy: 2011, 687 + xy: 1285, 555 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-switch-small +block-swarmer-small rotate: false - xy: 1258, 347 + xy: 1678, 467 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-switch-tiny +block-swarmer-tiny rotate: false - xy: 1995, 457 + xy: 1535, 265 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-switch-xlarge +block-swarmer-xlarge rotate: false xy: 551, 516 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-tainted-water-large +block-switch-large rotate: false - xy: 1531, 681 + xy: 1531, 765 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-tainted-water-medium +block-switch-medium rotate: false - xy: 779, 46 + xy: 1149, 419 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-tainted-water-small +block-switch-small rotate: false - xy: 1258, 321 + xy: 1678, 441 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-tainted-water-tiny +block-switch-tiny rotate: false - xy: 2013, 475 + xy: 1517, 229 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-tainted-water-xlarge +block-switch-xlarge rotate: false xy: 601, 566 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-tar-large +block-tainted-water-large rotate: false - xy: 1573, 723 + xy: 1489, 723 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-tar-medium +block-tainted-water-medium rotate: false - xy: 779, 12 + xy: 1183, 453 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-tar-small +block-tainted-water-small rotate: false - xy: 1258, 295 + xy: 1678, 415 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-tar-tiny +block-tainted-water-tiny rotate: false - xy: 2031, 475 + xy: 1535, 247 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-tar-xlarge +block-tainted-water-xlarge rotate: false xy: 351, 266 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-tendrils-large +block-tar-large rotate: false - xy: 1615, 765 + xy: 1447, 681 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-tendrils-medium +block-tar-medium rotate: false - xy: 813, 46 + xy: 1217, 487 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-tendrils-small +block-tar-small rotate: false - xy: 1258, 269 + xy: 1671, 389 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-tendrils-tiny +block-tar-tiny rotate: false - xy: 1959, 403 + xy: 1535, 229 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-tendrils-xlarge +block-tar-xlarge rotate: false xy: 401, 316 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-tetrative-reconstructor-large +block-tendrils-large rotate: false - xy: 1657, 807 + xy: 1657, 849 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-tetrative-reconstructor-medium +block-tendrils-medium rotate: false - xy: 847, 46 + xy: 1251, 521 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-tetrative-reconstructor-small +block-tendrils-small rotate: false - xy: 1284, 323 + xy: 1671, 363 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-tetrative-reconstructor-tiny +block-tendrils-tiny rotate: false - xy: 1977, 421 + xy: 1499, 211 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-tetrative-reconstructor-xlarge +block-tendrils-xlarge rotate: false xy: 451, 366 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-thermal-generator-large +block-tetrative-reconstructor-large rotate: false - xy: 1699, 849 + xy: 1615, 807 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-thermal-generator-medium +block-tetrative-reconstructor-medium rotate: false - xy: 813, 12 + xy: 1319, 555 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-thermal-generator-small +block-tetrative-reconstructor-small rotate: false - xy: 1310, 323 + xy: 1473, 341 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-thermal-generator-tiny +block-tetrative-reconstructor-tiny rotate: false - xy: 1995, 439 + xy: 1517, 211 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-thermal-generator-xlarge +block-tetrative-reconstructor-xlarge rotate: false xy: 501, 416 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-thermal-pump-large +block-thermal-generator-large rotate: false - xy: 1573, 681 + xy: 1573, 765 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-thermal-pump-medium +block-thermal-generator-medium rotate: false - xy: 847, 12 + xy: 1183, 419 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-thermal-pump-small +block-thermal-generator-small rotate: false - xy: 1284, 297 + xy: 1319, 299 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-thermal-pump-tiny +block-thermal-generator-tiny rotate: false - xy: 2013, 457 + xy: 1535, 211 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-thermal-pump-xlarge +block-thermal-generator-xlarge rotate: false xy: 551, 466 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-thorium-reactor-large +block-thermal-pump-large rotate: false - xy: 1615, 723 + xy: 1531, 723 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-thorium-reactor-medium +block-thermal-pump-medium rotate: false - xy: 881, 19 + xy: 1217, 453 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-thorium-reactor-small +block-thermal-pump-small rotate: false - xy: 1336, 323 + xy: 1321, 273 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-thorium-reactor-tiny +block-thermal-pump-tiny rotate: false - xy: 2031, 457 + xy: 1553, 271 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-thorium-reactor-xlarge +block-thermal-pump-xlarge rotate: false xy: 601, 516 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-thorium-wall-large +block-thorium-reactor-large rotate: false - xy: 1657, 765 + xy: 1489, 681 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-thorium-wall-large-large +block-thorium-reactor-medium rotate: false - xy: 1699, 807 - size: 40, 40 - orig: 40, 40 - offset: 0, 0 - index: -1 -block-thorium-wall-large-medium - rotate: false - xy: 915, 19 + xy: 1251, 487 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-thorium-wall-large-small +block-thorium-reactor-small rotate: false - xy: 1284, 271 + xy: 1321, 247 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-thorium-wall-large-tiny +block-thorium-reactor-tiny rotate: false - xy: 1977, 403 + xy: 1571, 271 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-thorium-wall-large-xlarge +block-thorium-reactor-xlarge rotate: false xy: 651, 566 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-thorium-wall-medium +block-thorium-wall-large rotate: false - xy: 949, 19 + xy: 1699, 849 + size: 40, 40 + orig: 40, 40 + offset: 0, 0 + index: -1 +block-thorium-wall-large-large + rotate: false + xy: 1657, 807 + size: 40, 40 + orig: 40, 40 + offset: 0, 0 + index: -1 +block-thorium-wall-large-medium + rotate: false + xy: 1285, 521 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-thorium-wall-small +block-thorium-wall-large-small rotate: false - xy: 1310, 297 + xy: 1321, 221 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-thorium-wall-tiny +block-thorium-wall-large-tiny rotate: false - xy: 1995, 421 + xy: 1553, 253 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-thorium-wall-xlarge +block-thorium-wall-large-xlarge rotate: false xy: 351, 216 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-thruster-large +block-thorium-wall-medium rotate: false - xy: 1741, 849 - size: 40, 40 - orig: 40, 40 - offset: 0, 0 - index: -1 -block-thruster-medium - rotate: false - xy: 983, 19 + xy: 1353, 555 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-thruster-small +block-thorium-wall-small rotate: false - xy: 1310, 271 + xy: 1317, 195 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-thruster-tiny +block-thorium-wall-tiny rotate: false - xy: 2013, 439 + xy: 1553, 235 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-thruster-xlarge +block-thorium-wall-xlarge rotate: false xy: 401, 266 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-titanium-conveyor-large +block-thruster-large rotate: false - xy: 1615, 681 + xy: 1615, 765 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-titanium-conveyor-medium +block-thruster-medium rotate: false - xy: 1017, 19 + xy: 1217, 419 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-titanium-conveyor-small +block-thruster-small rotate: false - xy: 1336, 297 + xy: 1317, 169 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-titanium-conveyor-tiny +block-thruster-tiny rotate: false - xy: 2031, 439 + xy: 1571, 253 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-titanium-conveyor-xlarge +block-thruster-xlarge rotate: false xy: 451, 316 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-titanium-wall-large +block-titanium-conveyor-large rotate: false - xy: 1657, 723 + xy: 1573, 723 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-titanium-wall-large-large +block-titanium-conveyor-medium rotate: false - xy: 1699, 765 - size: 40, 40 - orig: 40, 40 - offset: 0, 0 - index: -1 -block-titanium-wall-large-medium - rotate: false - xy: 1051, 19 + xy: 1251, 453 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-titanium-wall-large-small +block-titanium-conveyor-small rotate: false - xy: 1336, 271 + xy: 1317, 143 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-titanium-wall-large-tiny +block-titanium-conveyor-tiny rotate: false - xy: 1995, 403 + xy: 1553, 217 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-titanium-wall-large-xlarge +block-titanium-conveyor-xlarge rotate: false xy: 501, 366 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-titanium-wall-medium +block-titanium-wall-large rotate: false - xy: 1039, 291 + xy: 1531, 681 + size: 40, 40 + orig: 40, 40 + offset: 0, 0 + index: -1 +block-titanium-wall-large-large + rotate: false + xy: 1741, 849 + size: 40, 40 + orig: 40, 40 + offset: 0, 0 + index: -1 +block-titanium-wall-large-medium + rotate: false + xy: 1285, 487 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-titanium-wall-small +block-titanium-wall-large-small rotate: false - xy: 1362, 303 + xy: 1317, 117 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-titanium-wall-tiny +block-titanium-wall-large-tiny rotate: false - xy: 2013, 421 + xy: 1571, 235 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-titanium-wall-xlarge +block-titanium-wall-large-xlarge rotate: false xy: 551, 416 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-tsunami-large +block-titanium-wall-medium rotate: false - xy: 1741, 807 - size: 40, 40 - orig: 40, 40 - offset: 0, 0 - index: -1 -block-tsunami-medium - rotate: false - xy: 1039, 257 + xy: 1319, 521 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-tsunami-small +block-titanium-wall-small rotate: false - xy: 1388, 303 + xy: 1345, 305 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-tsunami-tiny +block-titanium-wall-tiny rotate: false - xy: 2031, 421 + xy: 1571, 217 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-tsunami-xlarge +block-titanium-wall-xlarge rotate: false xy: 601, 466 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-underflow-gate-large +block-tsunami-large rotate: false - xy: 1783, 849 + xy: 1699, 807 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-underflow-gate-medium +block-tsunami-medium rotate: false - xy: 1062, 223 + xy: 1387, 555 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-underflow-gate-small +block-tsunami-small rotate: false - xy: 1362, 277 + xy: 1347, 279 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-underflow-gate-tiny +block-tsunami-tiny rotate: false - xy: 2013, 403 + xy: 1589, 262 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-underflow-gate-xlarge +block-tsunami-xlarge rotate: false xy: 651, 516 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-unloader-large +block-underflow-gate-large rotate: false - xy: 1657, 681 + xy: 1657, 765 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-unloader-medium +block-underflow-gate-medium rotate: false - xy: 1062, 189 + xy: 1251, 419 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-unloader-small +block-underflow-gate-small rotate: false - xy: 1388, 277 + xy: 1347, 253 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-unloader-tiny +block-underflow-gate-tiny rotate: false - xy: 2031, 403 + xy: 1589, 244 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-unloader-xlarge +block-underflow-gate-xlarge rotate: false xy: 701, 566 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-vault-large +block-unloader-large rotate: false - xy: 1699, 723 + xy: 1615, 723 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-vault-medium +block-unloader-medium rotate: false - xy: 1085, 155 + xy: 1285, 453 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-vault-small +block-unloader-small rotate: false - xy: 1414, 301 + xy: 1347, 227 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-vault-tiny +block-unloader-tiny rotate: false - xy: 1647, 385 + xy: 1589, 226 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-vault-xlarge +block-unloader-xlarge rotate: false xy: 351, 166 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-water-extractor-large +block-vault-large rotate: false - xy: 1741, 765 + xy: 1573, 681 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-water-extractor-medium +block-vault-medium rotate: false - xy: 1085, 121 + xy: 1319, 487 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-water-extractor-small +block-vault-small rotate: false - xy: 1440, 301 + xy: 1340, 91 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-water-extractor-tiny +block-vault-tiny rotate: false - xy: 1647, 367 + xy: 1589, 208 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-water-extractor-xlarge +block-vault-xlarge rotate: false xy: 401, 216 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-water-large +block-water-extractor-large rotate: false - xy: 1783, 807 + xy: 1783, 849 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-water-medium +block-water-extractor-medium rotate: false - xy: 1085, 87 + xy: 1353, 521 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-water-small +block-water-extractor-small rotate: false - xy: 1466, 301 + xy: 1347, 65 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-water-tiny +block-water-extractor-tiny rotate: false - xy: 1665, 385 + xy: 1607, 257 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-water-xlarge +block-water-extractor-xlarge rotate: false xy: 451, 266 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-wave-large +block-water-large rotate: false - xy: 1825, 849 + xy: 1741, 807 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-wave-medium +block-water-medium rotate: false - xy: 1085, 53 + xy: 1285, 419 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-wave-small +block-water-small rotate: false - xy: 1414, 275 + xy: 1027, 39 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-wave-tiny +block-water-tiny rotate: false - xy: 1647, 349 + xy: 1607, 239 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-wave-xlarge +block-water-xlarge rotate: false xy: 501, 316 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-white-tree-dead-large +block-wave-large rotate: false - xy: 1699, 681 + xy: 1699, 765 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-white-tree-dead-medium +block-wave-medium rotate: false - xy: 1085, 19 + xy: 1319, 453 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-white-tree-dead-small +block-wave-small rotate: false - xy: 1440, 275 + xy: 1027, 13 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-white-tree-dead-tiny +block-wave-tiny rotate: false - xy: 1665, 367 + xy: 1607, 221 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-white-tree-dead-xlarge +block-wave-xlarge rotate: false xy: 551, 366 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-white-tree-large +block-white-tree-dead-large rotate: false - xy: 1741, 723 + xy: 1657, 723 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-white-tree-medium +block-white-tree-dead-medium rotate: false - xy: 983, 571 + xy: 1353, 487 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-white-tree-small +block-white-tree-dead-small rotate: false - xy: 1466, 275 + xy: 1053, 39 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-white-tree-tiny +block-white-tree-dead-tiny rotate: false - xy: 1683, 385 + xy: 1607, 203 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-white-tree-xlarge +block-white-tree-dead-xlarge rotate: false xy: 601, 416 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 +block-white-tree-large + rotate: false + xy: 1615, 681 + size: 40, 40 + orig: 40, 40 + offset: 0, 0 + index: -1 +block-white-tree-medium + rotate: false + xy: 1387, 521 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +block-white-tree-small + rotate: false + xy: 1053, 13 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +block-white-tree-tiny + rotate: false + xy: 1553, 199 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +block-white-tree-xlarge + rotate: false + xy: 651, 466 + size: 48, 48 + orig: 48, 48 + offset: 0, 0 + index: -1 button rotate: false - xy: 1437, 652 + xy: 1273, 652 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -19238,7 +21149,7 @@ button index: -1 button-disabled rotate: false - xy: 1133, 652 + xy: 1007, 652 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -19246,7 +21157,7 @@ button-disabled index: -1 button-down rotate: false - xy: 1133, 623 + xy: 1951, 812 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -19254,7 +21165,7 @@ button-down index: -1 button-edge-1 rotate: false - xy: 1171, 652 + xy: 1007, 623 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -19262,7 +21173,7 @@ button-edge-1 index: -1 button-edge-2 rotate: false - xy: 1171, 623 + xy: 1045, 652 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -19270,7 +21181,7 @@ button-edge-2 index: -1 button-edge-3 rotate: false - xy: 1209, 652 + xy: 1951, 783 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -19278,7 +21189,7 @@ button-edge-3 index: -1 button-edge-4 rotate: false - xy: 1209, 623 + xy: 1045, 623 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -19286,7 +21197,7 @@ button-edge-4 index: -1 button-right-disabled rotate: false - xy: 1209, 623 + xy: 1045, 623 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -19294,7 +21205,7 @@ button-right-disabled index: -1 button-edge-over-4 rotate: false - xy: 1247, 652 + xy: 1083, 652 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -19302,7 +21213,7 @@ button-edge-over-4 index: -1 button-over rotate: false - xy: 1247, 623 + xy: 1083, 623 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -19310,7 +21221,7 @@ button-over index: -1 button-red rotate: false - xy: 1285, 652 + xy: 1121, 652 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -19318,7 +21229,7 @@ button-red index: -1 button-right rotate: false - xy: 1323, 623 + xy: 1159, 623 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -19326,7 +21237,7 @@ button-right index: -1 button-right-down rotate: false - xy: 1285, 623 + xy: 1121, 623 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -19334,7 +21245,7 @@ button-right-down index: -1 button-right-over rotate: false - xy: 1323, 652 + xy: 1159, 652 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -19342,7 +21253,7 @@ button-right-over index: -1 button-select rotate: false - xy: 1492, 281 + xy: 1079, 39 size: 24, 24 split: 4, 4, 4, 4 orig: 24, 24 @@ -19350,7 +21261,7 @@ button-select index: -1 button-square rotate: false - xy: 1399, 652 + xy: 1235, 652 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -19358,7 +21269,7 @@ button-square index: -1 button-square-down rotate: false - xy: 1361, 652 + xy: 1197, 652 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -19366,7 +21277,7 @@ button-square-down index: -1 button-square-over rotate: false - xy: 1361, 623 + xy: 1197, 623 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -19374,7 +21285,7 @@ button-square-over index: -1 button-trans rotate: false - xy: 1399, 623 + xy: 1235, 623 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -19382,49 +21293,49 @@ button-trans index: -1 check-disabled rotate: false - xy: 1013, 521 + xy: 1319, 419 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 check-off rotate: false - xy: 1013, 487 + xy: 1353, 453 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 check-on rotate: false - xy: 1013, 453 + xy: 1387, 487 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 check-on-disabled rotate: false - xy: 1013, 419 + xy: 1353, 419 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 check-on-over rotate: false - xy: 1013, 385 + xy: 1387, 453 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 check-over rotate: false - xy: 1047, 521 + xy: 1387, 419 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 clear rotate: false - xy: 795, 866 + xy: 1565, 325 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -19438,7 +21349,7 @@ crater index: -1 cursor rotate: false - xy: 1937, 683 + xy: 1319, 351 size: 4, 4 orig: 4, 4 offset: 0, 0 @@ -19452,7 +21363,7 @@ discord-banner index: -1 flat-down-base rotate: false - xy: 1437, 623 + xy: 1273, 623 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -19467,7 +21378,7 @@ info-banner index: -1 inventory rotate: false - xy: 1518, 265 + xy: 1105, 23 size: 24, 40 split: 10, 10, 10, 14 orig: 24, 40 @@ -19475,147 +21386,147 @@ inventory index: -1 item-blast-compound-icon rotate: false - xy: 1047, 487 + xy: 1013, 385 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-coal-icon rotate: false - xy: 1047, 453 + xy: 1047, 385 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-copper-icon rotate: false - xy: 1047, 419 + xy: 1081, 385 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-graphite-icon rotate: false - xy: 1047, 385 + xy: 1115, 385 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-lead-icon rotate: false - xy: 1042, 351 + xy: 1149, 385 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-metaglass-icon rotate: false - xy: 1081, 537 + xy: 1183, 385 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-phase-fabric-icon rotate: false - xy: 1081, 503 + xy: 1217, 385 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-plastanium-icon rotate: false - xy: 1081, 469 + xy: 1251, 385 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-pyratite-icon rotate: false - xy: 1081, 435 + xy: 1285, 385 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-sand-icon rotate: false - xy: 1081, 401 + xy: 1319, 385 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-scrap-icon rotate: false - xy: 1115, 521 + xy: 1353, 385 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-silicon-icon rotate: false - xy: 1149, 521 + xy: 1387, 385 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-spore-pod-icon rotate: false - xy: 1115, 487 + xy: 1421, 542 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-surge-alloy-icon rotate: false - xy: 1183, 521 + xy: 1421, 508 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-thorium-icon rotate: false - xy: 1149, 487 + xy: 1421, 474 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-titanium-icon rotate: false - xy: 1115, 453 + xy: 1421, 440 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-cryofluid-icon rotate: false - xy: 1217, 521 + xy: 1421, 406 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-oil-icon rotate: false - xy: 1183, 487 + xy: 1421, 372 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-slag-icon rotate: false - xy: 1149, 453 + xy: 1455, 529 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-water-icon rotate: false - xy: 1115, 419 + xy: 1455, 495 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 logic-node rotate: false - xy: 1251, 521 + xy: 1455, 461 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -19636,7 +21547,7 @@ nomap index: -1 pane rotate: false - xy: 1475, 623 + xy: 1311, 623 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -19644,7 +21555,7 @@ pane index: -1 pane-2 rotate: false - xy: 1475, 652 + xy: 1311, 652 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -19652,7 +21563,7 @@ pane-2 index: -1 scroll rotate: false - xy: 1492, 244 + xy: 1079, 2 size: 24, 35 split: 10, 10, 6, 5 orig: 24, 35 @@ -19675,63 +21586,63 @@ scroll-knob-horizontal-black index: -1 scroll-knob-vertical-black rotate: false - xy: 1544, 265 + xy: 1131, 23 size: 24, 40 orig: 24, 40 offset: 0, 0 index: -1 scroll-knob-vertical-thin rotate: false - xy: 1249, 171 + xy: 1697, 228 size: 12, 40 orig: 12, 40 offset: 0, 0 index: -1 selection rotate: false - xy: 1611, 315 + xy: 309, 866 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 slider rotate: false - xy: 1039, 375 + xy: 1533, 621 size: 1, 8 orig: 1, 8 offset: 0, 0 index: -1 slider-knob rotate: false - xy: 1017, 565 + xy: 945, 293 size: 29, 38 orig: 29, 38 offset: 0, 0 index: -1 slider-knob-down rotate: false - xy: 1489, 515 + xy: 976, 293 size: 29, 38 orig: 29, 38 offset: 0, 0 index: -1 slider-knob-over rotate: false - xy: 1520, 515 + xy: 2017, 901 size: 29, 38 orig: 29, 38 offset: 0, 0 index: -1 slider-vertical rotate: false - xy: 1183, 421 + xy: 1681, 342 size: 8, 1 orig: 8, 1 offset: 0, 0 index: -1 underline rotate: false - xy: 1589, 652 + xy: 1425, 652 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -19739,7 +21650,7 @@ underline index: -1 underline-2 rotate: false - xy: 1513, 652 + xy: 1349, 652 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -19747,7 +21658,7 @@ underline-2 index: -1 underline-disabled rotate: false - xy: 1513, 623 + xy: 1349, 623 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -19755,7 +21666,7 @@ underline-disabled index: -1 underline-red rotate: false - xy: 1551, 652 + xy: 1387, 652 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -19763,7 +21674,7 @@ underline-red index: -1 underline-white rotate: false - xy: 1551, 623 + xy: 1387, 623 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -19771,42 +21682,42 @@ underline-white index: -1 unit-alpha-large rotate: false - xy: 1783, 765 + xy: 1825, 849 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 unit-alpha-medium rotate: false - xy: 1217, 487 + xy: 1455, 427 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unit-alpha-small rotate: false - xy: 1518, 239 + xy: 1157, 39 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 unit-alpha-tiny rotate: false - xy: 1647, 331 + xy: 1571, 199 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 unit-alpha-xlarge rotate: false - xy: 651, 466 + xy: 701, 516 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-antumbra-large rotate: false - xy: 1951, 849 + xy: 1979, 891 size: 36, 40 orig: 36, 40 offset: 0, 0 @@ -19820,182 +21731,182 @@ unit-antumbra-medium index: -1 unit-antumbra-small rotate: false - xy: 418, 8 + xy: 511, 6 size: 21, 24 orig: 21, 24 offset: 0, 0 index: -1 unit-antumbra-tiny rotate: false - xy: 1444, 205 + xy: 619, 47 size: 14, 16 orig: 14, 16 offset: 0, 0 index: -1 unit-antumbra-xlarge rotate: false - xy: 601, 225 + xy: 551, 183 size: 43, 48 orig: 43, 48 offset: 0, 0 index: -1 unit-arkyid-large rotate: false - xy: 1825, 807 + xy: 1783, 807 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 unit-arkyid-medium rotate: false - xy: 1183, 453 + xy: 1455, 393 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unit-arkyid-small rotate: false - xy: 1544, 239 + xy: 1183, 39 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 unit-arkyid-tiny rotate: false - xy: 1665, 349 + xy: 1589, 190 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 unit-arkyid-xlarge rotate: false - xy: 701, 516 + xy: 351, 116 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-atrax-large rotate: false - xy: 1867, 860 + xy: 1741, 776 size: 40, 29 orig: 40, 29 offset: 0, 0 index: -1 unit-atrax-medium rotate: false - xy: 745, 55 + xy: 80, 3 size: 32, 23 orig: 32, 23 offset: 0, 0 index: -1 unit-atrax-small rotate: false - xy: 1075, 330 + xy: 976, 81 size: 24, 17 orig: 24, 17 offset: 0, 0 index: -1 unit-atrax-tiny rotate: false - xy: 711, 91 + xy: 1421, 576 size: 16, 11 orig: 16, 11 offset: 0, 0 index: -1 unit-atrax-xlarge rotate: false - xy: 351, 130 + xy: 401, 180 size: 48, 34 orig: 48, 34 offset: 0, 0 index: -1 unit-beta-large rotate: false - xy: 1741, 683 + xy: 1699, 725 size: 40, 38 orig: 40, 38 offset: 0, 0 index: -1 unit-beta-medium rotate: false - xy: 1149, 421 + xy: 877, 369 size: 32, 30 orig: 32, 30 offset: 0, 0 index: -1 unit-beta-small rotate: false - xy: 1362, 252 + xy: 1209, 40 size: 24, 23 orig: 24, 23 offset: 0, 0 index: -1 unit-beta-tiny rotate: false - xy: 1683, 368 + xy: 1607, 186 size: 16, 15 orig: 16, 15 offset: 0, 0 index: -1 unit-beta-xlarge rotate: false - xy: 401, 168 + xy: 451, 218 size: 48, 46 orig: 48, 46 offset: 0, 0 index: -1 unit-bryde-large rotate: false - xy: 1783, 723 + xy: 1657, 681 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 unit-bryde-medium rotate: false - xy: 1285, 521 + xy: 911, 367 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unit-bryde-small rotate: false - xy: 1388, 251 + xy: 1235, 39 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 unit-bryde-tiny rotate: false - xy: 1701, 385 + xy: 1625, 252 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 unit-bryde-xlarge rotate: false - xy: 451, 216 + xy: 501, 266 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-corvus-large rotate: false - xy: 1825, 779 + xy: 1867, 863 size: 40, 26 orig: 40, 26 offset: 0, 0 index: -1 unit-corvus-medium rotate: false - xy: 1042, 329 + xy: 1489, 507 size: 31, 20 orig: 31, 20 offset: 0, 0 index: -1 unit-corvus-small rotate: false - xy: 1867, 681 + xy: 1105, 6 size: 24, 15 orig: 24, 15 offset: 0, 0 @@ -20009,336 +21920,336 @@ unit-corvus-tiny index: -1 unit-corvus-xlarge rotate: false - xy: 501, 283 + xy: 551, 333 size: 48, 31 orig: 48, 31 offset: 0, 0 index: -1 unit-crawler-large rotate: false - xy: 1867, 818 + xy: 1825, 807 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 unit-crawler-medium rotate: false - xy: 1251, 487 + xy: 945, 367 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unit-crawler-small rotate: false - xy: 1414, 249 + xy: 1261, 39 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 unit-crawler-tiny rotate: false - xy: 1665, 331 + xy: 1625, 234 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 unit-crawler-xlarge rotate: false - xy: 551, 316 + xy: 601, 366 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-dagger-large rotate: false - xy: 1909, 849 + xy: 1741, 734 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 unit-dagger-medium rotate: false - xy: 1217, 453 + xy: 979, 367 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unit-dagger-small rotate: false - xy: 1440, 249 + xy: 1287, 39 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 unit-dagger-tiny rotate: false - xy: 1683, 350 + xy: 1643, 252 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 unit-dagger-xlarge rotate: false - xy: 601, 366 + xy: 651, 416 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-eclipse-large rotate: false - xy: 1825, 737 + xy: 1783, 765 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 unit-eclipse-medium rotate: false - xy: 1319, 521 + xy: 911, 333 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unit-eclipse-small rotate: false - xy: 1466, 249 + xy: 1313, 39 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 unit-eclipse-tiny rotate: false - xy: 1701, 367 + xy: 1625, 216 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 unit-eclipse-xlarge rotate: false - xy: 651, 416 + xy: 701, 466 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-flare-large rotate: false - xy: 1867, 776 + xy: 1699, 683 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 unit-flare-medium rotate: false - xy: 1285, 487 + xy: 945, 333 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unit-flare-small rotate: false - xy: 1570, 281 + xy: 1339, 39 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 unit-flare-tiny rotate: false - xy: 1719, 385 + xy: 1643, 234 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 unit-flare-xlarge rotate: false - xy: 701, 466 + xy: 351, 66 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-fortress-large rotate: false - xy: 1783, 689 + xy: 443, 1 size: 40, 32 orig: 40, 32 offset: 0, 0 index: -1 unit-fortress-medium rotate: false - xy: 80, 1 + xy: 114, 1 size: 32, 25 orig: 32, 25 offset: 0, 0 index: -1 unit-fortress-small rotate: false - xy: 1570, 260 + xy: 1131, 2 size: 24, 19 orig: 24, 19 offset: 0, 0 index: -1 unit-fortress-tiny rotate: false - xy: 965, 597 + xy: 1703, 547 size: 16, 12 orig: 16, 12 offset: 0, 0 index: -1 unit-fortress-xlarge rotate: false - xy: 351, 90 + xy: 401, 140 size: 48, 38 orig: 48, 38 offset: 0, 0 index: -1 unit-gamma-large rotate: false - xy: 1909, 807 + xy: 1867, 821 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 unit-gamma-medium rotate: false - xy: 1251, 453 + xy: 979, 333 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unit-gamma-small rotate: false - xy: 1570, 234 + xy: 1157, 13 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 unit-gamma-tiny rotate: false - xy: 1683, 332 + xy: 1661, 252 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 unit-gamma-xlarge rotate: false - xy: 401, 118 + xy: 451, 168 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-horizon-large rotate: false - xy: 1825, 695 + xy: 1909, 849 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 unit-horizon-medium rotate: false - xy: 1353, 521 + xy: 1013, 351 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unit-horizon-small rotate: false - xy: 1252, 242 + xy: 1183, 13 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 unit-horizon-tiny rotate: false - xy: 1701, 349 + xy: 1625, 198 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 unit-horizon-xlarge rotate: false - xy: 451, 166 + xy: 501, 216 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-mace-large rotate: false - xy: 1867, 734 + xy: 1741, 692 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 unit-mace-medium rotate: false - xy: 1319, 487 + xy: 1047, 351 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unit-mace-small rotate: false - xy: 1252, 216 + xy: 1209, 14 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 unit-mace-tiny rotate: false - xy: 1719, 367 + xy: 1643, 216 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 unit-mace-xlarge rotate: false - xy: 501, 233 + xy: 551, 283 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-mega-large rotate: false - xy: 1909, 765 + xy: 1783, 723 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 unit-mega-medium rotate: false - xy: 1285, 453 + xy: 1081, 351 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unit-mega-small rotate: false - xy: 1278, 243 + xy: 1235, 13 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 unit-mega-tiny rotate: false - xy: 1737, 385 + xy: 1661, 234 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 unit-mega-xlarge rotate: false - xy: 551, 266 + xy: 601, 316 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-minke-large rotate: false - xy: 1951, 765 + xy: 1463, 610 size: 34, 40 orig: 34, 40 offset: 0, 0 index: -1 unit-minke-medium rotate: false - xy: 2020, 721 + xy: 950, 141 size: 27, 32 orig: 27, 32 offset: 0, 0 @@ -20352,581 +22263,581 @@ unit-minke-small index: -1 unit-minke-tiny rotate: false - xy: 1773, 349 + xy: 1793, 538 size: 13, 16 orig: 13, 16 offset: 0, 0 index: -1 unit-minke-xlarge rotate: false - xy: 601, 175 + xy: 551, 133 size: 41, 48 orig: 41, 48 offset: 0, 0 index: -1 unit-mono-large rotate: false - xy: 881, 639 + xy: 1825, 765 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 unit-mono-medium rotate: false - xy: 1387, 521 + xy: 1115, 351 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unit-mono-small rotate: false - xy: 1278, 217 + xy: 1261, 13 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 unit-mono-tiny rotate: false - xy: 1719, 349 + xy: 1679, 252 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 unit-mono-xlarge rotate: false - xy: 601, 316 + xy: 651, 366 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-nova-large rotate: false - xy: 881, 597 + xy: 1867, 779 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 unit-nova-medium rotate: false - xy: 1353, 487 + xy: 1149, 351 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unit-nova-small rotate: false - xy: 1304, 245 + xy: 1287, 13 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 unit-nova-tiny rotate: false - xy: 1737, 367 + xy: 1643, 198 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 unit-nova-xlarge rotate: false - xy: 651, 366 + xy: 701, 416 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-oct-large rotate: false - xy: 923, 639 + xy: 1909, 807 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 unit-oct-medium rotate: false - xy: 1319, 453 + xy: 1183, 351 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unit-oct-small rotate: false - xy: 1330, 245 + xy: 1313, 13 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 unit-oct-tiny rotate: false - xy: 1755, 385 + xy: 1661, 216 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 unit-oct-xlarge rotate: false - xy: 701, 416 + xy: 401, 90 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-omura-large rotate: false - xy: 1551, 513 + xy: 950, 251 size: 28, 40 orig: 28, 40 offset: 0, 0 index: -1 unit-omura-medium rotate: false - xy: 1486, 189 + xy: 983, 572 size: 22, 32 orig: 22, 32 offset: 0, 0 index: -1 unit-omura-small rotate: false - xy: 1737, 341 + xy: 1679, 226 size: 16, 24 orig: 16, 24 offset: 0, 0 index: -1 unit-omura-tiny rotate: false - xy: 1077, 580 + xy: 1389, 307 size: 11, 16 orig: 11, 16 offset: 0, 0 index: -1 unit-omura-xlarge rotate: false - xy: 1951, 715 + xy: 1501, 631 size: 33, 48 orig: 33, 48 offset: 0, 0 index: -1 unit-poly-large rotate: false - xy: 923, 597 + xy: 1825, 723 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 unit-poly-medium rotate: false - xy: 1421, 521 + xy: 1217, 351 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unit-poly-small rotate: false - xy: 1304, 219 + xy: 1339, 13 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 unit-poly-tiny rotate: false - xy: 1755, 367 + xy: 1661, 198 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 unit-poly-xlarge rotate: false - xy: 351, 40 + xy: 451, 118 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-pulsar-large rotate: false - xy: 1867, 698 + xy: 1867, 743 size: 40, 34 orig: 40, 34 offset: 0, 0 index: -1 unit-pulsar-medium rotate: false - xy: 1183, 424 + xy: 1251, 356 size: 32, 27 orig: 32, 27 offset: 0, 0 index: -1 unit-pulsar-small rotate: false - xy: 1330, 223 + xy: 1499, 341 size: 24, 20 orig: 24, 20 offset: 0, 0 index: -1 unit-pulsar-tiny rotate: false - xy: 644, 175 + xy: 1697, 364 size: 16, 13 orig: 16, 13 offset: 0, 0 index: -1 unit-pulsar-xlarge rotate: false - xy: 401, 76 + xy: 351, 24 size: 48, 40 orig: 48, 40 offset: 0, 0 index: -1 unit-quad-large rotate: false - xy: 1909, 723 + xy: 1909, 765 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 unit-quad-medium rotate: false - xy: 385, 1 + xy: 1489, 474 size: 31, 31 orig: 31, 31 offset: 0, 0 index: -1 unit-quad-small rotate: false - xy: 1356, 226 + xy: 1525, 337 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 unit-quad-tiny rotate: false - xy: 1701, 332 + xy: 1643, 181 size: 15, 15 orig: 15, 15 offset: 0, 0 index: -1 unit-quad-xlarge rotate: false - xy: 451, 116 + xy: 501, 166 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-quasar-large rotate: false - xy: 965, 639 + xy: 881, 639 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 unit-quasar-medium rotate: false - xy: 1387, 487 + xy: 1285, 351 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unit-quasar-small rotate: false - xy: 1382, 225 + xy: 1551, 337 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 unit-quasar-tiny rotate: false - xy: 1773, 385 + xy: 1679, 208 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 unit-quasar-xlarge rotate: false - xy: 501, 183 + xy: 551, 233 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-reign-large rotate: false - xy: 965, 611 + xy: 1783, 695 size: 40, 26 orig: 40, 26 offset: 0, 0 index: -1 unit-reign-medium rotate: false - xy: 114, 6 + xy: 1489, 452 size: 31, 20 orig: 31, 20 offset: 0, 0 index: -1 unit-reign-small rotate: false - xy: 301, 2 + xy: 1577, 346 size: 24, 15 orig: 24, 15 offset: 0, 0 index: -1 unit-reign-tiny rotate: false - xy: 781, 678 + xy: 1157, 1 size: 15, 10 orig: 15, 10 offset: 0, 0 index: -1 unit-reign-xlarge rotate: false - xy: 551, 233 + xy: 601, 283 size: 48, 31 orig: 48, 31 offset: 0, 0 index: -1 unit-risso-large rotate: false - xy: 1951, 807 + xy: 1993, 849 size: 35, 40 orig: 35, 40 offset: 0, 0 index: -1 unit-risso-medium rotate: false - xy: 2017, 579 + xy: 2019, 747 size: 28, 32 orig: 28, 32 offset: 0, 0 index: -1 unit-risso-small rotate: false - xy: 441, 6 + xy: 1629, 311 size: 21, 24 orig: 21, 24 offset: 0, 0 index: -1 unit-risso-tiny rotate: false - xy: 1791, 385 + xy: 1517, 579 size: 14, 16 orig: 14, 16 offset: 0, 0 index: -1 unit-risso-xlarge rotate: false - xy: 701, 326 + xy: 601, 233 size: 43, 48 orig: 43, 48 offset: 0, 0 index: -1 unit-scepter-large rotate: false - xy: 1007, 647 + xy: 881, 605 size: 40, 32 orig: 40, 32 offset: 0, 0 index: -1 unit-scepter-medium rotate: false - xy: 1353, 459 + xy: 1319, 357 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 unit-scepter-small rotate: false - xy: 1408, 228 + xy: 1603, 342 size: 24, 19 orig: 24, 19 offset: 0, 0 index: -1 unit-scepter-tiny rotate: false - xy: 662, 175 + xy: 1391, 218 size: 16, 13 orig: 16, 13 offset: 0, 0 index: -1 unit-scepter-xlarge rotate: false - xy: 601, 275 + xy: 651, 325 size: 48, 39 orig: 48, 39 offset: 0, 0 index: -1 unit-sei-large rotate: false - xy: 1007, 605 + xy: 923, 639 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 unit-sei-medium rotate: false - xy: 1455, 521 + xy: 1489, 529 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unit-sei-small rotate: false - xy: 1434, 223 + xy: 1629, 337 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 unit-sei-tiny rotate: false - xy: 1755, 349 + xy: 1699, 346 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 unit-sei-xlarge rotate: false - xy: 651, 316 + xy: 701, 366 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-spiroct-large rotate: false - xy: 1049, 648 + xy: 965, 648 size: 40, 31 orig: 40, 31 offset: 0, 0 index: -1 unit-spiroct-medium rotate: false - xy: 1387, 460 + xy: 1489, 425 size: 31, 25 orig: 31, 25 offset: 0, 0 index: -1 unit-spiroct-small rotate: false - xy: 1460, 228 + xy: 1655, 342 size: 24, 19 orig: 24, 19 offset: 0, 0 index: -1 unit-spiroct-tiny rotate: false - xy: 2022, 789 + xy: 2029, 647 size: 15, 12 orig: 15, 12 offset: 0, 0 index: -1 unit-spiroct-xlarge rotate: false - xy: 701, 376 + xy: 401, 50 size: 48, 38 orig: 48, 38 offset: 0, 0 index: -1 unit-toxopid-large rotate: false - xy: 1979, 891 + xy: 1536, 639 size: 33, 40 orig: 33, 40 offset: 0, 0 index: -1 unit-toxopid-medium rotate: false - xy: 2021, 755 + xy: 781, 682 size: 26, 32 orig: 26, 32 offset: 0, 0 index: -1 unit-toxopid-small rotate: false - xy: 1512, 213 + xy: 2027, 823 size: 20, 24 orig: 20, 24 offset: 0, 0 index: -1 unit-toxopid-tiny rotate: false - xy: 1791, 367 + xy: 1717, 347 size: 13, 16 orig: 13, 16 offset: 0, 0 index: -1 unit-toxopid-xlarge rotate: false - xy: 1049, 598 + xy: 1951, 841 size: 40, 48 orig: 40, 48 offset: 0, 0 index: -1 unit-vela-large rotate: false - xy: 1091, 647 + xy: 923, 605 size: 40, 32 orig: 40, 32 offset: 0, 0 index: -1 unit-vela-medium rotate: false - xy: 1217, 425 + xy: 1353, 357 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 unit-vela-small rotate: false - xy: 1486, 223 + xy: 1577, 325 size: 24, 19 orig: 24, 19 offset: 0, 0 index: -1 unit-vela-tiny rotate: false - xy: 482, 1 + xy: 814, 199 size: 16, 13 orig: 16, 13 offset: 0, 0 index: -1 unit-vela-xlarge rotate: false - xy: 501, 142 + xy: 451, 77 size: 48, 39 orig: 48, 39 offset: 0, 0 index: -1 unit-zenith-large rotate: false - xy: 1091, 605 + xy: 965, 606 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 unit-zenith-medium rotate: false - xy: 1421, 487 + xy: 1387, 351 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unit-zenith-small rotate: false - xy: 1460, 202 + xy: 1603, 316 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 unit-zenith-tiny rotate: false - xy: 1773, 367 + xy: 1625, 180 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 unit-zenith-xlarge rotate: false - xy: 551, 183 + xy: 501, 116 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 wavepane rotate: false - xy: 1589, 623 + xy: 1425, 623 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -20934,7 +22845,7 @@ wavepane index: -1 white-pane rotate: false - xy: 1627, 652 + xy: 1463, 652 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -20942,14 +22853,14 @@ white-pane index: -1 whiteui rotate: false - xy: 746, 371 + xy: 821, 928 size: 3, 3 orig: 3, 3 offset: 0, 0 index: -1 window-empty rotate: false - xy: 1073, 266 + xy: 980, 230 size: 27, 61 split: 4, 4, 2, 2 orig: 27, 61 diff --git a/core/assets/sprites/fallback/sprites4.png b/core/assets/sprites/fallback/sprites4.png index a54ba96e8b..45619c04fa 100644 Binary files a/core/assets/sprites/fallback/sprites4.png and b/core/assets/sprites/fallback/sprites4.png differ diff --git a/core/assets/sprites/fallback/sprites5.png b/core/assets/sprites/fallback/sprites5.png index c9946bf655..e413db1a18 100644 Binary files a/core/assets/sprites/fallback/sprites5.png and b/core/assets/sprites/fallback/sprites5.png differ diff --git a/core/assets/sprites/fallback/sprites6.png b/core/assets/sprites/fallback/sprites6.png index 43330a0028..94069305e4 100644 Binary files a/core/assets/sprites/fallback/sprites6.png and b/core/assets/sprites/fallback/sprites6.png differ diff --git a/core/assets/sprites/fallback/sprites7.png b/core/assets/sprites/fallback/sprites7.png index 8ba18e157c..9e083fdec4 100644 Binary files a/core/assets/sprites/fallback/sprites7.png and b/core/assets/sprites/fallback/sprites7.png differ diff --git a/core/assets/sprites/fallback/sprites8.png b/core/assets/sprites/fallback/sprites8.png index 4cb8e05377..4c47261514 100644 Binary files a/core/assets/sprites/fallback/sprites8.png and b/core/assets/sprites/fallback/sprites8.png differ diff --git a/core/assets/sprites/space.png b/core/assets/sprites/space.png new file mode 100644 index 0000000000..188e9e40ae Binary files /dev/null and b/core/assets/sprites/space.png differ diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index 303a643a31..75be83066e 100644 --- a/core/assets/sprites/sprites.atlas +++ b/core/assets/sprites/sprites.atlas @@ -7844,1456 +7844,3318 @@ filter: nearest,nearest repeat: none basalt-edge rotate: false - xy: 1, 149 + xy: 1, 153 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 basalt1 rotate: false - xy: 2541, 213 + xy: 2739, 85 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 basalt2 rotate: false - xy: 101, 17 + xy: 101, 21 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 basalt3 rotate: false - xy: 2575, 213 + xy: 2773, 85 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 char1 rotate: false - xy: 135, 17 + xy: 135, 21 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 char2 rotate: false - xy: 2609, 213 + xy: 2807, 85 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 char3 rotate: false - xy: 169, 17 + xy: 169, 21 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cliff rotate: false - xy: 2643, 213 + xy: 2841, 85 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 +cliff0 + rotate: false + xy: 1765, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask1 + rotate: false + xy: 1765, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask129 + rotate: false + xy: 1765, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask131 + rotate: false + xy: 1765, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask3 + rotate: false + xy: 1765, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliff1 + rotate: false + xy: 1765, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask130 + rotate: false + xy: 1765, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask2 + rotate: false + xy: 1765, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliff2 + rotate: false + xy: 1831, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask12 + rotate: false + xy: 1831, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask132 + rotate: false + xy: 1831, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask134 + rotate: false + xy: 1831, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask14 + rotate: false + xy: 1831, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask140 + rotate: false + xy: 1831, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask142 + rotate: false + xy: 1831, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask4 + rotate: false + xy: 1831, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask6 + rotate: false + xy: 1831, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliff3 + rotate: false + xy: 1831, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliff4 + rotate: false + xy: 1897, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliff5 + rotate: false + xy: 1897, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliff6 + rotate: false + xy: 1963, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliff7 + rotate: false + xy: 1963, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask0 + rotate: false + xy: 2029, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask128 + rotate: false + xy: 2029, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask10 + rotate: false + xy: 2161, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask138 + rotate: false + xy: 2161, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask112 + rotate: false + xy: 3151, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask120 + rotate: false + xy: 3151, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask113 + rotate: false + xy: 3217, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask115 + rotate: false + xy: 3217, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask121 + rotate: false + xy: 3217, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask123 + rotate: false + xy: 3217, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask114 + rotate: false + xy: 3217, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask122 + rotate: false + xy: 3217, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask116 + rotate: false + xy: 3283, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask118 + rotate: false + xy: 3283, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask117 + rotate: false + xy: 3283, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask119 + rotate: false + xy: 3283, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask124 + rotate: false + xy: 3349, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask126 + rotate: false + xy: 3349, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask125 + rotate: false + xy: 3349, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask127 + rotate: false + xy: 3349, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask16 + rotate: false + xy: 2161, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask144 + rotate: false + xy: 2161, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask152 + rotate: false + xy: 2161, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask176 + rotate: false + xy: 2161, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask184 + rotate: false + xy: 2161, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask24 + rotate: false + xy: 2161, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask48 + rotate: false + xy: 2161, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask56 + rotate: false + xy: 2161, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask17 + rotate: false + xy: 2227, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask145 + rotate: false + xy: 2227, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask147 + rotate: false + xy: 2227, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask153 + rotate: false + xy: 2227, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask155 + rotate: false + xy: 2227, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask177 + rotate: false + xy: 2227, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask179 + rotate: false + xy: 2227, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask185 + rotate: false + xy: 2227, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask187 + rotate: false + xy: 2227, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask19 + rotate: false + xy: 2227, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask25 + rotate: false + xy: 2227, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask27 + rotate: false + xy: 2227, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask49 + rotate: false + xy: 2227, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask51 + rotate: false + xy: 2227, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask57 + rotate: false + xy: 2227, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask59 + rotate: false + xy: 2227, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask18 + rotate: false + xy: 2227, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask146 + rotate: false + xy: 2227, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask154 + rotate: false + xy: 2227, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask178 + rotate: false + xy: 2227, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask186 + rotate: false + xy: 2227, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask26 + rotate: false + xy: 2227, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask50 + rotate: false + xy: 2227, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask58 + rotate: false + xy: 2227, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask192 + rotate: false + xy: 3415, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask224 + rotate: false + xy: 3415, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask193 + rotate: false + xy: 3415, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask195 + rotate: false + xy: 3415, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask225 + rotate: false + xy: 3415, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask227 + rotate: false + xy: 3415, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask194 + rotate: false + xy: 3481, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask226 + rotate: false + xy: 3481, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask196 + rotate: false + xy: 3481, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask198 + rotate: false + xy: 3481, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask204 + rotate: false + xy: 3481, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask206 + rotate: false + xy: 3481, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask228 + rotate: false + xy: 3481, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask230 + rotate: false + xy: 3481, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask236 + rotate: false + xy: 3481, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask238 + rotate: false + xy: 3481, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask197 + rotate: false + xy: 3547, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask199 + rotate: false + xy: 3547, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask205 + rotate: false + xy: 3547, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask207 + rotate: false + xy: 3547, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask229 + rotate: false + xy: 3547, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask231 + rotate: false + xy: 3547, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask237 + rotate: false + xy: 3547, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask239 + rotate: false + xy: 3547, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask20 + rotate: false + xy: 2293, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask148 + rotate: false + xy: 2293, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask150 + rotate: false + xy: 2293, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask180 + rotate: false + xy: 2293, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask182 + rotate: false + xy: 2293, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask22 + rotate: false + xy: 2293, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask52 + rotate: false + xy: 2293, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask54 + rotate: false + xy: 2293, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask200 + rotate: false + xy: 3547, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask232 + rotate: false + xy: 3547, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask201 + rotate: false + xy: 3613, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask203 + rotate: false + xy: 3613, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask233 + rotate: false + xy: 3613, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask235 + rotate: false + xy: 3613, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask202 + rotate: false + xy: 3613, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask234 + rotate: false + xy: 3613, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask208 + rotate: false + xy: 3679, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask216 + rotate: false + xy: 3679, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask209 + rotate: false + xy: 3679, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask211 + rotate: false + xy: 3679, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask217 + rotate: false + xy: 3679, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask219 + rotate: false + xy: 3679, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask21 + rotate: false + xy: 2293, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask149 + rotate: false + xy: 2293, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask151 + rotate: false + xy: 2293, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask181 + rotate: false + xy: 2293, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask183 + rotate: false + xy: 2293, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask23 + rotate: false + xy: 2293, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask53 + rotate: false + xy: 2293, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask55 + rotate: false + xy: 2293, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask210 + rotate: false + xy: 3745, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask218 + rotate: false + xy: 3745, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask212 + rotate: false + xy: 3745, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask214 + rotate: false + xy: 3745, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask213 + rotate: false + xy: 3811, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask215 + rotate: false + xy: 3811, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask220 + rotate: false + xy: 3811, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask222 + rotate: false + xy: 3811, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask221 + rotate: false + xy: 3877, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask223 + rotate: false + xy: 3877, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask240 + rotate: false + xy: 3877, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask248 + rotate: false + xy: 3877, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask241 + rotate: false + xy: 3943, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask243 + rotate: false + xy: 3943, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask249 + rotate: false + xy: 3943, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask251 + rotate: false + xy: 3943, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask242 + rotate: false + xy: 3943, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask250 + rotate: false + xy: 3943, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask244 + rotate: false + xy: 4009, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask246 + rotate: false + xy: 4009, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask245 + rotate: false + xy: 4009, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask247 + rotate: false + xy: 4009, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask252 + rotate: false + xy: 1765, 53 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask254 + rotate: false + xy: 1765, 53 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask253 + rotate: false + xy: 1831, 53 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask255 + rotate: false + xy: 1831, 53 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask28 + rotate: false + xy: 2359, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask156 + rotate: false + xy: 2359, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask158 + rotate: false + xy: 2359, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask188 + rotate: false + xy: 2359, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask190 + rotate: false + xy: 2359, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask30 + rotate: false + xy: 2359, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask60 + rotate: false + xy: 2359, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask62 + rotate: false + xy: 2359, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask29 + rotate: false + xy: 2359, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask157 + rotate: false + xy: 2359, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask159 + rotate: false + xy: 2359, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask189 + rotate: false + xy: 2359, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask191 + rotate: false + xy: 2359, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask31 + rotate: false + xy: 2359, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask61 + rotate: false + xy: 2359, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask63 + rotate: false + xy: 2359, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask32 + rotate: false + xy: 2425, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask160 + rotate: false + xy: 2425, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask33 + rotate: false + xy: 2425, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask161 + rotate: false + xy: 2425, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask163 + rotate: false + xy: 2425, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask35 + rotate: false + xy: 2425, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask34 + rotate: false + xy: 2491, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask162 + rotate: false + xy: 2491, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask36 + rotate: false + xy: 2491, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask164 + rotate: false + xy: 2491, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask166 + rotate: false + xy: 2491, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask172 + rotate: false + xy: 2491, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask174 + rotate: false + xy: 2491, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask38 + rotate: false + xy: 2491, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask44 + rotate: false + xy: 2491, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask46 + rotate: false + xy: 2491, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask37 + rotate: false + xy: 2557, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask165 + rotate: false + xy: 2557, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask167 + rotate: false + xy: 2557, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask173 + rotate: false + xy: 2557, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask175 + rotate: false + xy: 2557, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask39 + rotate: false + xy: 2557, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask45 + rotate: false + xy: 2557, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask47 + rotate: false + xy: 2557, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask40 + rotate: false + xy: 2557, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask168 + rotate: false + xy: 2557, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask41 + rotate: false + xy: 2623, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask169 + rotate: false + xy: 2623, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask171 + rotate: false + xy: 2623, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask43 + rotate: false + xy: 2623, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask42 + rotate: false + xy: 2623, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask170 + rotate: false + xy: 2623, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask5 + rotate: false + xy: 2029, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask13 + rotate: false + xy: 2029, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask133 + rotate: false + xy: 2029, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask135 + rotate: false + xy: 2029, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask141 + rotate: false + xy: 2029, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask143 + rotate: false + xy: 2029, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask15 + rotate: false + xy: 2029, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask7 + rotate: false + xy: 2029, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask64 + rotate: false + xy: 2689, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask96 + rotate: false + xy: 2689, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask65 + rotate: false + xy: 2689, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask67 + rotate: false + xy: 2689, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask97 + rotate: false + xy: 2689, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask99 + rotate: false + xy: 2689, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask66 + rotate: false + xy: 2755, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask98 + rotate: false + xy: 2755, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask68 + rotate: false + xy: 2755, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask100 + rotate: false + xy: 2755, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask102 + rotate: false + xy: 2755, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask108 + rotate: false + xy: 2755, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask110 + rotate: false + xy: 2755, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask70 + rotate: false + xy: 2755, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask76 + rotate: false + xy: 2755, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask78 + rotate: false + xy: 2755, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask69 + rotate: false + xy: 2821, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask101 + rotate: false + xy: 2821, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask103 + rotate: false + xy: 2821, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask109 + rotate: false + xy: 2821, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask111 + rotate: false + xy: 2821, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask71 + rotate: false + xy: 2821, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask77 + rotate: false + xy: 2821, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask79 + rotate: false + xy: 2821, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask72 + rotate: false + xy: 2821, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask104 + rotate: false + xy: 2821, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask73 + rotate: false + xy: 2887, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask105 + rotate: false + xy: 2887, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask107 + rotate: false + xy: 2887, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask75 + rotate: false + xy: 2887, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask74 + rotate: false + xy: 2887, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask106 + rotate: false + xy: 2887, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask8 + rotate: false + xy: 2095, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask136 + rotate: false + xy: 2095, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask80 + rotate: false + xy: 2953, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask88 + rotate: false + xy: 2953, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask81 + rotate: false + xy: 2953, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask83 + rotate: false + xy: 2953, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask89 + rotate: false + xy: 2953, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask91 + rotate: false + xy: 2953, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask82 + rotate: false + xy: 3019, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask90 + rotate: false + xy: 3019, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask84 + rotate: false + xy: 3019, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask86 + rotate: false + xy: 3019, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask85 + rotate: false + xy: 3085, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask87 + rotate: false + xy: 3085, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask9 + rotate: false + xy: 2095, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask11 + rotate: false + xy: 2095, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask137 + rotate: false + xy: 2095, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask139 + rotate: false + xy: 2095, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask92 + rotate: false + xy: 3085, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask94 + rotate: false + xy: 3085, 119 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask93 + rotate: false + xy: 3151, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cliffmask95 + rotate: false + xy: 3151, 185 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 coal1 rotate: false - xy: 203, 17 + xy: 203, 21 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 coal2 rotate: false - xy: 2677, 213 + xy: 2875, 85 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 coal3 rotate: false - xy: 237, 17 + xy: 237, 21 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 copper1 rotate: false - xy: 2711, 213 + xy: 2909, 85 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 copper2 rotate: false - xy: 271, 17 + xy: 271, 21 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 copper3 rotate: false - xy: 2745, 213 + xy: 2943, 85 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 craters1 rotate: false - xy: 305, 17 + xy: 305, 21 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 craters2 rotate: false - xy: 2779, 213 + xy: 2977, 85 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 craters3 rotate: false - xy: 339, 17 + xy: 339, 21 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 craters4 rotate: false - xy: 2813, 213 + xy: 3011, 85 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 craters5 rotate: false - xy: 373, 17 + xy: 373, 21 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 craters6 rotate: false - xy: 2847, 213 + xy: 3045, 85 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dacite-edge rotate: false - xy: 1, 51 + xy: 1, 55 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 dacite-wall-large rotate: false - xy: 1667, 83 + xy: 1897, 53 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 dacite-wall1 rotate: false - xy: 2915, 213 + xy: 3113, 85 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dacite-wall2 rotate: false - xy: 475, 17 + xy: 475, 21 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dacite1 rotate: false - xy: 407, 17 + xy: 407, 21 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dacite2 rotate: false - xy: 2881, 213 + xy: 3079, 85 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dacite3 rotate: false - xy: 441, 17 + xy: 441, 21 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dark-metal-large rotate: false - xy: 1765, 181 + xy: 1963, 53 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 dark-metal1 rotate: false - xy: 2949, 213 + xy: 3147, 85 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dark-metal2 rotate: false - xy: 509, 17 + xy: 509, 21 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dark-panel-1 rotate: false - xy: 2983, 213 + xy: 3181, 85 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dark-panel-1-edge rotate: false - xy: 99, 149 + xy: 99, 153 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 dark-panel-2 rotate: false - xy: 543, 17 + xy: 543, 21 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dark-panel-2-edge rotate: false - xy: 99, 51 + xy: 99, 55 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 dark-panel-3 rotate: false - xy: 3017, 213 + xy: 3215, 85 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dark-panel-3-edge rotate: false - xy: 197, 149 + xy: 197, 153 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 dark-panel-4 rotate: false - xy: 577, 17 + xy: 577, 21 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dark-panel-4-edge rotate: false - xy: 197, 51 + xy: 197, 55 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 dark-panel-5 rotate: false - xy: 3051, 213 + xy: 3249, 85 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dark-panel-5-edge rotate: false - xy: 295, 149 + xy: 295, 153 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 dark-panel-6 rotate: false - xy: 611, 17 + xy: 611, 21 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dark-panel-6-edge rotate: false - xy: 295, 51 + xy: 295, 55 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 darksand-edge rotate: false - xy: 393, 149 + xy: 393, 153 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 darksand-tainted-water rotate: false - xy: 679, 17 + xy: 679, 21 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 darksand-tainted-water-edge rotate: false - xy: 393, 51 + xy: 393, 55 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 darksand-tainted-water1 rotate: false - xy: 3153, 213 + xy: 3351, 85 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 darksand-tainted-water2 rotate: false - xy: 713, 17 + xy: 713, 21 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 darksand-tainted-water3 rotate: false - xy: 3187, 213 + xy: 3385, 85 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 darksand-water rotate: false - xy: 747, 17 + xy: 747, 21 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 darksand-water-edge rotate: false - xy: 491, 149 + xy: 491, 153 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 darksand-water1 rotate: false - xy: 3221, 213 + xy: 3419, 85 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 darksand-water2 rotate: false - xy: 781, 17 + xy: 781, 21 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 darksand-water3 rotate: false - xy: 3255, 213 + xy: 3453, 85 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 darksand1 rotate: false - xy: 3085, 213 + xy: 3283, 85 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 darksand2 rotate: false - xy: 645, 17 + xy: 645, 21 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 darksand3 rotate: false - xy: 3119, 213 + xy: 3317, 85 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 deepwater rotate: false - xy: 815, 17 + xy: 815, 21 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 deepwater-edge rotate: false - xy: 491, 51 + xy: 491, 55 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 dirt-edge rotate: false - xy: 589, 149 + xy: 589, 153 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 dirt-wall-large rotate: false - xy: 1831, 181 + xy: 2029, 53 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 dirt-wall1 rotate: false - xy: 883, 17 + xy: 883, 21 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dirt-wall2 rotate: false - xy: 3357, 213 + xy: 3555, 85 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dirt1 rotate: false - xy: 3289, 213 + xy: 3487, 85 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dirt2 rotate: false - xy: 849, 17 + xy: 849, 21 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dirt3 rotate: false - xy: 3323, 213 + xy: 3521, 85 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dune-wall-large rotate: false - xy: 1897, 181 + xy: 2095, 53 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 dune-wall1 rotate: false - xy: 917, 17 + xy: 917, 21 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dune-wall2 rotate: false - xy: 3391, 213 + xy: 3589, 85 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 edge rotate: false - xy: 951, 17 + xy: 951, 21 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 edge-stencil rotate: false - xy: 589, 51 + xy: 589, 55 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 edgier rotate: false - xy: 3425, 213 + xy: 3623, 85 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 grass-edge rotate: false - xy: 687, 149 + xy: 687, 153 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 grass1 rotate: false - xy: 985, 17 + xy: 985, 21 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 grass2 rotate: false - xy: 3459, 213 + xy: 3657, 85 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 grass3 rotate: false - xy: 1019, 17 + xy: 1019, 21 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 hotrock1 rotate: false - xy: 3493, 213 + xy: 3691, 85 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 hotrock2 rotate: false - xy: 1053, 17 + xy: 1053, 21 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 hotrock3 rotate: false - xy: 3527, 213 + xy: 3725, 85 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ice-edge rotate: false - xy: 687, 51 + xy: 687, 55 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 ice-snow-edge rotate: false - xy: 785, 149 + xy: 785, 153 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 ice-snow1 rotate: false - xy: 3595, 213 + xy: 3793, 85 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ice-snow2 rotate: false - xy: 1155, 17 + xy: 1155, 21 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ice-snow3 rotate: false - xy: 3629, 213 + xy: 3827, 85 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ice-wall-large rotate: false - xy: 1963, 181 + xy: 2161, 53 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 ice-wall1 rotate: false - xy: 1189, 17 + xy: 1189, 21 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ice-wall2 rotate: false - xy: 3663, 213 + xy: 3861, 85 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ice1 rotate: false - xy: 1087, 17 + xy: 1087, 21 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ice2 rotate: false - xy: 3561, 213 + xy: 3759, 85 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ice3 rotate: false - xy: 1121, 17 + xy: 1121, 21 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 lead1 rotate: false - xy: 1223, 17 + xy: 1223, 21 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 lead2 rotate: false - xy: 3697, 213 + xy: 3895, 85 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 lead3 rotate: false - xy: 1257, 17 + xy: 1257, 21 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 magmarock1 rotate: false - xy: 3731, 213 + xy: 3929, 85 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 magmarock2 rotate: false - xy: 1291, 17 + xy: 1291, 21 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 magmarock3 rotate: false - xy: 3765, 213 + xy: 3963, 85 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor rotate: false - xy: 1325, 17 + xy: 1325, 21 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-2 rotate: false - xy: 3799, 213 + xy: 3997, 85 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-2-edge rotate: false - xy: 785, 51 + xy: 785, 55 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 metal-floor-3 rotate: false - xy: 1359, 17 + xy: 1359, 21 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-3-edge rotate: false - xy: 883, 149 + xy: 883, 153 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 metal-floor-5 rotate: false - xy: 3833, 213 + xy: 4031, 85 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-5-edge rotate: false - xy: 883, 51 + xy: 883, 55 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 metal-floor-damaged-edge rotate: false - xy: 981, 149 + xy: 981, 153 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 metal-floor-damaged1 rotate: false - xy: 1393, 17 + xy: 1393, 21 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-damaged2 rotate: false - xy: 3867, 213 + xy: 1427, 21 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-damaged3 rotate: false - xy: 1427, 17 + xy: 1461, 21 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-edge rotate: false - xy: 981, 51 + xy: 981, 55 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 moss-edge rotate: false - xy: 1079, 149 + xy: 1079, 153 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 moss1 rotate: false - xy: 3901, 213 + xy: 1495, 21 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 moss2 rotate: false - xy: 1461, 17 + xy: 1529, 21 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 moss3 rotate: false - xy: 3935, 213 + xy: 1563, 21 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mud-edge rotate: false - xy: 1079, 51 + xy: 1079, 55 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 mud1 rotate: false - xy: 1495, 17 + xy: 1597, 21 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mud2 rotate: false - xy: 3969, 213 + xy: 1631, 21 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mud3 rotate: false - xy: 1529, 17 + xy: 1665, 21 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal1 rotate: false - xy: 4003, 213 + xy: 1699, 21 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal2 rotate: false - xy: 1563, 17 + xy: 2689, 35 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal3 rotate: false - xy: 4037, 213 + xy: 2739, 51 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper1 rotate: false - xy: 1597, 17 + xy: 2773, 51 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper2 rotate: false - xy: 1631, 17 + xy: 2807, 51 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper3 rotate: false - xy: 1667, 49 + xy: 2841, 51 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead1 rotate: false - xy: 1733, 115 + xy: 2875, 51 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead2 rotate: false - xy: 1701, 49 + xy: 2909, 51 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead3 rotate: false - xy: 1665, 15 + xy: 2943, 51 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap1 rotate: false - xy: 1699, 15 + xy: 2977, 51 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap2 rotate: false - xy: 2491, 163 + xy: 3011, 51 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap3 rotate: false - xy: 2541, 179 + xy: 3045, 51 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium1 rotate: false - xy: 2575, 179 + xy: 3079, 51 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium2 rotate: false - xy: 2609, 179 + xy: 3113, 51 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium3 rotate: false - xy: 2643, 179 + xy: 3147, 51 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium1 rotate: false - xy: 2677, 179 + xy: 3181, 51 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium2 rotate: false - xy: 2711, 179 + xy: 3215, 51 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium3 rotate: false - xy: 2745, 179 + xy: 3249, 51 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pebbles1 rotate: false - xy: 2779, 179 + xy: 3283, 51 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pebbles2 rotate: false - xy: 2813, 179 + xy: 3317, 51 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pebbles3 rotate: false - xy: 2847, 179 + xy: 3351, 51 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pine rotate: false - xy: 1, 1 + xy: 1, 5 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 salt rotate: false - xy: 2881, 179 + xy: 3385, 51 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 salt-edge rotate: false - xy: 1177, 149 + xy: 1177, 153 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 salt-wall-large rotate: false - xy: 2029, 181 + xy: 2227, 53 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 salt-wall1 rotate: false - xy: 2915, 179 + xy: 3419, 51 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 salt-wall2 rotate: false - xy: 2949, 179 + xy: 3453, 51 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand-edge rotate: false - xy: 1177, 51 + xy: 1177, 55 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 sand-wall-large rotate: false - xy: 2095, 181 + xy: 2293, 53 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 sand-wall1 rotate: false - xy: 3085, 179 + xy: 3589, 51 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand-wall2 rotate: false - xy: 3119, 179 + xy: 3623, 51 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand-water rotate: false - xy: 3153, 179 + xy: 3657, 51 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand-water-edge rotate: false - xy: 1275, 149 + xy: 1275, 153 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 sand-water1 rotate: false - xy: 3187, 179 + xy: 3691, 51 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand-water2 rotate: false - xy: 3221, 179 + xy: 3725, 51 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand-water3 rotate: false - xy: 3255, 179 + xy: 3759, 51 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand1 rotate: false - xy: 2983, 179 + xy: 3487, 51 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand2 rotate: false - xy: 3017, 179 + xy: 3521, 51 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand3 rotate: false - xy: 3051, 179 + xy: 3555, 51 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap1 rotate: false - xy: 3289, 179 + xy: 3793, 51 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap2 rotate: false - xy: 3323, 179 + xy: 3827, 51 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap3 rotate: false - xy: 3357, 179 + xy: 3861, 51 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shale-edge rotate: false - xy: 1275, 51 + xy: 1275, 55 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 shale-wall-large rotate: false - xy: 2161, 181 + xy: 2359, 53 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 shale-wall1 rotate: false - xy: 3493, 179 + xy: 3997, 51 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shale-wall2 rotate: false - xy: 3527, 179 + xy: 4031, 51 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shale1 rotate: false - xy: 3391, 179 + xy: 3895, 51 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shale2 rotate: false - xy: 3425, 179 + xy: 3929, 51 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shale3 rotate: false - xy: 3459, 179 + xy: 3963, 51 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shrubs-large rotate: false - xy: 2227, 181 + xy: 2425, 53 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 shrubs1 rotate: false - xy: 3561, 179 + xy: 1733, 19 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shrubs2 rotate: false - xy: 3595, 179 + xy: 1767, 19 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 slag rotate: false - xy: 3629, 179 + xy: 1801, 19 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 slag-edge rotate: false - xy: 1373, 149 + xy: 1373, 153 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 snow-edge rotate: false - xy: 1373, 51 + xy: 1373, 55 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 snow-pine rotate: false - xy: 2491, 197 + xy: 2689, 69 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 snow-wall-large rotate: false - xy: 2293, 181 + xy: 2491, 53 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 snow-wall1 rotate: false - xy: 3765, 179 + xy: 1937, 19 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snow-wall2 rotate: false - xy: 3799, 179 + xy: 1971, 19 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snow1 rotate: false - xy: 3663, 179 + xy: 1835, 19 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snow2 rotate: false - xy: 3697, 179 + xy: 1869, 19 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snow3 rotate: false - xy: 3731, 179 + xy: 1903, 19 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 +space + rotate: false + xy: 2005, 19 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +space-edge + rotate: false + xy: 1471, 153 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 spawn rotate: false - xy: 3833, 179 + xy: 2039, 19 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spore-moss-edge rotate: false - xy: 1471, 149 + xy: 1471, 55 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 spore-moss1 rotate: false - xy: 3867, 179 + xy: 2073, 19 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spore-moss2 rotate: false - xy: 3901, 179 + xy: 2107, 19 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spore-moss3 rotate: false - xy: 3935, 179 + xy: 2141, 19 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spore-pine rotate: false - xy: 51, 1 + xy: 51, 5 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 spore-wall-large rotate: false - xy: 2359, 181 + xy: 2557, 53 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-wall1 rotate: false - xy: 3969, 179 + xy: 2175, 19 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spore-wall2 rotate: false - xy: 4003, 179 + xy: 2209, 19 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stone-edge rotate: false - xy: 1471, 51 + xy: 1569, 153 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 stone-wall-large rotate: false - xy: 2425, 181 + xy: 2623, 53 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 stone-wall1 rotate: false - xy: 1801, 147 + xy: 2345, 19 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stone-wall2 rotate: false - xy: 1835, 147 + xy: 2379, 19 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stone1 rotate: false - xy: 4037, 179 + xy: 2243, 19 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stone2 rotate: false - xy: 1733, 15 + xy: 2277, 19 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stone3 rotate: false - xy: 1767, 147 + xy: 2311, 19 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 tainted-water rotate: false - xy: 1869, 147 + xy: 2413, 19 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 tainted-water-edge rotate: false - xy: 1569, 149 + xy: 1569, 55 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 tar rotate: false - xy: 1903, 147 + xy: 2447, 19 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 tar-edge rotate: false - xy: 1569, 51 + xy: 1667, 153 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 tendrils1 rotate: false - xy: 1937, 147 + xy: 2481, 19 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 tendrils2 rotate: false - xy: 1971, 147 + xy: 2515, 19 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 tendrils3 rotate: false - xy: 2005, 147 + xy: 2549, 19 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium1 rotate: false - xy: 2039, 147 + xy: 2583, 19 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium2 rotate: false - xy: 2073, 147 + xy: 2617, 19 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium3 rotate: false - xy: 2107, 147 + xy: 2651, 19 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium1 rotate: false - xy: 2141, 147 + xy: 2685, 1 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium2 rotate: false - xy: 2175, 147 + xy: 2719, 1 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium3 rotate: false - xy: 2209, 147 + xy: 2753, 17 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 water rotate: false - xy: 2243, 147 + xy: 2787, 17 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 water-edge rotate: false - xy: 1667, 149 + xy: 1667, 55 size: 96, 96 orig: 96, 96 offset: 0, 0 @@ -10487,128 +12349,142 @@ editor-snow3 orig: 32, 32 offset: 0, 0 index: -1 -editor-spawn +editor-space rotate: false xy: 2331, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 +space-icon-editor + rotate: false + xy: 2331, 263 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-spawn + rotate: false + xy: 2365, 263 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 editor-spore-moss1 - rotate: false - xy: 2365, 263 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -spore-moss-icon-editor - rotate: false - xy: 2365, 263 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-spore-moss2 rotate: false xy: 2399, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -editor-spore-moss3 +spore-moss-icon-editor + rotate: false + xy: 2399, 263 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-spore-moss2 rotate: false xy: 2433, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 +editor-spore-moss3 + rotate: false + xy: 2467, 263 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 editor-stone1 - rotate: false - xy: 2467, 263 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -stone-icon-editor - rotate: false - xy: 2467, 263 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-stone2 rotate: false xy: 2501, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -editor-stone3 +stone-icon-editor + rotate: false + xy: 2501, 263 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-stone2 rotate: false xy: 2535, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -editor-tainted-water +editor-stone3 rotate: false xy: 2569, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 +editor-tainted-water + rotate: false + xy: 2603, 263 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 tainted-water-icon-editor rotate: false - xy: 2569, 263 + xy: 2603, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-tar rotate: false - xy: 2603, 263 + xy: 2637, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 tar-icon-editor rotate: false - xy: 2603, 263 + xy: 2637, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-tendrils1 rotate: false - xy: 2637, 263 + xy: 2671, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-tendrils2 rotate: false - xy: 2671, 263 + xy: 2705, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-tendrils3 rotate: false - xy: 2705, 263 + xy: 2739, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-water rotate: false - xy: 2739, 263 + xy: 2773, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 water-icon-editor rotate: false - xy: 2739, 263 + xy: 2773, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -10657,7 +12533,7 @@ ground-factory-icon-editor index: -1 hail-icon-editor rotate: false - xy: 2773, 263 + xy: 2807, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -10671,14 +12547,14 @@ hyper-processor-icon-editor index: -1 ice-wall-icon-editor rotate: false - xy: 2807, 263 + xy: 2841, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 illuminator-icon-editor rotate: false - xy: 2841, 263 + xy: 2875, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -10692,35 +12568,35 @@ impact-reactor-icon-editor index: -1 incinerator-icon-editor rotate: false - xy: 2875, 263 + xy: 2909, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 inverted-sorter-icon-editor rotate: false - xy: 2909, 263 + xy: 2943, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-source-icon-editor rotate: false - xy: 2943, 263 + xy: 2977, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-void-icon-editor rotate: false - xy: 2977, 263 + xy: 3011, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 junction-icon-editor rotate: false - xy: 3011, 263 + xy: 3045, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -10769,21 +12645,21 @@ launch-pad-large-icon-editor index: -1 liquid-junction-icon-editor rotate: false - xy: 3045, 263 + xy: 3079, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-icon-editor rotate: false - xy: 3079, 263 + xy: 3113, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-source-icon-editor rotate: false - xy: 3113, 263 + xy: 3147, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -10797,7 +12673,7 @@ liquid-tank-icon-editor index: -1 liquid-void-icon-editor rotate: false - xy: 3147, 263 + xy: 3181, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -10832,7 +12708,7 @@ mechanical-drill-icon-editor index: -1 mechanical-pump-icon-editor rotate: false - xy: 3181, 263 + xy: 3215, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -10846,7 +12722,7 @@ meltdown-icon-editor index: -1 melter-icon-editor rotate: false - xy: 3215, 263 + xy: 3249, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -10860,7 +12736,7 @@ memory-bank-icon-editor index: -1 memory-cell-icon-editor rotate: false - xy: 3249, 263 + xy: 3283, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -10874,21 +12750,21 @@ mend-projector-icon-editor index: -1 mender-icon-editor rotate: false - xy: 3283, 263 + xy: 3317, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 message-icon-editor rotate: false - xy: 3317, 263 + xy: 3351, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 micro-processor-icon-editor rotate: false - xy: 3351, 263 + xy: 3385, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -10937,7 +12813,7 @@ overdrive-projector-icon-editor index: -1 overflow-gate-icon-editor rotate: false - xy: 3385, 263 + xy: 3419, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -10965,28 +12841,28 @@ payload-router-icon-editor index: -1 pebbles-icon-editor rotate: false - xy: 3419, 263 + xy: 3453, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-icon-editor rotate: false - xy: 3453, 263 + xy: 3487, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-icon-editor rotate: false - xy: 3487, 263 + xy: 3521, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-wall-icon-editor rotate: false - xy: 3521, 263 + xy: 3555, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -11021,14 +12897,14 @@ plastanium-compressor-icon-editor index: -1 plastanium-conveyor-icon-editor rotate: false - xy: 3555, 263 + xy: 3589, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-wall-icon-editor rotate: false - xy: 3589, 263 + xy: 3623, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -11042,7 +12918,7 @@ plastanium-wall-large-icon-editor index: -1 plated-conduit-icon-editor rotate: false - xy: 3623, 263 + xy: 3657, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -11056,7 +12932,7 @@ pneumatic-drill-icon-editor index: -1 power-node-icon-editor rotate: false - xy: 3657, 263 + xy: 3691, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -11070,28 +12946,28 @@ power-node-large-icon-editor index: -1 power-source-icon-editor rotate: false - xy: 3691, 263 + xy: 3725, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 power-void-icon-editor rotate: false - xy: 3725, 263 + xy: 3759, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-icon-editor rotate: false - xy: 3759, 263 + xy: 3793, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulverizer-icon-editor rotate: false - xy: 3793, 263 + xy: 3827, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -11105,7 +12981,7 @@ pyratite-mixer-icon-editor index: -1 repair-point-icon-editor rotate: false - xy: 3827, 263 + xy: 3861, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -11133,7 +13009,7 @@ rotary-pump-icon-editor index: -1 router-icon-editor rotate: false - xy: 3861, 263 + xy: 3895, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -11147,7 +13023,7 @@ rtg-generator-icon-editor index: -1 salt-wall-icon-editor rotate: false - xy: 3895, 263 + xy: 3929, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -11161,21 +13037,21 @@ salvo-icon-editor index: -1 sand-boulder-icon-editor rotate: false - xy: 3929, 263 + xy: 3963, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand-wall-icon-editor rotate: false - xy: 3963, 263 + xy: 3997, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand-water-icon-editor rotate: false - xy: 3997, 263 + xy: 4031, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -11189,7 +13065,7 @@ scatter-icon-editor index: -1 scorch-icon-editor rotate: false - xy: 4031, 263 + xy: 2263, 229 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -11210,7 +13086,7 @@ scrap-wall-huge-icon-editor index: -1 scrap-wall-icon-editor rotate: false - xy: 2263, 229 + xy: 2297, 229 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -11238,28 +13114,28 @@ separator-icon-editor index: -1 shale-boulder-icon-editor rotate: false - xy: 2297, 229 + xy: 2331, 229 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shale-wall-icon-editor rotate: false - xy: 2331, 229 + xy: 2365, 229 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shock-mine-icon-editor rotate: false - xy: 2365, 229 + xy: 2399, 229 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shrubs-icon-editor rotate: false - xy: 2399, 229 + xy: 2433, 229 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -11287,7 +13163,7 @@ snow-boulder-icon-editor index: -1 snow-icon-editor rotate: false - xy: 2433, 229 + xy: 2467, 229 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -11301,14 +13177,14 @@ snow-pine-icon-editor index: -1 snow-wall-icon-editor rotate: false - xy: 2467, 229 + xy: 2501, 229 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 solar-panel-icon-editor rotate: false - xy: 2501, 229 + xy: 2535, 229 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -11322,14 +13198,14 @@ solar-panel-large-icon-editor index: -1 sorter-icon-editor rotate: false - xy: 2535, 229 + xy: 2569, 229 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spawn-icon-editor rotate: false - xy: 2569, 229 + xy: 2603, 229 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -11364,7 +13240,7 @@ spore-press-icon-editor index: -1 spore-wall-icon-editor rotate: false - xy: 2603, 229 + xy: 2637, 229 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -11378,7 +13254,7 @@ steam-generator-icon-editor index: -1 stone-wall-icon-editor rotate: false - xy: 2637, 229 + xy: 2671, 229 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -11392,7 +13268,7 @@ surge-tower-icon-editor index: -1 surge-wall-icon-editor rotate: false - xy: 2671, 229 + xy: 2705, 229 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -11413,14 +13289,14 @@ swarmer-icon-editor index: -1 switch-icon-editor rotate: false - xy: 2705, 229 + xy: 2739, 229 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 tendrils-icon-editor rotate: false - xy: 2739, 229 + xy: 2773, 229 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -11455,7 +13331,7 @@ thorium-reactor-icon-editor index: -1 thorium-wall-icon-editor rotate: false - xy: 2773, 229 + xy: 2807, 229 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -11476,14 +13352,14 @@ thruster-icon-editor index: -1 titanium-conveyor-icon-editor rotate: false - xy: 2807, 229 + xy: 2841, 229 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-wall-icon-editor rotate: false - xy: 2841, 229 + xy: 2875, 229 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -11504,14 +13380,14 @@ tsunami-icon-editor index: -1 underflow-gate-icon-editor rotate: false - xy: 2875, 229 + xy: 2909, 229 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unloader-icon-editor rotate: false - xy: 2909, 229 + xy: 2943, 229 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -11566,7 +13442,7 @@ alpha-bg index: -1 bar rotate: false - xy: 1869, 1 + xy: 2343, 150 size: 27, 36 split: 9, 9, 9, 9 orig: 27, 36 @@ -11574,7 +13450,7 @@ bar index: -1 bar-top rotate: false - xy: 1801, 1 + xy: 3550, 139 size: 27, 36 split: 9, 10, 9, 10 orig: 27, 36 @@ -11582,28 +13458,28 @@ bar-top index: -1 block-additive-reconstructor-large rotate: false - xy: 1078, 371 + xy: 1004, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-additive-reconstructor-medium rotate: false - xy: 881, 1 + xy: 3587, 253 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-additive-reconstructor-small rotate: false - xy: 3682, 351 + xy: 1605, 219 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-additive-reconstructor-tiny rotate: false - xy: 3640, 395 + xy: 881, 1 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -11617,28 +13493,28 @@ block-additive-reconstructor-xlarge index: -1 block-air-factory-large rotate: false - xy: 1120, 371 + xy: 1046, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-air-factory-medium rotate: false - xy: 915, 1 + xy: 3621, 253 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-air-factory-small rotate: false - xy: 1186, 7 + xy: 1731, 96 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-air-factory-tiny rotate: false - xy: 3640, 377 + xy: 309, 160 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -11652,28 +13528,28 @@ block-air-factory-xlarge index: -1 block-alloy-smelter-large rotate: false - xy: 1162, 371 + xy: 1004, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-alloy-smelter-medium rotate: false - xy: 3464, 295 + xy: 3655, 253 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-alloy-smelter-small rotate: false - xy: 1898, 1 + xy: 1731, 70 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-alloy-smelter-tiny rotate: false - xy: 1060, 7 + xy: 2169, 29 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -11687,28 +13563,28 @@ block-alloy-smelter-xlarge index: -1 block-arc-large rotate: false - xy: 1204, 371 + xy: 1088, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-arc-medium rotate: false - xy: 3498, 295 + xy: 901, 155 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-arc-small rotate: false - xy: 1212, 7 + xy: 1731, 44 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-arc-tiny rotate: false - xy: 2287, 193 + xy: 2187, 29 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -11722,28 +13598,28 @@ block-arc-xlarge index: -1 block-armored-conveyor-large rotate: false - xy: 1246, 371 + xy: 1046, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-armored-conveyor-medium rotate: false - xy: 3532, 295 + xy: 935, 153 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-armored-conveyor-small rotate: false - xy: 1924, 1 + xy: 3810, 245 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-armored-conveyor-tiny rotate: false - xy: 309, 160 + xy: 2205, 29 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -11757,28 +13633,28 @@ block-armored-conveyor-xlarge index: -1 block-basalt-large rotate: false - xy: 1288, 371 + xy: 1130, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-basalt-medium rotate: false - xy: 3566, 295 + xy: 969, 153 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-basalt-small rotate: false - xy: 1950, 1 + xy: 2372, 162 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-basalt-tiny rotate: false - xy: 2305, 193 + xy: 2223, 29 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -11792,35 +13668,35 @@ block-basalt-xlarge index: -1 block-battery-large rotate: false - xy: 1330, 371 + xy: 1088, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-battery-large-large rotate: false - xy: 1372, 371 + xy: 1172, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-battery-large-medium rotate: false - xy: 3600, 295 + xy: 2639, 219 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-battery-large-small rotate: false - xy: 1976, 1 + xy: 2372, 136 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-battery-large-tiny rotate: false - xy: 2323, 193 + xy: 2241, 29 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -11834,21 +13710,21 @@ block-battery-large-xlarge index: -1 block-battery-medium rotate: false - xy: 2287, 211 + xy: 2673, 211 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-battery-small rotate: false - xy: 2002, 1 + xy: 2398, 151 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-battery-tiny rotate: false - xy: 2341, 193 + xy: 2259, 29 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -11862,28 +13738,28 @@ block-battery-xlarge index: -1 block-blast-drill-large rotate: false - xy: 1414, 371 + xy: 1130, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-blast-drill-medium rotate: false - xy: 2321, 211 + xy: 2707, 211 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-blast-drill-small rotate: false - xy: 2028, 1 + xy: 2424, 151 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-blast-drill-tiny rotate: false - xy: 2359, 193 + xy: 2277, 29 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -11897,28 +13773,28 @@ block-blast-drill-xlarge index: -1 block-blast-mixer-large rotate: false - xy: 1456, 371 + xy: 1214, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-blast-mixer-medium rotate: false - xy: 938, 161 + xy: 2741, 224 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-blast-mixer-small rotate: false - xy: 2054, 1 + xy: 2398, 125 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-blast-mixer-tiny rotate: false - xy: 2594, 71 + xy: 257, 2 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -11932,28 +13808,28 @@ block-blast-mixer-xlarge index: -1 block-block-forge-large rotate: false - xy: 1498, 371 + xy: 1172, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-block-forge-medium rotate: false - xy: 972, 161 + xy: 2775, 224 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-block-forge-small rotate: false - xy: 1830, 7 + xy: 2424, 125 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-block-forge-tiny rotate: false - xy: 2594, 53 + xy: 2384, 81 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -11967,28 +13843,28 @@ block-block-forge-xlarge index: -1 block-block-loader-large rotate: false - xy: 1540, 371 + xy: 1256, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-block-loader-medium rotate: false - xy: 1006, 161 + xy: 2809, 224 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-block-loader-small rotate: false - xy: 3711, 192 + xy: 3825, 219 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-block-loader-tiny rotate: false - xy: 2594, 35 + xy: 2402, 81 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12002,28 +13878,28 @@ block-block-loader-xlarge index: -1 block-block-unloader-large rotate: false - xy: 1582, 371 + xy: 1214, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-block-unloader-medium rotate: false - xy: 1040, 161 + xy: 2843, 224 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-block-unloader-small rotate: false - xy: 1238, 7 + xy: 3836, 245 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-block-unloader-tiny rotate: false - xy: 2491, 184 + xy: 2420, 81 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12037,28 +13913,28 @@ block-block-unloader-xlarge index: -1 block-boulder-large rotate: false - xy: 1624, 371 + xy: 1298, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-boulder-medium rotate: false - xy: 1074, 169 + xy: 2877, 224 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-boulder-small rotate: false - xy: 1264, 16 + xy: 3825, 193 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-boulder-tiny rotate: false - xy: 3757, 345 + xy: 2438, 81 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12072,28 +13948,28 @@ block-boulder-xlarge index: -1 block-bridge-conduit-large rotate: false - xy: 1666, 371 + xy: 1256, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-bridge-conduit-medium rotate: false - xy: 1108, 169 + xy: 2911, 224 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-bridge-conduit-small rotate: false - xy: 1290, 7 + xy: 3824, 167 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-bridge-conduit-tiny rotate: false - xy: 3775, 345 + xy: 2381, 63 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12107,28 +13983,28 @@ block-bridge-conduit-xlarge index: -1 block-bridge-conveyor-large rotate: false - xy: 1708, 371 + xy: 1340, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-bridge-conveyor-medium rotate: false - xy: 1142, 169 + xy: 2945, 224 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-bridge-conveyor-small rotate: false - xy: 1316, 7 + xy: 3851, 219 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-bridge-conveyor-tiny rotate: false - xy: 2594, 17 + xy: 2381, 45 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12142,28 +14018,28 @@ block-bridge-conveyor-xlarge index: -1 block-char-large rotate: false - xy: 1750, 371 + xy: 1298, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-char-medium rotate: false - xy: 1176, 169 + xy: 2979, 224 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-char-small rotate: false - xy: 1342, 7 + xy: 3851, 193 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-char-tiny rotate: false - xy: 2568, 7 + xy: 2399, 63 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12177,28 +14053,28 @@ block-char-xlarge index: -1 block-cliff-large rotate: false - xy: 1792, 371 + xy: 1382, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-cliff-medium rotate: false - xy: 1210, 169 + xy: 3013, 224 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-cliff-small rotate: false - xy: 1368, 7 + xy: 3850, 167 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-cliff-tiny rotate: false - xy: 3781, 174 + xy: 2381, 27 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12212,28 +14088,28 @@ block-cliff-xlarge index: -1 block-coal-centrifuge-large rotate: false - xy: 1834, 371 + xy: 1340, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-coal-centrifuge-medium rotate: false - xy: 1244, 169 + xy: 3047, 224 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-coal-centrifuge-small rotate: false - xy: 1394, 7 + xy: 3862, 245 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-coal-centrifuge-tiny rotate: false - xy: 2330, 175 + xy: 2399, 45 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12247,28 +14123,28 @@ block-coal-centrifuge-xlarge index: -1 block-combustion-generator-large rotate: false - xy: 1876, 371 + xy: 1424, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-combustion-generator-medium rotate: false - xy: 1278, 169 + xy: 3081, 224 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-combustion-generator-small rotate: false - xy: 1420, 7 + xy: 3877, 219 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-combustion-generator-tiny rotate: false - xy: 2330, 157 + xy: 2417, 63 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12282,28 +14158,28 @@ block-combustion-generator-xlarge index: -1 block-command-center-large rotate: false - xy: 1918, 371 + xy: 1382, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-command-center-medium rotate: false - xy: 1312, 169 + xy: 3115, 224 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-command-center-small rotate: false - xy: 1446, 7 + xy: 3877, 193 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-command-center-tiny rotate: false - xy: 2348, 175 + xy: 2381, 9 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12317,28 +14193,28 @@ block-command-center-xlarge index: -1 block-conduit-large rotate: false - xy: 1960, 371 + xy: 1466, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-conduit-medium rotate: false - xy: 1346, 169 + xy: 3149, 224 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-conduit-small rotate: false - xy: 1472, 7 + xy: 3876, 167 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-conduit-tiny rotate: false - xy: 2348, 157 + xy: 2399, 27 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12352,28 +14228,28 @@ block-conduit-xlarge index: -1 block-container-large rotate: false - xy: 2002, 371 + xy: 1424, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-container-medium rotate: false - xy: 1380, 169 + xy: 3183, 224 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-container-small rotate: false - xy: 1498, 7 + xy: 3888, 245 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-container-tiny rotate: false - xy: 2366, 175 + xy: 2417, 45 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12387,28 +14263,28 @@ block-container-xlarge index: -1 block-conveyor-large rotate: false - xy: 2044, 371 + xy: 1508, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-conveyor-medium rotate: false - xy: 1414, 169 + xy: 3217, 224 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-conveyor-small rotate: false - xy: 1524, 7 + xy: 3903, 219 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-conveyor-tiny rotate: false - xy: 2366, 157 + xy: 2435, 63 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12422,35 +14298,35 @@ block-conveyor-xlarge index: -1 block-copper-wall-large rotate: false - xy: 2086, 371 + xy: 1466, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-copper-wall-large-large rotate: false - xy: 2128, 371 + xy: 1550, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-copper-wall-large-medium rotate: false - xy: 1448, 169 + xy: 3251, 224 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-copper-wall-large-small rotate: false - xy: 1550, 7 + xy: 3903, 193 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-copper-wall-large-tiny rotate: false - xy: 2384, 173 + xy: 2399, 9 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12464,21 +14340,21 @@ block-copper-wall-large-xlarge index: -1 block-copper-wall-medium rotate: false - xy: 1482, 169 + xy: 3285, 224 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-copper-wall-small rotate: false - xy: 1576, 7 + xy: 3902, 167 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-copper-wall-tiny rotate: false - xy: 2402, 173 + xy: 2417, 27 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12492,28 +14368,28 @@ block-copper-wall-xlarge index: -1 block-core-foundation-large rotate: false - xy: 2170, 371 + xy: 1508, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-core-foundation-medium rotate: false - xy: 1516, 169 + xy: 3319, 224 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-core-foundation-small rotate: false - xy: 1602, 7 + xy: 3914, 245 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-core-foundation-tiny rotate: false - xy: 2420, 173 + xy: 2435, 45 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12527,28 +14403,28 @@ block-core-foundation-xlarge index: -1 block-core-nucleus-large rotate: false - xy: 2212, 371 + xy: 1592, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-core-nucleus-medium rotate: false - xy: 1550, 169 + xy: 3353, 224 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-core-nucleus-small rotate: false - xy: 1628, 7 + xy: 3929, 219 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-core-nucleus-tiny rotate: false - xy: 2384, 155 + xy: 2417, 9 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12562,28 +14438,28 @@ block-core-nucleus-xlarge index: -1 block-core-shard-large rotate: false - xy: 2254, 371 + xy: 1550, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-core-shard-medium rotate: false - xy: 1584, 169 + xy: 3387, 224 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-core-shard-small rotate: false - xy: 1654, 7 + xy: 3929, 193 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-core-shard-tiny rotate: false - xy: 2402, 155 + xy: 2435, 27 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12597,28 +14473,28 @@ block-core-shard-xlarge index: -1 block-craters-large rotate: false - xy: 2296, 371 + xy: 1634, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-craters-medium rotate: false - xy: 1618, 169 + xy: 1799, 211 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-craters-small rotate: false - xy: 1680, 7 + xy: 3928, 167 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-craters-tiny rotate: false - xy: 2420, 155 + xy: 2435, 9 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12632,28 +14508,28 @@ block-craters-xlarge index: -1 block-cryofluid-mixer-large rotate: false - xy: 2338, 371 + xy: 1592, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-cryofluid-mixer-medium rotate: false - xy: 1652, 169 + xy: 1833, 211 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-cryofluid-mixer-small rotate: false - xy: 1706, 7 + xy: 3940, 245 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-cryofluid-mixer-tiny rotate: false - xy: 2509, 184 + xy: 2462, 107 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12667,28 +14543,28 @@ block-cryofluid-mixer-xlarge index: -1 block-cultivator-large rotate: false - xy: 2380, 371 + xy: 1676, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-cultivator-medium rotate: false - xy: 1686, 169 + xy: 1867, 211 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-cultivator-small rotate: false - xy: 3708, 339 + xy: 3955, 219 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-cultivator-tiny rotate: false - xy: 2527, 188 + xy: 1809, 11 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12702,28 +14578,28 @@ block-cultivator-xlarge index: -1 block-cyclone-large rotate: false - xy: 2422, 371 + xy: 1634, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-cyclone-medium rotate: false - xy: 1720, 169 + xy: 1901, 211 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-cyclone-small rotate: false - xy: 3702, 313 + xy: 3955, 193 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-cyclone-tiny rotate: false - xy: 2545, 188 + xy: 1827, 11 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12737,28 +14613,28 @@ block-cyclone-xlarge index: -1 block-dacite-boulder-large rotate: false - xy: 2464, 371 + xy: 1718, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-dacite-boulder-medium rotate: false - xy: 1754, 169 + xy: 1935, 211 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-dacite-boulder-small rotate: false - xy: 2123, 7 + xy: 3954, 167 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-dacite-boulder-tiny rotate: false - xy: 3781, 156 + xy: 1845, 11 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12772,56 +14648,56 @@ block-dacite-boulder-xlarge index: -1 block-dacite-large rotate: false - xy: 2506, 371 + xy: 1676, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-dacite-medium rotate: false - xy: 1788, 169 + xy: 1969, 219 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-dacite-small rotate: false - xy: 2491, 228 + xy: 3966, 245 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-dacite-tiny rotate: false - xy: 3757, 327 + xy: 1863, 11 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-dacite-wall-large rotate: false - xy: 2548, 371 + xy: 1760, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-dacite-wall-medium rotate: false - xy: 1822, 169 + xy: 2003, 211 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-dacite-wall-small rotate: false - xy: 2517, 232 + xy: 3981, 219 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-dacite-wall-tiny rotate: false - xy: 3775, 327 + xy: 1881, 11 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12842,28 +14718,28 @@ block-dacite-xlarge index: -1 block-dark-metal-large rotate: false - xy: 2590, 371 + xy: 1718, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-dark-metal-medium rotate: false - xy: 1856, 169 + xy: 2037, 211 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-dark-metal-small rotate: false - xy: 2543, 232 + xy: 3981, 193 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-dark-metal-tiny rotate: false - xy: 2080, 7 + xy: 1899, 11 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12877,28 +14753,28 @@ block-dark-metal-xlarge index: -1 block-dark-panel-1-large rotate: false - xy: 2632, 371 + xy: 1802, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-dark-panel-1-medium rotate: false - xy: 1890, 169 + xy: 2071, 211 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-dark-panel-1-small rotate: false - xy: 2569, 219 + xy: 3980, 167 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-dark-panel-1-tiny rotate: false - xy: 2098, 7 + xy: 1917, 11 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12912,28 +14788,28 @@ block-dark-panel-1-xlarge index: -1 block-dark-panel-2-large rotate: false - xy: 2674, 371 + xy: 1760, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-dark-panel-2-medium rotate: false - xy: 1924, 169 + xy: 2105, 211 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-dark-panel-2-small rotate: false - xy: 2595, 219 + xy: 3992, 245 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-dark-panel-2-tiny rotate: false - xy: 2527, 170 + xy: 1935, 11 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12947,28 +14823,28 @@ block-dark-panel-2-xlarge index: -1 block-dark-panel-3-large rotate: false - xy: 2716, 371 + xy: 1844, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-dark-panel-3-medium rotate: false - xy: 1958, 169 + xy: 2139, 211 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-dark-panel-3-small rotate: false - xy: 2491, 202 + xy: 4018, 245 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-dark-panel-3-tiny rotate: false - xy: 2545, 170 + xy: 1953, 11 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12982,28 +14858,28 @@ block-dark-panel-3-xlarge index: -1 block-dark-panel-4-large rotate: false - xy: 2758, 371 + xy: 1802, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-dark-panel-4-medium rotate: false - xy: 1992, 169 + xy: 2173, 211 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-dark-panel-4-small rotate: false - xy: 2517, 206 + xy: 4007, 219 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-dark-panel-4-tiny rotate: false - xy: 2563, 175 + xy: 1971, 11 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -13017,28 +14893,28 @@ block-dark-panel-4-xlarge index: -1 block-dark-panel-5-large rotate: false - xy: 2800, 371 + xy: 1886, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-dark-panel-5-medium rotate: false - xy: 2026, 169 + xy: 2207, 211 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-dark-panel-5-small rotate: false - xy: 2543, 206 + xy: 4007, 193 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-dark-panel-5-tiny rotate: false - xy: 2581, 175 + xy: 2169, 11 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -13052,28 +14928,28 @@ block-dark-panel-5-xlarge index: -1 block-dark-panel-6-large rotate: false - xy: 2842, 371 + xy: 1844, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-dark-panel-6-medium rotate: false - xy: 2060, 169 + xy: 2241, 211 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-dark-panel-6-small rotate: false - xy: 2569, 193 + xy: 4006, 167 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-dark-panel-6-tiny rotate: false - xy: 2599, 175 + xy: 2187, 11 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -13087,49 +14963,49 @@ block-dark-panel-6-xlarge index: -1 block-darksand-large rotate: false - xy: 2884, 371 + xy: 1928, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-darksand-medium rotate: false - xy: 2094, 171 + xy: 2275, 211 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-darksand-small rotate: false - xy: 2595, 193 + xy: 4033, 219 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-darksand-tainted-water-large rotate: false - xy: 2926, 371 + xy: 1886, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-darksand-tainted-water-medium rotate: false - xy: 2128, 177 + xy: 2309, 211 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-darksand-tainted-water-small rotate: false - xy: 2621, 235 + xy: 4033, 193 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-darksand-tainted-water-tiny rotate: false - xy: 2563, 157 + xy: 2205, 11 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -13143,35 +15019,35 @@ block-darksand-tainted-water-xlarge index: -1 block-darksand-tiny rotate: false - xy: 2581, 157 + xy: 2223, 11 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-darksand-water-large rotate: false - xy: 2968, 371 + xy: 1970, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-darksand-water-medium rotate: false - xy: 2162, 180 + xy: 1969, 185 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-darksand-water-small rotate: false - xy: 2621, 209 + xy: 4032, 167 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-darksand-water-tiny rotate: false - xy: 2599, 157 + xy: 2241, 11 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -13192,28 +15068,28 @@ block-darksand-xlarge index: -1 block-deepwater-large rotate: false - xy: 3010, 371 + xy: 1928, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-deepwater-medium rotate: false - xy: 2623, 261 + xy: 2003, 177 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-deepwater-small rotate: false - xy: 2647, 227 + xy: 4059, 226 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-deepwater-tiny rotate: false - xy: 2617, 165 + xy: 2259, 11 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -13227,28 +15103,28 @@ block-deepwater-xlarge index: -1 block-differential-generator-large rotate: false - xy: 3052, 371 + xy: 2012, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-differential-generator-medium rotate: false - xy: 2657, 253 + xy: 2037, 177 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-differential-generator-small rotate: false - xy: 2673, 227 + xy: 4059, 200 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-differential-generator-tiny rotate: false - xy: 2617, 147 + xy: 2277, 11 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -13262,28 +15138,28 @@ block-differential-generator-xlarge index: -1 block-diode-large rotate: false - xy: 3094, 371 + xy: 1970, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-diode-medium rotate: false - xy: 2355, 211 + xy: 2071, 177 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-diode-small rotate: false - xy: 2699, 227 + xy: 4059, 174 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-diode-tiny rotate: false - xy: 2612, 129 + xy: 2295, 18 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -13297,56 +15173,56 @@ block-diode-xlarge index: -1 block-dirt-large rotate: false - xy: 3136, 371 + xy: 2054, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-dirt-medium rotate: false - xy: 2389, 217 + xy: 2105, 177 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-dirt-small rotate: false - xy: 2647, 201 + xy: 4058, 148 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-dirt-tiny rotate: false - xy: 2612, 111 + xy: 2462, 89 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-dirt-wall-large rotate: false - xy: 3178, 371 + xy: 2012, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-dirt-wall-medium rotate: false - xy: 2423, 219 + xy: 2139, 177 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-dirt-wall-small rotate: false - xy: 2673, 201 + xy: 2445, 177 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-dirt-wall-tiny rotate: false - xy: 2610, 93 + xy: 2069, 8 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -13367,28 +15243,28 @@ block-dirt-xlarge index: -1 block-disassembler-large rotate: false - xy: 3220, 371 + xy: 2096, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-disassembler-medium rotate: false - xy: 2457, 220 + xy: 2173, 177 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-disassembler-small rotate: false - xy: 2699, 201 + xy: 2450, 151 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-disassembler-tiny rotate: false - xy: 2612, 75 + xy: 2087, 8 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -13402,28 +15278,28 @@ block-disassembler-xlarge index: -1 block-distributor-large rotate: false - xy: 3262, 371 + xy: 2054, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-distributor-medium rotate: false - xy: 2691, 253 + xy: 2207, 177 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-distributor-small rotate: false - xy: 2725, 206 + xy: 2450, 125 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-distributor-tiny rotate: false - xy: 2612, 57 + xy: 2453, 63 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -13437,35 +15313,35 @@ block-distributor-xlarge index: -1 block-door-large rotate: false - xy: 3304, 371 + xy: 2138, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-door-large-large rotate: false - xy: 3346, 371 + xy: 2096, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-door-large-medium rotate: false - xy: 2725, 266 + xy: 2241, 177 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-door-large-small rotate: false - xy: 2751, 206 + xy: 2471, 193 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-door-large-tiny rotate: false - xy: 2612, 39 + xy: 2453, 45 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -13479,21 +15355,21 @@ block-door-large-xlarge index: -1 block-door-medium rotate: false - xy: 2759, 266 + xy: 2275, 177 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-door-small rotate: false - xy: 2777, 206 + xy: 2497, 185 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-door-tiny rotate: false - xy: 2612, 21 + xy: 2453, 27 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -13507,28 +15383,28 @@ block-door-xlarge index: -1 block-dune-wall-large rotate: false - xy: 3388, 371 + xy: 2180, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-dune-wall-medium rotate: false - xy: 2793, 266 + xy: 2309, 177 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-dune-wall-small rotate: false - xy: 2803, 206 + xy: 2523, 185 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-dune-wall-tiny rotate: false - xy: 2635, 157 + xy: 2453, 9 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -13542,28 +15418,28 @@ block-dune-wall-xlarge index: -1 block-duo-large rotate: false - xy: 3430, 371 + xy: 2138, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-duo-medium rotate: false - xy: 2827, 266 + xy: 881, 121 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-duo-small rotate: false - xy: 2829, 206 + xy: 2549, 194 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-duo-tiny rotate: false - xy: 2653, 157 + xy: 4047, 123 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -13577,28 +15453,28 @@ block-duo-xlarge index: -1 block-exponential-reconstructor-large rotate: false - xy: 3472, 371 + xy: 2222, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-exponential-reconstructor-medium rotate: false - xy: 2861, 266 + xy: 881, 87 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-exponential-reconstructor-small rotate: false - xy: 2855, 206 + xy: 2549, 168 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-exponential-reconstructor-tiny rotate: false - xy: 2671, 157 + xy: 4065, 130 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -13612,28 +15488,28 @@ block-exponential-reconstructor-xlarge index: -1 block-force-projector-large rotate: false - xy: 3514, 371 + xy: 2180, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-force-projector-medium rotate: false - xy: 2895, 266 + xy: 881, 53 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-force-projector-small rotate: false - xy: 2881, 206 + xy: 2575, 177 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-force-projector-tiny rotate: false - xy: 2689, 157 + xy: 4047, 105 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -13647,28 +15523,28 @@ block-force-projector-xlarge index: -1 block-foreshadow-large rotate: false - xy: 3556, 371 + xy: 2264, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-foreshadow-medium rotate: false - xy: 2929, 266 + xy: 881, 19 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-foreshadow-small rotate: false - xy: 2907, 206 + xy: 2601, 177 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-foreshadow-tiny rotate: false - xy: 2707, 157 + xy: 4065, 112 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -13682,28 +15558,28 @@ block-foreshadow-xlarge index: -1 block-fuse-large rotate: false - xy: 3598, 371 + xy: 2222, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-fuse-medium rotate: false - xy: 2963, 266 + xy: 915, 119 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-fuse-small rotate: false - xy: 2933, 206 + xy: 2575, 151 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-fuse-tiny rotate: false - xy: 2635, 139 + xy: 4065, 94 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -13717,28 +15593,28 @@ block-fuse-xlarge index: -1 block-graphite-press-large rotate: false - xy: 4009, 281 + xy: 2306, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-graphite-press-medium rotate: false - xy: 2997, 266 + xy: 915, 85 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-graphite-press-small rotate: false - xy: 2959, 206 + xy: 2601, 151 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-graphite-press-tiny rotate: false - xy: 2653, 139 + xy: 3809, 311 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -13752,28 +15628,28 @@ block-graphite-press-xlarge index: -1 block-grass-large rotate: false - xy: 1078, 329 + xy: 2264, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-grass-medium rotate: false - xy: 3031, 266 + xy: 949, 119 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-grass-small rotate: false - xy: 2985, 206 + xy: 3581, 159 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-grass-tiny rotate: false - xy: 2671, 139 + xy: 2476, 175 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -13787,28 +15663,28 @@ block-grass-xlarge index: -1 block-ground-factory-large rotate: false - xy: 1120, 329 + xy: 2348, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-ground-factory-medium rotate: false - xy: 3065, 266 + xy: 915, 51 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ground-factory-small rotate: false - xy: 3011, 206 + xy: 3607, 159 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-ground-factory-tiny rotate: false - xy: 2689, 139 + xy: 2476, 157 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -13822,28 +15698,28 @@ block-ground-factory-xlarge index: -1 block-hail-large rotate: false - xy: 1162, 329 + xy: 2306, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-hail-medium rotate: false - xy: 3099, 266 + xy: 949, 85 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-hail-small rotate: false - xy: 3037, 206 + xy: 3633, 159 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-hail-tiny rotate: false - xy: 2707, 139 + xy: 2476, 139 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -13857,28 +15733,28 @@ block-hail-xlarge index: -1 block-hotrock-large rotate: false - xy: 1204, 329 + xy: 2390, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-hotrock-medium rotate: false - xy: 3133, 266 + xy: 949, 51 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-hotrock-small rotate: false - xy: 3063, 206 + xy: 3659, 159 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-hotrock-tiny rotate: false - xy: 2725, 136 + xy: 2494, 167 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -13892,28 +15768,28 @@ block-hotrock-xlarge index: -1 block-hyper-processor-large rotate: false - xy: 1246, 329 + xy: 2348, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-hyper-processor-medium rotate: false - xy: 3167, 266 + xy: 915, 17 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-hyper-processor-small rotate: false - xy: 3089, 206 + xy: 3685, 157 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-hyper-processor-tiny rotate: false - xy: 2743, 136 + xy: 2512, 167 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -13927,49 +15803,49 @@ block-hyper-processor-xlarge index: -1 block-ice-large rotate: false - xy: 1288, 329 + xy: 2432, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-ice-medium rotate: false - xy: 3201, 266 + xy: 949, 17 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ice-small rotate: false - xy: 3115, 206 + xy: 3579, 133 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-ice-snow-large rotate: false - xy: 1330, 329 + xy: 2390, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-ice-snow-medium rotate: false - xy: 3235, 266 + xy: 983, 119 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ice-snow-small rotate: false - xy: 3141, 206 + xy: 3605, 133 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-ice-snow-tiny rotate: false - xy: 2761, 136 + xy: 2494, 149 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -13983,35 +15859,35 @@ block-ice-snow-xlarge index: -1 block-ice-tiny rotate: false - xy: 2779, 136 + xy: 2530, 167 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-ice-wall-large rotate: false - xy: 1372, 329 + xy: 2474, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-ice-wall-medium rotate: false - xy: 3269, 266 + xy: 983, 85 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ice-wall-small rotate: false - xy: 3167, 206 + xy: 3631, 133 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-ice-wall-tiny rotate: false - xy: 2797, 136 + xy: 2512, 149 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -14032,28 +15908,28 @@ block-ice-xlarge index: -1 block-illuminator-large rotate: false - xy: 1414, 329 + xy: 2432, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-illuminator-medium rotate: false - xy: 3303, 266 + xy: 983, 51 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-illuminator-small rotate: false - xy: 3193, 206 + xy: 3657, 133 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-illuminator-tiny rotate: false - xy: 2815, 136 + xy: 2530, 149 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -14067,28 +15943,28 @@ block-illuminator-xlarge index: -1 block-impact-reactor-large rotate: false - xy: 1456, 329 + xy: 2516, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-impact-reactor-medium rotate: false - xy: 3337, 266 + xy: 983, 17 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-impact-reactor-small rotate: false - xy: 3219, 206 + xy: 3683, 131 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-impact-reactor-tiny rotate: false - xy: 2833, 136 + xy: 2548, 150 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -14102,28 +15978,28 @@ block-impact-reactor-xlarge index: -1 block-incinerator-large rotate: false - xy: 1498, 329 + xy: 2474, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-incinerator-medium rotate: false - xy: 3371, 266 + xy: 2741, 190 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-incinerator-small rotate: false - xy: 3245, 206 + xy: 1731, 185 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-incinerator-tiny rotate: false - xy: 2851, 136 + xy: 2494, 131 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -14137,28 +16013,28 @@ block-incinerator-xlarge index: -1 block-inverted-sorter-large rotate: false - xy: 1540, 329 + xy: 2558, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-inverted-sorter-medium rotate: false - xy: 918, 127 + xy: 2775, 190 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-inverted-sorter-small rotate: false - xy: 3271, 206 + xy: 1757, 205 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-inverted-sorter-tiny rotate: false - xy: 2869, 136 + xy: 2512, 131 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -14172,28 +16048,28 @@ block-inverted-sorter-xlarge index: -1 block-item-source-large rotate: false - xy: 1582, 329 + xy: 2516, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-item-source-medium rotate: false - xy: 917, 93 + xy: 2809, 190 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-item-source-small rotate: false - xy: 3297, 206 + xy: 1757, 96 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-item-source-tiny rotate: false - xy: 2887, 136 + xy: 2530, 131 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -14207,28 +16083,28 @@ block-item-source-xlarge index: -1 block-item-void-large rotate: false - xy: 1624, 329 + xy: 2600, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-item-void-medium rotate: false - xy: 952, 127 + xy: 2843, 190 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-item-void-small rotate: false - xy: 3323, 206 + xy: 1757, 70 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-item-void-tiny rotate: false - xy: 2905, 136 + xy: 2548, 132 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -14242,28 +16118,28 @@ block-item-void-xlarge index: -1 block-junction-large rotate: false - xy: 1666, 329 + xy: 2558, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-junction-medium rotate: false - xy: 951, 93 + xy: 2877, 190 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-junction-small rotate: false - xy: 3349, 206 + xy: 1757, 44 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-junction-tiny rotate: false - xy: 2923, 136 + xy: 2566, 133 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -14277,28 +16153,28 @@ block-junction-xlarge index: -1 block-kiln-large rotate: false - xy: 1708, 329 + xy: 2642, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-kiln-medium rotate: false - xy: 986, 127 + xy: 2911, 190 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-kiln-small rotate: false - xy: 3375, 206 + xy: 3711, 145 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-kiln-tiny rotate: false - xy: 2941, 136 + xy: 2584, 133 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -14312,28 +16188,28 @@ block-kiln-xlarge index: -1 block-lancer-large rotate: false - xy: 1750, 329 + xy: 2600, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-lancer-medium rotate: false - xy: 985, 93 + xy: 2945, 190 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-lancer-small rotate: false - xy: 2621, 183 + xy: 3737, 145 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-lancer-tiny rotate: false - xy: 2959, 136 + xy: 2602, 133 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -14347,28 +16223,28 @@ block-lancer-xlarge index: -1 block-large-logic-display-large rotate: false - xy: 1792, 329 + xy: 2684, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-large-logic-display-medium rotate: false - xy: 1020, 127 + xy: 2979, 190 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-large-logic-display-small rotate: false - xy: 2647, 175 + xy: 3763, 145 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-large-logic-display-tiny rotate: false - xy: 2977, 136 + xy: 2620, 133 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -14382,28 +16258,28 @@ block-large-logic-display-xlarge index: -1 block-laser-drill-large rotate: false - xy: 1834, 329 + xy: 2642, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-laser-drill-medium rotate: false - xy: 1019, 93 + xy: 3013, 190 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-laser-drill-small rotate: false - xy: 2673, 175 + xy: 3789, 145 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-laser-drill-tiny rotate: false - xy: 2995, 136 + xy: 1989, 11 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -14417,35 +16293,35 @@ block-laser-drill-xlarge index: -1 block-launch-pad-large rotate: false - xy: 1876, 329 + xy: 2726, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-launch-pad-large-large rotate: false - xy: 1918, 329 + xy: 2684, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-launch-pad-large-medium rotate: false - xy: 1054, 127 + xy: 3047, 190 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-launch-pad-large-small rotate: false - xy: 2699, 175 + xy: 3815, 141 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-launch-pad-large-tiny rotate: false - xy: 3013, 136 + xy: 2007, 8 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -14459,21 +16335,21 @@ block-launch-pad-large-xlarge index: -1 block-launch-pad-medium rotate: false - xy: 1053, 93 + xy: 3081, 190 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-launch-pad-small rotate: false - xy: 2725, 180 + xy: 3841, 141 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-launch-pad-tiny rotate: false - xy: 3031, 136 + xy: 2025, 8 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -14487,28 +16363,28 @@ block-launch-pad-xlarge index: -1 block-liquid-junction-large rotate: false - xy: 1960, 329 + xy: 2768, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-liquid-junction-medium rotate: false - xy: 1088, 135 + xy: 3115, 190 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-liquid-junction-small rotate: false - xy: 2751, 180 + xy: 3867, 141 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-liquid-junction-tiny rotate: false - xy: 3049, 136 + xy: 2043, 3 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -14522,28 +16398,28 @@ block-liquid-junction-xlarge index: -1 block-liquid-router-large rotate: false - xy: 2002, 329 + xy: 2726, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-liquid-router-medium rotate: false - xy: 1122, 135 + xy: 3149, 190 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-liquid-router-small rotate: false - xy: 2777, 180 + xy: 3893, 141 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-liquid-router-tiny rotate: false - xy: 3067, 136 + xy: 3887, 312 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -14557,28 +16433,28 @@ block-liquid-router-xlarge index: -1 block-liquid-source-large rotate: false - xy: 2044, 329 + xy: 2810, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-liquid-source-medium rotate: false - xy: 1156, 135 + xy: 3183, 190 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-liquid-source-small rotate: false - xy: 2803, 180 + xy: 3919, 141 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-liquid-source-tiny rotate: false - xy: 3085, 136 + xy: 3887, 294 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -14592,28 +16468,28 @@ block-liquid-source-xlarge index: -1 block-liquid-tank-large rotate: false - xy: 2086, 329 + xy: 2768, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-liquid-tank-medium rotate: false - xy: 1190, 135 + xy: 3217, 190 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-liquid-tank-small rotate: false - xy: 2829, 180 + xy: 3945, 141 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-liquid-tank-tiny rotate: false - xy: 3103, 136 + xy: 3887, 276 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -14627,28 +16503,28 @@ block-liquid-tank-xlarge index: -1 block-liquid-void-large rotate: false - xy: 2128, 329 + xy: 2852, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-liquid-void-medium rotate: false - xy: 1224, 135 + xy: 3251, 190 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-liquid-void-small rotate: false - xy: 2855, 180 + xy: 3971, 141 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-liquid-void-tiny rotate: false - xy: 3121, 136 + xy: 3905, 305 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -14662,28 +16538,28 @@ block-liquid-void-xlarge index: -1 block-logic-display-large rotate: false - xy: 2170, 329 + xy: 2810, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-logic-display-medium rotate: false - xy: 1258, 135 + xy: 3285, 190 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-logic-display-small rotate: false - xy: 2881, 180 + xy: 3997, 141 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-logic-display-tiny rotate: false - xy: 3139, 136 + xy: 3923, 305 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -14697,28 +16573,28 @@ block-logic-display-xlarge index: -1 block-logic-processor-large rotate: false - xy: 2212, 329 + xy: 2894, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-logic-processor-medium rotate: false - xy: 1292, 135 + xy: 3319, 190 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-logic-processor-small rotate: false - xy: 2907, 180 + xy: 4023, 141 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-logic-processor-tiny rotate: false - xy: 3157, 136 + xy: 3941, 305 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -14732,28 +16608,28 @@ block-logic-processor-xlarge index: -1 block-magmarock-large rotate: false - xy: 2254, 329 + xy: 2852, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-magmarock-medium rotate: false - xy: 1326, 135 + xy: 3353, 190 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-magmarock-small rotate: false - xy: 2933, 180 + xy: 3709, 119 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-magmarock-tiny rotate: false - xy: 3175, 136 + xy: 3905, 287 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -14767,28 +16643,28 @@ block-magmarock-xlarge index: -1 block-mass-driver-large rotate: false - xy: 2296, 329 + xy: 2936, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-mass-driver-medium rotate: false - xy: 1360, 135 + xy: 3387, 190 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-mass-driver-small rotate: false - xy: 2959, 180 + xy: 3735, 119 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-mass-driver-tiny rotate: false - xy: 3193, 136 + xy: 3923, 287 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -14802,28 +16678,28 @@ block-mass-driver-xlarge index: -1 block-mechanical-drill-large rotate: false - xy: 2338, 329 + xy: 2894, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-mechanical-drill-medium rotate: false - xy: 1394, 135 + xy: 1631, 222 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-mechanical-drill-small rotate: false - xy: 2985, 180 + xy: 3761, 119 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-mechanical-drill-tiny rotate: false - xy: 3211, 136 + xy: 3941, 287 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -14837,28 +16713,28 @@ block-mechanical-drill-xlarge index: -1 block-mechanical-pump-large rotate: false - xy: 2380, 329 + xy: 2978, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-mechanical-pump-medium rotate: false - xy: 1428, 135 + xy: 1665, 213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-mechanical-pump-small rotate: false - xy: 3011, 180 + xy: 3787, 119 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-mechanical-pump-tiny rotate: false - xy: 3229, 136 + xy: 3959, 295 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -14872,28 +16748,28 @@ block-mechanical-pump-xlarge index: -1 block-meltdown-large rotate: false - xy: 2422, 329 + xy: 2936, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-meltdown-medium rotate: false - xy: 1462, 135 + xy: 1699, 211 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-meltdown-small rotate: false - xy: 3037, 180 + xy: 3813, 115 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-meltdown-tiny rotate: false - xy: 3247, 136 + xy: 3977, 295 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -14907,28 +16783,28 @@ block-meltdown-xlarge index: -1 block-melter-large rotate: false - xy: 2464, 329 + xy: 3020, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-melter-medium rotate: false - xy: 1496, 135 + xy: 3421, 211 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-melter-small rotate: false - xy: 3063, 180 + xy: 3839, 115 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-melter-tiny rotate: false - xy: 3265, 136 + xy: 3959, 277 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -14942,28 +16818,28 @@ block-melter-xlarge index: -1 block-memory-bank-large rotate: false - xy: 2506, 329 + xy: 2978, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-memory-bank-medium rotate: false - xy: 1530, 135 + xy: 3455, 211 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-memory-bank-small rotate: false - xy: 3089, 180 + xy: 3865, 115 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-memory-bank-tiny rotate: false - xy: 3283, 136 + xy: 3977, 277 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -14977,28 +16853,28 @@ block-memory-bank-xlarge index: -1 block-memory-cell-large rotate: false - xy: 2548, 329 + xy: 3062, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-memory-cell-medium rotate: false - xy: 1564, 135 + xy: 3421, 177 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-memory-cell-small rotate: false - xy: 3115, 180 + xy: 3891, 115 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-memory-cell-tiny rotate: false - xy: 3301, 136 + xy: 2471, 71 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -15012,28 +16888,28 @@ block-memory-cell-xlarge index: -1 block-mend-projector-large rotate: false - xy: 2590, 329 + xy: 3020, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-mend-projector-medium rotate: false - xy: 1598, 135 + xy: 3455, 177 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-mend-projector-small rotate: false - xy: 3141, 180 + xy: 3917, 115 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-mend-projector-tiny rotate: false - xy: 3319, 136 + xy: 2471, 53 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -15047,28 +16923,28 @@ block-mend-projector-xlarge index: -1 block-mender-large rotate: false - xy: 2632, 329 + xy: 3104, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-mender-medium rotate: false - xy: 1632, 135 + xy: 2555, 220 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-mender-small rotate: false - xy: 3167, 180 + xy: 3943, 115 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-mender-tiny rotate: false - xy: 3337, 136 + xy: 2471, 35 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -15082,28 +16958,28 @@ block-mender-xlarge index: -1 block-message-large rotate: false - xy: 2674, 329 + xy: 3062, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-message-medium rotate: false - xy: 1666, 135 + xy: 2589, 203 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-message-small rotate: false - xy: 3193, 180 + xy: 3969, 115 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-message-tiny rotate: false - xy: 3355, 136 + xy: 2471, 17 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -15117,28 +16993,28 @@ block-message-xlarge index: -1 block-metal-floor-2-large rotate: false - xy: 2716, 329 + xy: 3146, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-metal-floor-2-medium rotate: false - xy: 1700, 135 + xy: 2471, 219 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-metal-floor-2-small rotate: false - xy: 3219, 180 + xy: 3995, 115 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-metal-floor-2-tiny rotate: false - xy: 3373, 136 + xy: 2548, 114 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -15152,28 +17028,28 @@ block-metal-floor-2-xlarge index: -1 block-metal-floor-3-large rotate: false - xy: 2758, 329 + xy: 3104, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-metal-floor-3-medium rotate: false - xy: 1734, 135 + xy: 2505, 211 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-metal-floor-3-small rotate: false - xy: 3245, 180 + xy: 4021, 115 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-metal-floor-3-tiny rotate: false - xy: 2630, 121 + xy: 2566, 115 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -15187,28 +17063,28 @@ block-metal-floor-3-xlarge index: -1 block-metal-floor-5-large rotate: false - xy: 2800, 329 + xy: 3188, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-metal-floor-5-medium rotate: false - xy: 1768, 135 + xy: 3552, 211 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-metal-floor-5-small rotate: false - xy: 3271, 180 + xy: 1760, 179 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-metal-floor-5-tiny rotate: false - xy: 2648, 121 + xy: 2584, 115 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -15222,28 +17098,28 @@ block-metal-floor-5-xlarge index: -1 block-metal-floor-damaged-large rotate: false - xy: 2842, 329 + xy: 3146, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-metal-floor-damaged-medium rotate: false - xy: 1802, 135 + xy: 3587, 219 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-metal-floor-damaged-small rotate: false - xy: 3297, 180 + xy: 1760, 153 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-metal-floor-damaged-tiny rotate: false - xy: 2666, 121 + xy: 2602, 115 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -15257,28 +17133,28 @@ block-metal-floor-damaged-xlarge index: -1 block-metal-floor-large rotate: false - xy: 2884, 329 + xy: 3230, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-metal-floor-medium rotate: false - xy: 1836, 135 + xy: 3621, 219 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-metal-floor-small rotate: false - xy: 3323, 180 + xy: 1760, 127 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-metal-floor-tiny rotate: false - xy: 2684, 121 + xy: 2620, 115 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -15292,28 +17168,28 @@ block-metal-floor-xlarge index: -1 block-micro-processor-large rotate: false - xy: 2926, 329 + xy: 3188, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-micro-processor-medium rotate: false - xy: 1870, 135 + xy: 3655, 219 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-micro-processor-small rotate: false - xy: 3349, 180 + xy: 1786, 185 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-micro-processor-tiny rotate: false - xy: 2702, 121 + xy: 2566, 97 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -15327,28 +17203,28 @@ block-micro-processor-xlarge index: -1 block-moss-large rotate: false - xy: 2968, 329 + xy: 3272, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-moss-medium rotate: false - xy: 1904, 135 + xy: 3689, 217 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-moss-small rotate: false - xy: 3375, 180 + xy: 1786, 159 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-moss-tiny rotate: false - xy: 2630, 103 + xy: 2584, 97 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -15362,28 +17238,28 @@ block-moss-xlarge index: -1 block-mud-large rotate: false - xy: 3010, 329 + xy: 3230, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-mud-medium rotate: false - xy: 1938, 135 + xy: 3723, 205 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-mud-small rotate: false - xy: 3401, 193 + xy: 1812, 185 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-mud-tiny rotate: false - xy: 2648, 103 + xy: 2602, 97 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -15397,28 +17273,28 @@ block-mud-xlarge index: -1 block-multi-press-large rotate: false - xy: 3052, 329 + xy: 3314, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-multi-press-medium rotate: false - xy: 1972, 135 + xy: 3757, 205 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-multi-press-small rotate: false - xy: 3427, 193 + xy: 1812, 159 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-multi-press-tiny rotate: false - xy: 2666, 103 + xy: 2620, 97 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -15432,28 +17308,28 @@ block-multi-press-xlarge index: -1 block-multiplicative-reconstructor-large rotate: false - xy: 3094, 329 + xy: 3272, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-multiplicative-reconstructor-medium rotate: false - xy: 2006, 135 + xy: 993, 211 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-multiplicative-reconstructor-small rotate: false - xy: 3401, 167 + xy: 1786, 133 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-multiplicative-reconstructor-tiny rotate: false - xy: 2684, 103 + xy: 2627, 172 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -15467,28 +17343,28 @@ block-multiplicative-reconstructor-xlarge index: -1 block-naval-factory-large rotate: false - xy: 3136, 329 + xy: 3356, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-naval-factory-medium rotate: false - xy: 2040, 135 + xy: 1027, 211 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-naval-factory-small rotate: false - xy: 3427, 167 + xy: 1838, 185 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-naval-factory-tiny rotate: false - xy: 2702, 103 + xy: 2627, 154 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -15502,28 +17378,28 @@ block-naval-factory-xlarge index: -1 block-oil-extractor-large rotate: false - xy: 3178, 329 + xy: 3314, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-oil-extractor-medium rotate: false - xy: 2074, 135 + xy: 1061, 211 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-oil-extractor-small rotate: false - xy: 2142, 83 + xy: 1838, 159 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-oil-extractor-tiny rotate: false - xy: 2720, 118 + xy: 2638, 136 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -15537,28 +17413,28 @@ block-oil-extractor-xlarge index: -1 block-ore-coal-large rotate: false - xy: 3220, 329 + xy: 3398, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-ore-coal-medium rotate: false - xy: 2108, 137 + xy: 1095, 211 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-coal-small rotate: false - xy: 2168, 83 + xy: 1812, 133 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-ore-coal-tiny rotate: false - xy: 2738, 118 + xy: 2638, 118 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -15572,28 +17448,28 @@ block-ore-coal-xlarge index: -1 block-ore-copper-large rotate: false - xy: 3262, 329 + xy: 3356, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-ore-copper-medium rotate: false - xy: 2142, 143 + xy: 1129, 211 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-copper-small rotate: false - xy: 2194, 86 + xy: 1864, 185 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-ore-copper-tiny rotate: false - xy: 2756, 118 + xy: 2638, 100 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -15607,28 +17483,28 @@ block-ore-copper-xlarge index: -1 block-ore-lead-large rotate: false - xy: 3304, 329 + xy: 3440, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-ore-lead-medium rotate: false - xy: 2176, 146 + xy: 1163, 211 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-lead-small rotate: false - xy: 2220, 86 + xy: 1864, 159 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-ore-lead-tiny rotate: false - xy: 2774, 118 + xy: 2638, 82 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -15642,28 +17518,28 @@ block-ore-lead-xlarge index: -1 block-ore-scrap-large rotate: false - xy: 3346, 329 + xy: 3398, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-ore-scrap-medium rotate: false - xy: 2196, 180 + xy: 1197, 211 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-scrap-small rotate: false - xy: 2246, 89 + xy: 1838, 133 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-ore-scrap-tiny rotate: false - xy: 2792, 118 + xy: 2480, 96 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -15677,28 +17553,28 @@ block-ore-scrap-xlarge index: -1 block-ore-thorium-large rotate: false - xy: 3388, 329 + xy: 3482, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-ore-thorium-medium rotate: false - xy: 2230, 183 + xy: 1231, 211 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-thorium-small rotate: false - xy: 2152, 57 + xy: 1890, 185 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-ore-thorium-tiny rotate: false - xy: 2810, 118 + xy: 2489, 78 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -15712,28 +17588,28 @@ block-ore-thorium-xlarge index: -1 block-ore-titanium-large rotate: false - xy: 3430, 329 + xy: 3440, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-ore-titanium-medium rotate: false - xy: 2210, 146 + xy: 1265, 211 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-titanium-small rotate: false - xy: 2152, 31 + xy: 1890, 159 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-ore-titanium-tiny rotate: false - xy: 2828, 118 + xy: 2489, 60 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -15747,28 +17623,28 @@ block-ore-titanium-xlarge index: -1 block-overdrive-dome-large rotate: false - xy: 3472, 329 + xy: 3524, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-overdrive-dome-medium rotate: false - xy: 2244, 149 + xy: 1299, 211 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-overdrive-dome-small rotate: false - xy: 2149, 5 + xy: 1864, 133 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-overdrive-dome-tiny rotate: false - xy: 2846, 118 + xy: 2489, 42 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -15782,28 +17658,28 @@ block-overdrive-dome-xlarge index: -1 block-overdrive-projector-large rotate: false - xy: 3514, 329 + xy: 3482, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-overdrive-projector-medium rotate: false - xy: 2573, 245 + xy: 1333, 211 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-overdrive-projector-small rotate: false - xy: 2178, 57 + xy: 1916, 185 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-overdrive-projector-tiny rotate: false - xy: 2864, 118 + xy: 2489, 24 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -15817,28 +17693,28 @@ block-overdrive-projector-xlarge index: -1 block-overflow-gate-large rotate: false - xy: 3556, 329 + xy: 3566, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-overflow-gate-medium rotate: false - xy: 2725, 232 + xy: 1367, 211 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-overflow-gate-small rotate: false - xy: 2178, 31 + xy: 1916, 159 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-overflow-gate-tiny rotate: false - xy: 2882, 118 + xy: 2498, 96 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -15852,28 +17728,28 @@ block-overflow-gate-xlarge index: -1 block-parallax-large rotate: false - xy: 3598, 329 + xy: 3524, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-parallax-medium rotate: false - xy: 2759, 232 + xy: 1401, 211 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-parallax-small rotate: false - xy: 2175, 5 + xy: 1890, 133 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-parallax-tiny rotate: false - xy: 2900, 118 + xy: 2507, 78 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -15887,28 +17763,28 @@ block-parallax-xlarge index: -1 block-payload-conveyor-large rotate: false - xy: 3640, 335 + xy: 3608, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-payload-conveyor-medium rotate: false - xy: 2793, 232 + xy: 1435, 211 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-payload-conveyor-small rotate: false - xy: 2204, 60 + xy: 1942, 185 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-payload-conveyor-tiny rotate: false - xy: 2918, 118 + xy: 2507, 60 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -15922,28 +17798,28 @@ block-payload-conveyor-xlarge index: -1 block-payload-router-large rotate: false - xy: 4051, 281 + xy: 3566, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-payload-router-medium rotate: false - xy: 2827, 232 + xy: 1469, 211 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-payload-router-small rotate: false - xy: 2204, 34 + xy: 1942, 159 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-payload-router-tiny rotate: false - xy: 2936, 118 + xy: 2507, 42 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -15957,28 +17833,28 @@ block-payload-router-xlarge index: -1 block-pebbles-large rotate: false - xy: 859, 321 + xy: 3650, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-pebbles-medium rotate: false - xy: 2861, 232 + xy: 1503, 211 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-pebbles-small rotate: false - xy: 2230, 60 + xy: 1916, 133 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-pebbles-tiny rotate: false - xy: 2954, 118 + xy: 2507, 24 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -15992,28 +17868,28 @@ block-pebbles-xlarge index: -1 block-phase-conduit-large rotate: false - xy: 901, 321 + xy: 3608, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-phase-conduit-medium rotate: false - xy: 2895, 232 + xy: 1537, 211 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-phase-conduit-small rotate: false - xy: 2230, 34 + xy: 1942, 133 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-phase-conduit-tiny rotate: false - xy: 2972, 118 + xy: 2516, 96 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -16027,28 +17903,28 @@ block-phase-conduit-xlarge index: -1 block-phase-conveyor-large rotate: false - xy: 859, 279 + xy: 3650, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-phase-conveyor-medium rotate: false - xy: 2929, 232 + xy: 1571, 211 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-phase-conveyor-small rotate: false - xy: 2256, 63 + xy: 1968, 159 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-phase-conveyor-tiny rotate: false - xy: 2990, 118 + xy: 2525, 78 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -16062,35 +17938,35 @@ block-phase-conveyor-xlarge index: -1 block-phase-wall-large rotate: false - xy: 943, 321 + xy: 959, 271 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-phase-wall-large-large rotate: false - xy: 859, 237 + xy: 131, 4 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-phase-wall-large-medium rotate: false - xy: 2963, 232 + xy: 1003, 177 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-phase-wall-large-small rotate: false - xy: 2256, 37 + xy: 1968, 133 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-phase-wall-large-tiny rotate: false - xy: 3008, 118 + xy: 2525, 60 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -16104,21 +17980,21 @@ block-phase-wall-large-xlarge index: -1 block-phase-wall-medium rotate: false - xy: 2997, 232 + xy: 1037, 177 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-phase-wall-small rotate: false - xy: 2272, 89 + xy: 1994, 151 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-phase-wall-tiny rotate: false - xy: 3026, 118 + xy: 2525, 42 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -16132,28 +18008,28 @@ block-phase-wall-xlarge index: -1 block-phase-weaver-large rotate: false - xy: 901, 279 + xy: 173, 4 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-phase-weaver-medium rotate: false - xy: 3031, 232 + xy: 1071, 177 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-phase-weaver-small rotate: false - xy: 2282, 63 + xy: 2020, 151 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-phase-weaver-tiny rotate: false - xy: 3044, 118 + xy: 2525, 24 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -16167,28 +18043,28 @@ block-phase-weaver-xlarge index: -1 block-pine-large rotate: false - xy: 985, 321 + xy: 215, 4 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-pine-medium rotate: false - xy: 3065, 232 + xy: 1105, 177 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-pine-small rotate: false - xy: 2282, 37 + xy: 2046, 151 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-pine-tiny rotate: false - xy: 3062, 118 + xy: 2534, 96 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -16202,28 +18078,28 @@ block-pine-xlarge index: -1 block-plastanium-compressor-large rotate: false - xy: 859, 195 + xy: 3692, 335 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-plastanium-compressor-medium rotate: false - xy: 3099, 232 + xy: 1139, 177 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-plastanium-compressor-small rotate: false - xy: 3677, 173 + xy: 2072, 151 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-plastanium-compressor-tiny rotate: false - xy: 3080, 118 + xy: 2543, 78 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -16237,28 +18113,28 @@ block-plastanium-compressor-xlarge index: -1 block-plastanium-conveyor-large rotate: false - xy: 901, 237 + xy: 909, 231 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-plastanium-conveyor-medium rotate: false - xy: 3133, 232 + xy: 1173, 177 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-plastanium-conveyor-small rotate: false - xy: 3703, 166 + xy: 2098, 151 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-plastanium-conveyor-tiny rotate: false - xy: 3098, 118 + xy: 2543, 60 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -16272,35 +18148,35 @@ block-plastanium-conveyor-xlarge index: -1 block-plastanium-wall-large rotate: false - xy: 943, 279 + xy: 951, 229 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-plastanium-wall-large-large rotate: false - xy: 1027, 321 + xy: 902, 189 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-plastanium-wall-large-medium rotate: false - xy: 3167, 232 + xy: 1207, 177 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-plastanium-wall-large-small rotate: false - xy: 3729, 166 + xy: 2124, 151 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-plastanium-wall-large-tiny rotate: false - xy: 3116, 118 + xy: 2543, 42 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -16314,21 +18190,21 @@ block-plastanium-wall-large-xlarge index: -1 block-plastanium-wall-medium rotate: false - xy: 3201, 232 + xy: 1241, 177 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-plastanium-wall-small rotate: false - xy: 3737, 192 + xy: 2150, 151 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-plastanium-wall-tiny rotate: false - xy: 3134, 118 + xy: 2543, 24 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -16342,28 +18218,28 @@ block-plastanium-wall-xlarge index: -1 block-plated-conduit-large rotate: false - xy: 901, 195 + xy: 944, 187 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-plated-conduit-medium rotate: false - xy: 3235, 232 + xy: 1275, 177 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-plated-conduit-small rotate: false - xy: 3755, 166 + xy: 2176, 151 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-plated-conduit-tiny rotate: false - xy: 3152, 118 + xy: 2561, 79 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -16377,28 +18253,28 @@ block-plated-conduit-xlarge index: -1 block-pneumatic-drill-large rotate: false - xy: 943, 237 + xy: 1004, 287 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-pneumatic-drill-medium rotate: false - xy: 3269, 232 + xy: 1309, 177 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-pneumatic-drill-small rotate: false - xy: 3728, 313 + xy: 2202, 151 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-pneumatic-drill-tiny rotate: false - xy: 3170, 118 + xy: 2561, 61 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -16412,35 +18288,35 @@ block-pneumatic-drill-xlarge index: -1 block-power-node-large rotate: false - xy: 985, 279 + xy: 1046, 287 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-power-node-large-large rotate: false - xy: 943, 195 + xy: 1088, 287 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-power-node-large-medium rotate: false - xy: 3303, 232 + xy: 1343, 177 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-power-node-large-small rotate: false - xy: 3711, 287 + xy: 2228, 151 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-power-node-large-tiny rotate: false - xy: 3188, 118 + xy: 2579, 79 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -16454,21 +18330,21 @@ block-power-node-large-xlarge index: -1 block-power-node-medium rotate: false - xy: 3337, 232 + xy: 1377, 177 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-power-node-small rotate: false - xy: 3737, 287 + xy: 2254, 151 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-power-node-tiny rotate: false - xy: 3206, 118 + xy: 2561, 43 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -16482,28 +18358,28 @@ block-power-node-xlarge index: -1 block-power-source-large rotate: false - xy: 985, 237 + xy: 1130, 287 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-power-source-medium rotate: false - xy: 3371, 232 + xy: 1411, 177 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-power-source-small rotate: false - xy: 3740, 261 + xy: 2280, 151 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-power-source-tiny rotate: false - xy: 3224, 118 + xy: 2579, 61 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -16517,28 +18393,28 @@ block-power-source-xlarge index: -1 block-power-void-large rotate: false - xy: 1027, 279 + xy: 1172, 287 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-power-void-medium rotate: false - xy: 3405, 253 + xy: 1445, 177 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-power-void-small rotate: false - xy: 3740, 235 + xy: 2306, 151 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-power-void-tiny rotate: false - xy: 3242, 118 + xy: 2597, 79 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -16552,28 +18428,28 @@ block-power-void-xlarge index: -1 block-pulse-conduit-large rotate: false - xy: 985, 195 + xy: 1214, 287 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-pulse-conduit-medium rotate: false - xy: 3439, 253 + xy: 1479, 177 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-pulse-conduit-small rotate: false - xy: 2389, 191 + xy: 1994, 125 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-pulse-conduit-tiny rotate: false - xy: 3260, 118 + xy: 2561, 25 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -16587,28 +18463,28 @@ block-pulse-conduit-xlarge index: -1 block-pulverizer-large rotate: false - xy: 1027, 237 + xy: 1256, 287 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-pulverizer-medium rotate: false - xy: 3473, 261 + xy: 1513, 177 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-pulverizer-small rotate: false - xy: 2415, 191 + xy: 2020, 125 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-pulverizer-tiny rotate: false - xy: 3278, 118 + xy: 2579, 43 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -16622,28 +18498,28 @@ block-pulverizer-xlarge index: -1 block-pyratite-mixer-large rotate: false - xy: 1027, 195 + xy: 1298, 287 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-pyratite-mixer-medium rotate: false - xy: 3507, 261 + xy: 1547, 177 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-pyratite-mixer-small rotate: false - xy: 2441, 193 + xy: 2046, 125 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-pyratite-mixer-tiny rotate: false - xy: 3296, 118 + xy: 2597, 61 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -16657,28 +18533,28 @@ block-pyratite-mixer-xlarge index: -1 block-repair-point-large rotate: false - xy: 1069, 287 + xy: 1340, 287 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-repair-point-medium rotate: false - xy: 3541, 261 + xy: 1581, 177 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-repair-point-small rotate: false - xy: 3453, 167 + xy: 2072, 125 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-repair-point-tiny rotate: false - xy: 3314, 118 + xy: 2615, 79 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -16692,28 +18568,28 @@ block-repair-point-xlarge index: -1 block-resupply-point-large rotate: false - xy: 1111, 287 + xy: 1382, 287 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-resupply-point-medium rotate: false - xy: 3575, 261 + xy: 1017, 143 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-resupply-point-small rotate: false - xy: 3479, 167 + xy: 2098, 125 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-resupply-point-tiny rotate: false - xy: 3332, 118 + xy: 2579, 25 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -16727,28 +18603,28 @@ block-resupply-point-xlarge index: -1 block-ripple-large rotate: false - xy: 1069, 245 + xy: 1424, 287 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-ripple-medium rotate: false - xy: 3609, 261 + xy: 1017, 109 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ripple-small rotate: false - xy: 3505, 167 + xy: 2124, 125 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-ripple-tiny rotate: false - xy: 3350, 118 + xy: 2597, 43 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -16762,28 +18638,28 @@ block-ripple-xlarge index: -1 block-rotary-pump-large rotate: false - xy: 1153, 287 + xy: 1466, 287 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-rotary-pump-medium rotate: false - xy: 3405, 219 + xy: 1051, 143 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-rotary-pump-small rotate: false - xy: 3531, 167 + xy: 2150, 125 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-rotary-pump-tiny rotate: false - xy: 3368, 118 + xy: 2615, 61 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -16797,28 +18673,28 @@ block-rotary-pump-xlarge index: -1 block-router-large rotate: false - xy: 1069, 203 + xy: 1508, 287 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-router-medium rotate: false - xy: 3439, 219 + xy: 1017, 75 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-router-small rotate: false - xy: 3557, 167 + xy: 2176, 125 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-router-tiny rotate: false - xy: 2720, 100 + xy: 2597, 25 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -16832,28 +18708,28 @@ block-router-xlarge index: -1 block-rtg-generator-large rotate: false - xy: 1111, 245 + xy: 1550, 287 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-rtg-generator-medium rotate: false - xy: 3473, 227 + xy: 1051, 109 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-rtg-generator-small rotate: false - xy: 3583, 167 + xy: 2202, 125 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-rtg-generator-tiny rotate: false - xy: 2738, 100 + xy: 2615, 43 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -16867,56 +18743,56 @@ block-rtg-generator-xlarge index: -1 block-salt-large rotate: false - xy: 1195, 287 + xy: 1592, 287 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-salt-medium rotate: false - xy: 3507, 227 + xy: 1085, 143 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-salt-small rotate: false - xy: 3609, 167 + xy: 2228, 125 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-salt-tiny rotate: false - xy: 2756, 100 + xy: 2615, 25 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-salt-wall-large rotate: false - xy: 1111, 203 + xy: 1634, 287 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-salt-wall-medium rotate: false - xy: 3541, 227 + xy: 1017, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-salt-wall-small rotate: false - xy: 3635, 167 + xy: 2254, 125 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-salt-wall-tiny rotate: false - xy: 2774, 100 + xy: 2633, 64 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -16937,28 +18813,28 @@ block-salt-xlarge index: -1 block-salvo-large rotate: false - xy: 1153, 245 + xy: 1676, 287 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-salvo-medium rotate: false - xy: 3575, 227 + xy: 1051, 75 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-salvo-small rotate: false - xy: 1733, 12 + xy: 2280, 125 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-salvo-tiny rotate: false - xy: 2792, 100 + xy: 2633, 46 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -16972,28 +18848,28 @@ block-salvo-xlarge index: -1 block-sand-boulder-large rotate: false - xy: 1237, 287 + xy: 1718, 287 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-sand-boulder-medium rotate: false - xy: 3609, 227 + xy: 1085, 109 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-sand-boulder-small rotate: false - xy: 1759, 7 + xy: 2306, 125 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-sand-boulder-tiny rotate: false - xy: 2810, 100 + xy: 2633, 28 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -17007,56 +18883,56 @@ block-sand-boulder-xlarge index: -1 block-sand-large rotate: false - xy: 1153, 203 + xy: 1760, 287 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-sand-medium rotate: false - xy: 3634, 295 + xy: 1119, 143 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-sand-small rotate: false - xy: 2725, 154 + xy: 2332, 124 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-sand-tiny rotate: false - xy: 2828, 100 + xy: 2489, 6 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-sand-wall-large rotate: false - xy: 1195, 245 + xy: 1802, 287 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-sand-wall-medium rotate: false - xy: 3643, 261 + xy: 1051, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-sand-wall-small rotate: false - xy: 2751, 154 + xy: 1786, 107 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-sand-wall-tiny rotate: false - xy: 2846, 100 + xy: 2507, 6 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -17070,28 +18946,28 @@ block-sand-wall-xlarge index: -1 block-sand-water-large rotate: false - xy: 1279, 287 + xy: 1844, 287 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-sand-water-medium rotate: false - xy: 3643, 227 + xy: 1085, 75 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-sand-water-small rotate: false - xy: 2777, 154 + xy: 1812, 107 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-sand-water-tiny rotate: false - xy: 2864, 100 + xy: 2525, 6 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -17112,28 +18988,28 @@ block-sand-xlarge index: -1 block-scatter-large rotate: false - xy: 1195, 203 + xy: 1886, 287 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-scatter-medium rotate: false - xy: 917, 59 + xy: 1119, 109 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-scatter-small rotate: false - xy: 2803, 154 + xy: 1838, 107 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-scatter-tiny rotate: false - xy: 2882, 100 + xy: 2543, 6 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -17147,28 +19023,28 @@ block-scatter-xlarge index: -1 block-scorch-large rotate: false - xy: 1237, 245 + xy: 1928, 287 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-scorch-medium rotate: false - xy: 951, 59 + xy: 1153, 143 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-scorch-small rotate: false - xy: 2829, 154 + xy: 1864, 107 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-scorch-tiny rotate: false - xy: 2900, 100 + xy: 2561, 7 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -17182,28 +19058,28 @@ block-scorch-xlarge index: -1 block-scrap-wall-gigantic-large rotate: false - xy: 1321, 287 + xy: 1970, 287 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-scrap-wall-gigantic-medium rotate: false - xy: 985, 59 + xy: 1085, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-scrap-wall-gigantic-small rotate: false - xy: 2855, 154 + xy: 1890, 107 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-scrap-wall-gigantic-tiny rotate: false - xy: 2918, 100 + xy: 2579, 7 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -17217,28 +19093,28 @@ block-scrap-wall-gigantic-xlarge index: -1 block-scrap-wall-huge-large rotate: false - xy: 1237, 203 + xy: 2012, 287 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-scrap-wall-huge-medium rotate: false - xy: 1019, 59 + xy: 1119, 75 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-scrap-wall-huge-small rotate: false - xy: 2881, 154 + xy: 1916, 107 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-scrap-wall-huge-tiny rotate: false - xy: 2936, 100 + xy: 2597, 7 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -17252,35 +19128,35 @@ block-scrap-wall-huge-xlarge index: -1 block-scrap-wall-large rotate: false - xy: 1279, 245 + xy: 2054, 287 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-scrap-wall-large-large rotate: false - xy: 1363, 287 + xy: 2096, 287 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-scrap-wall-large-medium rotate: false - xy: 1053, 59 + xy: 1153, 109 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-scrap-wall-large-small rotate: false - xy: 2907, 154 + xy: 1942, 107 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-scrap-wall-large-tiny rotate: false - xy: 2954, 100 + xy: 2615, 7 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -17294,21 +19170,21 @@ block-scrap-wall-large-xlarge index: -1 block-scrap-wall-medium rotate: false - xy: 949, 25 + xy: 1187, 143 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-scrap-wall-small rotate: false - xy: 2933, 154 + xy: 1968, 107 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-scrap-wall-tiny rotate: false - xy: 2972, 100 + xy: 2633, 10 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -17322,28 +19198,28 @@ block-scrap-wall-xlarge index: -1 block-segment-large rotate: false - xy: 1279, 203 + xy: 2138, 287 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-segment-medium rotate: false - xy: 983, 25 + xy: 1119, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-segment-small rotate: false - xy: 2959, 154 + xy: 1783, 81 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-segment-tiny rotate: false - xy: 2990, 100 + xy: 2651, 64 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -17357,28 +19233,28 @@ block-segment-xlarge index: -1 block-separator-large rotate: false - xy: 1321, 245 + xy: 2180, 287 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-separator-medium rotate: false - xy: 1017, 25 + xy: 1153, 75 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-separator-small rotate: false - xy: 2985, 154 + xy: 1783, 55 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-separator-tiny rotate: false - xy: 3008, 100 + xy: 2651, 46 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -17392,28 +19268,28 @@ block-separator-xlarge index: -1 block-shale-boulder-large rotate: false - xy: 1405, 287 + xy: 2222, 287 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-shale-boulder-medium rotate: false - xy: 1051, 25 + xy: 1187, 109 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-shale-boulder-small rotate: false - xy: 3011, 154 + xy: 1809, 81 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-shale-boulder-tiny rotate: false - xy: 3026, 100 + xy: 2651, 28 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -17427,56 +19303,56 @@ block-shale-boulder-xlarge index: -1 block-shale-large rotate: false - xy: 1321, 203 + xy: 2264, 287 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-shale-medium rotate: false - xy: 1088, 101 + xy: 1221, 143 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-shale-small rotate: false - xy: 3037, 154 + xy: 1809, 55 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-shale-tiny rotate: false - xy: 3044, 100 + xy: 2651, 10 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-shale-wall-large rotate: false - xy: 1363, 245 + xy: 2306, 287 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-shale-wall-medium rotate: false - xy: 1122, 101 + xy: 1153, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-shale-wall-small rotate: false - xy: 3063, 154 + xy: 1835, 81 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-shale-wall-tiny rotate: false - xy: 3062, 100 + xy: 2645, 201 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -17497,28 +19373,28 @@ block-shale-xlarge index: -1 block-shock-mine-large rotate: false - xy: 1447, 287 + xy: 2348, 287 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-shock-mine-medium rotate: false - xy: 1156, 101 + xy: 1187, 75 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-shock-mine-small rotate: false - xy: 3089, 154 + xy: 1835, 55 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-shock-mine-tiny rotate: false - xy: 3080, 100 + xy: 2627, 201 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -17532,28 +19408,28 @@ block-shock-mine-xlarge index: -1 block-shrubs-large rotate: false - xy: 1363, 203 + xy: 2390, 287 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-shrubs-medium rotate: false - xy: 1190, 101 + xy: 1221, 109 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-shrubs-small rotate: false - xy: 3115, 154 + xy: 1861, 81 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-shrubs-tiny rotate: false - xy: 3098, 100 + xy: 2645, 183 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -17567,28 +19443,28 @@ block-shrubs-xlarge index: -1 block-silicon-crucible-large rotate: false - xy: 1405, 245 + xy: 2432, 287 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-silicon-crucible-medium rotate: false - xy: 1224, 101 + xy: 1255, 143 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-silicon-crucible-small rotate: false - xy: 3141, 154 + xy: 1861, 55 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-silicon-crucible-tiny rotate: false - xy: 3116, 100 + xy: 2645, 165 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -17602,28 +19478,28 @@ block-silicon-crucible-xlarge index: -1 block-silicon-smelter-large rotate: false - xy: 1489, 287 + xy: 2474, 287 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-silicon-smelter-medium rotate: false - xy: 1258, 101 + xy: 1187, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-silicon-smelter-small rotate: false - xy: 3167, 154 + xy: 1887, 81 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-silicon-smelter-tiny rotate: false - xy: 3134, 100 + xy: 2663, 193 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -17637,28 +19513,28 @@ block-silicon-smelter-xlarge index: -1 block-slag-large rotate: false - xy: 1405, 203 + xy: 2516, 287 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-slag-medium rotate: false - xy: 1292, 101 + xy: 1221, 75 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-slag-small rotate: false - xy: 3193, 154 + xy: 1887, 55 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-slag-tiny rotate: false - xy: 3152, 100 + xy: 2681, 193 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -17672,28 +19548,28 @@ block-slag-xlarge index: -1 block-snow-boulder-large rotate: false - xy: 1447, 245 + xy: 2558, 287 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-snow-boulder-medium rotate: false - xy: 1326, 101 + xy: 1255, 109 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-snow-boulder-small rotate: false - xy: 3219, 154 + xy: 1913, 81 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-snow-boulder-tiny rotate: false - xy: 3170, 100 + xy: 2663, 175 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -17707,42 +19583,42 @@ block-snow-boulder-xlarge index: -1 block-snow-large rotate: false - xy: 1531, 287 + xy: 2600, 287 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-snow-medium rotate: false - xy: 1360, 101 + xy: 1289, 143 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-snow-pine-large rotate: false - xy: 1447, 203 + xy: 2642, 287 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-snow-pine-medium rotate: false - xy: 1394, 101 + xy: 1221, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-snow-pine-small rotate: false - xy: 3245, 154 + xy: 1913, 55 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-snow-pine-tiny rotate: false - xy: 3188, 100 + xy: 2699, 193 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -17756,42 +19632,42 @@ block-snow-pine-xlarge index: -1 block-snow-small rotate: false - xy: 3271, 154 + xy: 1939, 81 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-snow-tiny rotate: false - xy: 3206, 100 + xy: 2681, 175 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-snow-wall-large rotate: false - xy: 1489, 245 + xy: 2684, 287 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-snow-wall-medium rotate: false - xy: 1428, 101 + xy: 1255, 75 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-snow-wall-small rotate: false - xy: 3297, 154 + xy: 1939, 55 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-snow-wall-tiny rotate: false - xy: 3224, 100 + xy: 2717, 193 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -17812,35 +19688,35 @@ block-snow-xlarge index: -1 block-solar-panel-large rotate: false - xy: 1573, 287 + xy: 2726, 287 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-solar-panel-large-large rotate: false - xy: 1489, 203 + xy: 2768, 287 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-solar-panel-large-medium rotate: false - xy: 1462, 101 + xy: 1289, 109 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-solar-panel-large-small rotate: false - xy: 3323, 154 + xy: 1965, 81 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-solar-panel-large-tiny rotate: false - xy: 3242, 100 + xy: 2699, 175 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -17854,21 +19730,21 @@ block-solar-panel-large-xlarge index: -1 block-solar-panel-medium rotate: false - xy: 1496, 101 + xy: 1323, 143 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-solar-panel-small rotate: false - xy: 3349, 154 + xy: 1965, 55 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-solar-panel-tiny rotate: false - xy: 3260, 100 + xy: 2717, 175 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -17882,28 +19758,28 @@ block-solar-panel-xlarge index: -1 block-sorter-large rotate: false - xy: 1531, 245 + xy: 2810, 287 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-sorter-medium rotate: false - xy: 1530, 101 + xy: 1255, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-sorter-small rotate: false - xy: 3375, 154 + xy: 1994, 99 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-sorter-tiny rotate: false - xy: 3278, 100 + xy: 2663, 157 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -17915,1304 +19791,1339 @@ block-sorter-xlarge orig: 48, 48 offset: 0, 0 index: -1 -block-spawn-large +block-space-large rotate: false - xy: 1615, 287 + xy: 2852, 287 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-spawn-medium +block-space-medium rotate: false - xy: 1564, 101 + xy: 1289, 75 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-spawn-small +block-space-small rotate: false - xy: 3401, 141 + xy: 2020, 99 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-spawn-tiny +block-space-tiny rotate: false - xy: 3296, 100 + xy: 2681, 157 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-spawn-xlarge +block-space-xlarge rotate: false xy: 1709, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-spectre-large +block-spawn-large rotate: false - xy: 1531, 203 + xy: 2894, 287 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-spectre-medium +block-spawn-medium rotate: false - xy: 1598, 101 + xy: 1323, 109 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-spectre-small +block-spawn-small rotate: false - xy: 3427, 141 + xy: 2046, 99 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-spectre-tiny +block-spawn-tiny rotate: false - xy: 3314, 100 + xy: 2699, 157 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-spectre-xlarge +block-spawn-xlarge rotate: false xy: 1759, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-spore-cluster-large +block-spectre-large rotate: false - xy: 1573, 245 + xy: 2936, 287 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-spore-cluster-medium +block-spectre-medium rotate: false - xy: 1632, 101 + xy: 1357, 143 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-spore-cluster-small +block-spectre-small rotate: false - xy: 3453, 141 + xy: 2072, 99 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-spore-cluster-tiny +block-spectre-tiny rotate: false - xy: 3332, 100 + xy: 2717, 157 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-spore-cluster-xlarge +block-spectre-xlarge rotate: false xy: 1809, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-spore-moss-large +block-spore-cluster-large rotate: false - xy: 1657, 287 + xy: 2978, 287 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-spore-moss-medium +block-spore-cluster-medium rotate: false - xy: 1666, 101 + xy: 1289, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-spore-moss-small +block-spore-cluster-small rotate: false - xy: 3479, 141 + xy: 2098, 99 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-spore-moss-tiny +block-spore-cluster-tiny rotate: false - xy: 3350, 100 + xy: 2735, 172 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-spore-moss-xlarge +block-spore-cluster-xlarge rotate: false xy: 1859, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-spore-pine-large +block-spore-moss-large rotate: false - xy: 1573, 203 + xy: 3020, 287 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-spore-pine-medium +block-spore-moss-medium rotate: false - xy: 1700, 101 + xy: 1323, 75 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-spore-pine-small +block-spore-moss-small rotate: false - xy: 3505, 141 + xy: 2124, 99 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-spore-pine-tiny +block-spore-moss-tiny rotate: false - xy: 3368, 100 + xy: 2753, 172 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-spore-pine-xlarge +block-spore-moss-xlarge rotate: false xy: 1909, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-spore-press-large +block-spore-pine-large rotate: false - xy: 1615, 245 + xy: 3062, 287 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-spore-press-medium +block-spore-pine-medium rotate: false - xy: 1734, 101 + xy: 1357, 109 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-spore-press-small +block-spore-pine-small rotate: false - xy: 3531, 141 + xy: 2150, 99 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-spore-press-tiny +block-spore-pine-tiny rotate: false - xy: 2630, 85 + xy: 2771, 172 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-spore-press-xlarge +block-spore-pine-xlarge rotate: false xy: 1959, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-spore-wall-large +block-spore-press-large rotate: false - xy: 1699, 287 + xy: 3104, 287 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-spore-wall-medium +block-spore-press-medium rotate: false - xy: 1768, 101 + xy: 1391, 143 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-spore-wall-small +block-spore-press-small rotate: false - xy: 3557, 141 + xy: 2176, 99 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-spore-wall-tiny +block-spore-press-tiny rotate: false - xy: 2630, 67 + xy: 2789, 172 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-spore-wall-xlarge +block-spore-press-xlarge rotate: false xy: 2009, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-steam-generator-large +block-spore-wall-large rotate: false - xy: 1615, 203 + xy: 3146, 287 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-steam-generator-medium +block-spore-wall-medium rotate: false - xy: 1802, 101 + xy: 1323, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-steam-generator-small +block-spore-wall-small rotate: false - xy: 3583, 141 + xy: 2202, 99 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-steam-generator-tiny +block-spore-wall-tiny rotate: false - xy: 2648, 85 + xy: 2807, 172 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-steam-generator-xlarge +block-spore-wall-xlarge rotate: false xy: 2059, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-stone-large +block-steam-generator-large rotate: false - xy: 1657, 245 + xy: 3188, 287 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-stone-medium +block-steam-generator-medium rotate: false - xy: 1836, 101 + xy: 1357, 75 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-stone-small +block-steam-generator-small rotate: false - xy: 3609, 141 + xy: 2228, 99 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-stone-tiny +block-steam-generator-tiny rotate: false - xy: 2630, 49 + xy: 2825, 172 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-stone-wall-large - rotate: false - xy: 1741, 287 - size: 40, 40 - orig: 40, 40 - offset: 0, 0 - index: -1 -block-stone-wall-medium - rotate: false - xy: 1870, 101 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -block-stone-wall-small - rotate: false - xy: 3635, 141 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -block-stone-wall-tiny - rotate: false - xy: 2648, 67 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -block-stone-wall-xlarge +block-steam-generator-xlarge rotate: false xy: 2109, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-stone-xlarge +block-stone-large + rotate: false + xy: 3230, 287 + size: 40, 40 + orig: 40, 40 + offset: 0, 0 + index: -1 +block-stone-medium + rotate: false + xy: 1391, 109 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +block-stone-small + rotate: false + xy: 2254, 99 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +block-stone-tiny + rotate: false + xy: 2843, 172 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +block-stone-wall-large + rotate: false + xy: 3272, 287 + size: 40, 40 + orig: 40, 40 + offset: 0, 0 + index: -1 +block-stone-wall-medium + rotate: false + xy: 1425, 143 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +block-stone-wall-small + rotate: false + xy: 2280, 99 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +block-stone-wall-tiny + rotate: false + xy: 2861, 172 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +block-stone-wall-xlarge rotate: false xy: 2159, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-surge-tower-large - rotate: false - xy: 1657, 203 - size: 40, 40 - orig: 40, 40 - offset: 0, 0 - index: -1 -block-surge-tower-medium - rotate: false - xy: 1904, 101 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -block-surge-tower-small - rotate: false - xy: 2278, 115 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -block-surge-tower-tiny - rotate: false - xy: 2666, 85 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -block-surge-tower-xlarge +block-stone-xlarge rotate: false xy: 2209, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-surge-wall-large +block-surge-tower-large rotate: false - xy: 1699, 245 + xy: 3314, 287 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-surge-wall-large-large +block-surge-tower-medium rotate: false - xy: 1783, 287 - size: 40, 40 - orig: 40, 40 - offset: 0, 0 - index: -1 -block-surge-wall-large-medium - rotate: false - xy: 1938, 101 + xy: 1357, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-surge-wall-large-small +block-surge-tower-small rotate: false - xy: 2298, 89 + xy: 2306, 99 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-surge-wall-large-tiny +block-surge-tower-tiny rotate: false - xy: 2630, 31 + xy: 2879, 172 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-surge-wall-large-xlarge +block-surge-tower-xlarge rotate: false xy: 2259, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-surge-wall-medium +block-surge-wall-large rotate: false - xy: 1972, 101 + xy: 3356, 287 + size: 40, 40 + orig: 40, 40 + offset: 0, 0 + index: -1 +block-surge-wall-large-large + rotate: false + xy: 3398, 287 + size: 40, 40 + orig: 40, 40 + offset: 0, 0 + index: -1 +block-surge-wall-large-medium + rotate: false + xy: 1391, 75 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-surge-wall-small +block-surge-wall-large-small rotate: false - xy: 2304, 115 + xy: 2332, 98 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-surge-wall-tiny +block-surge-wall-large-tiny rotate: false - xy: 2648, 49 + xy: 2897, 172 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-surge-wall-xlarge +block-surge-wall-large-xlarge rotate: false xy: 2309, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-swarmer-large +block-surge-wall-medium rotate: false - xy: 1699, 203 - size: 40, 40 - orig: 40, 40 - offset: 0, 0 - index: -1 -block-swarmer-medium - rotate: false - xy: 2006, 101 + xy: 1425, 109 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-swarmer-small +block-surge-wall-small rotate: false - xy: 2308, 63 + xy: 1991, 73 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-swarmer-tiny +block-surge-wall-tiny rotate: false - xy: 2666, 67 + xy: 2915, 172 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-swarmer-xlarge +block-surge-wall-xlarge rotate: false xy: 2359, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-switch-large +block-swarmer-large rotate: false - xy: 1741, 245 + xy: 3440, 287 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-switch-medium +block-swarmer-medium rotate: false - xy: 2040, 101 + xy: 1459, 143 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-switch-small +block-swarmer-small rotate: false - xy: 2308, 37 + xy: 2017, 73 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-switch-tiny +block-swarmer-tiny rotate: false - xy: 2684, 85 + xy: 2933, 172 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-switch-xlarge +block-swarmer-xlarge rotate: false xy: 2409, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-tainted-water-large +block-switch-large rotate: false - xy: 1825, 287 + xy: 3482, 287 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-tainted-water-medium +block-switch-medium rotate: false - xy: 2074, 101 + xy: 1391, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-tainted-water-small +block-switch-small rotate: false - xy: 2324, 89 + xy: 2043, 73 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-tainted-water-tiny +block-switch-tiny rotate: false - xy: 2702, 85 + xy: 2951, 172 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-tainted-water-xlarge +block-switch-xlarge rotate: false xy: 2459, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-tar-large +block-tainted-water-large rotate: false - xy: 1741, 203 + xy: 3524, 287 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-tar-medium +block-tainted-water-medium rotate: false - xy: 2108, 103 + xy: 1425, 75 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-tar-small +block-tainted-water-small rotate: false - xy: 2330, 115 + xy: 2069, 73 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-tar-tiny +block-tainted-water-tiny rotate: false - xy: 2648, 31 + xy: 2969, 172 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-tar-xlarge +block-tainted-water-xlarge rotate: false xy: 2509, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-tendrils-large +block-tar-large rotate: false - xy: 1783, 245 + xy: 3566, 287 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-tendrils-medium +block-tar-medium rotate: false - xy: 2142, 109 + xy: 1459, 109 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-tendrils-small +block-tar-small rotate: false - xy: 2334, 63 + xy: 2095, 73 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-tendrils-tiny +block-tar-tiny rotate: false - xy: 2666, 49 + xy: 2987, 172 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-tendrils-xlarge +block-tar-xlarge rotate: false xy: 2559, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-tetrative-reconstructor-large +block-tendrils-large rotate: false - xy: 1867, 287 + xy: 3608, 287 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-tetrative-reconstructor-medium +block-tendrils-medium rotate: false - xy: 2176, 112 + xy: 1493, 143 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-tetrative-reconstructor-small +block-tendrils-small rotate: false - xy: 2334, 37 + xy: 2121, 73 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-tetrative-reconstructor-tiny +block-tendrils-tiny rotate: false - xy: 2684, 67 + xy: 3005, 172 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-tetrative-reconstructor-xlarge +block-tendrils-xlarge rotate: false xy: 2609, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-thermal-generator-large +block-tetrative-reconstructor-large rotate: false - xy: 1783, 203 + xy: 3650, 287 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-thermal-generator-medium +block-tetrative-reconstructor-medium rotate: false - xy: 2210, 112 + xy: 1425, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-thermal-generator-small +block-tetrative-reconstructor-small rotate: false - xy: 2350, 89 + xy: 2147, 73 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-thermal-generator-tiny +block-tetrative-reconstructor-tiny rotate: false - xy: 2666, 31 + xy: 3023, 172 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-thermal-generator-xlarge +block-tetrative-reconstructor-xlarge rotate: false xy: 2659, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-thermal-pump-large +block-thermal-generator-large rotate: false - xy: 1825, 245 + xy: 3692, 293 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-thermal-pump-medium +block-thermal-generator-medium rotate: false - xy: 2244, 115 + xy: 1459, 75 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-thermal-pump-small +block-thermal-generator-small rotate: false - xy: 2356, 115 + xy: 2173, 73 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-thermal-pump-tiny +block-thermal-generator-tiny rotate: false - xy: 2684, 49 + xy: 3041, 172 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-thermal-pump-xlarge +block-thermal-generator-xlarge rotate: false xy: 2709, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-thorium-reactor-large +block-thermal-pump-large rotate: false - xy: 1909, 287 + xy: 3734, 323 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-thorium-reactor-medium +block-thermal-pump-medium rotate: false - xy: 1087, 67 + xy: 1493, 109 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-thorium-reactor-small +block-thermal-pump-small rotate: false - xy: 2360, 63 + xy: 2199, 73 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-thorium-reactor-tiny +block-thermal-pump-tiny rotate: false - xy: 2702, 67 + xy: 3059, 172 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-thorium-reactor-xlarge +block-thermal-pump-xlarge rotate: false xy: 2759, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-thorium-wall-large +block-thorium-reactor-large rotate: false - xy: 1825, 203 + xy: 3734, 281 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-thorium-wall-large-large +block-thorium-reactor-medium rotate: false - xy: 1867, 245 - size: 40, 40 - orig: 40, 40 - offset: 0, 0 - index: -1 -block-thorium-wall-large-medium - rotate: false - xy: 1121, 67 + xy: 1527, 143 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-thorium-wall-large-small +block-thorium-reactor-small rotate: false - xy: 2360, 37 + xy: 2225, 73 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-thorium-wall-large-tiny +block-thorium-reactor-tiny rotate: false - xy: 2720, 82 + xy: 3077, 172 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-thorium-wall-large-xlarge +block-thorium-reactor-xlarge rotate: false xy: 2809, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-thorium-wall-medium +block-thorium-wall-large rotate: false - xy: 1155, 67 + xy: 3692, 251 + size: 40, 40 + orig: 40, 40 + offset: 0, 0 + index: -1 +block-thorium-wall-large-large + rotate: false + xy: 3734, 239 + size: 40, 40 + orig: 40, 40 + offset: 0, 0 + index: -1 +block-thorium-wall-large-medium + rotate: false + xy: 1459, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-thorium-wall-small +block-thorium-wall-large-small rotate: false - xy: 2376, 89 + xy: 2251, 73 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-thorium-wall-tiny +block-thorium-wall-large-tiny rotate: false - xy: 2684, 31 + xy: 3095, 172 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-thorium-wall-xlarge +block-thorium-wall-large-xlarge rotate: false xy: 2859, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-thruster-large +block-thorium-wall-medium rotate: false - xy: 1951, 287 - size: 40, 40 - orig: 40, 40 - offset: 0, 0 - index: -1 -block-thruster-medium - rotate: false - xy: 1189, 67 + xy: 1493, 75 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-thruster-small +block-thorium-wall-small rotate: false - xy: 2382, 115 + xy: 2277, 73 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-thruster-tiny +block-thorium-wall-tiny rotate: false - xy: 2702, 49 + xy: 3113, 172 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-thruster-xlarge +block-thorium-wall-xlarge rotate: false xy: 2909, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-titanium-conveyor-large +block-thruster-large rotate: false - xy: 1867, 203 + xy: 1001, 245 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-titanium-conveyor-medium +block-thruster-medium rotate: false - xy: 1223, 67 + xy: 1527, 109 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-titanium-conveyor-small +block-thruster-small rotate: false - xy: 2386, 63 + xy: 2303, 73 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-titanium-conveyor-tiny +block-thruster-tiny rotate: false - xy: 2720, 64 + xy: 3131, 172 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-titanium-conveyor-xlarge +block-thruster-xlarge rotate: false xy: 2959, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-titanium-wall-large +block-titanium-conveyor-large rotate: false - xy: 1909, 245 + xy: 1043, 245 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-titanium-wall-large-large +block-titanium-conveyor-medium rotate: false - xy: 1993, 287 - size: 40, 40 - orig: 40, 40 - offset: 0, 0 - index: -1 -block-titanium-wall-large-medium - rotate: false - xy: 1257, 67 + xy: 1561, 143 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-titanium-wall-large-small +block-titanium-conveyor-small rotate: false - xy: 2386, 37 + xy: 2329, 72 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-titanium-wall-large-tiny +block-titanium-conveyor-tiny rotate: false - xy: 2738, 82 + xy: 3149, 172 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-titanium-wall-large-xlarge +block-titanium-conveyor-xlarge rotate: false xy: 3009, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-titanium-wall-medium +block-titanium-wall-large rotate: false - xy: 1291, 67 + xy: 1085, 245 + size: 40, 40 + orig: 40, 40 + offset: 0, 0 + index: -1 +block-titanium-wall-large-large + rotate: false + xy: 1127, 245 + size: 40, 40 + orig: 40, 40 + offset: 0, 0 + index: -1 +block-titanium-wall-large-medium + rotate: false + xy: 1493, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-titanium-wall-small +block-titanium-wall-large-small rotate: false - xy: 2402, 89 + xy: 1991, 47 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-titanium-wall-tiny +block-titanium-wall-large-tiny rotate: false - xy: 2702, 31 + xy: 3167, 172 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-titanium-wall-xlarge +block-titanium-wall-large-xlarge rotate: false xy: 3059, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-tsunami-large +block-titanium-wall-medium rotate: false - xy: 1909, 203 - size: 40, 40 - orig: 40, 40 - offset: 0, 0 - index: -1 -block-tsunami-medium - rotate: false - xy: 1325, 67 + xy: 1527, 75 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-tsunami-small +block-titanium-wall-small rotate: false - xy: 2408, 115 + xy: 2017, 47 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-tsunami-tiny +block-titanium-wall-tiny rotate: false - xy: 2720, 46 + xy: 3185, 172 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-tsunami-xlarge +block-titanium-wall-xlarge rotate: false xy: 3109, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-underflow-gate-large +block-tsunami-large rotate: false - xy: 1951, 245 + xy: 1169, 245 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-underflow-gate-medium +block-tsunami-medium rotate: false - xy: 1359, 67 + xy: 1561, 109 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-underflow-gate-small +block-tsunami-small rotate: false - xy: 2412, 63 + xy: 2043, 47 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-underflow-gate-tiny +block-tsunami-tiny rotate: false - xy: 2738, 64 + xy: 3203, 172 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-underflow-gate-xlarge +block-tsunami-xlarge rotate: false xy: 3159, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-unloader-large +block-underflow-gate-large rotate: false - xy: 2035, 287 + xy: 1211, 245 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-unloader-medium +block-underflow-gate-medium rotate: false - xy: 1393, 67 + xy: 1527, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-unloader-small +block-underflow-gate-small rotate: false - xy: 2412, 37 + xy: 2069, 47 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-unloader-tiny +block-underflow-gate-tiny rotate: false - xy: 2756, 82 + xy: 3221, 172 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-unloader-xlarge +block-underflow-gate-xlarge rotate: false xy: 3209, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-vault-large +block-unloader-large rotate: false - xy: 1951, 203 + xy: 1253, 245 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-vault-medium +block-unloader-medium rotate: false - xy: 1427, 67 + xy: 1561, 75 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-vault-small +block-unloader-small rotate: false - xy: 2428, 89 + xy: 2095, 47 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-vault-tiny +block-unloader-tiny rotate: false - xy: 2738, 46 + xy: 3239, 172 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-vault-xlarge +block-unloader-xlarge rotate: false xy: 3259, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-water-extractor-large +block-vault-large rotate: false - xy: 1993, 245 + xy: 1295, 245 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-water-extractor-medium +block-vault-medium rotate: false - xy: 1461, 67 + xy: 1561, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-water-extractor-small +block-vault-small rotate: false - xy: 2434, 115 + xy: 2121, 47 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-water-extractor-tiny +block-vault-tiny rotate: false - xy: 2756, 64 + xy: 3257, 172 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-water-extractor-xlarge +block-vault-xlarge rotate: false xy: 3309, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-water-large +block-water-extractor-large rotate: false - xy: 2077, 287 + xy: 1337, 245 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-water-medium +block-water-extractor-medium rotate: false - xy: 1495, 67 + xy: 1017, 7 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-water-small +block-water-extractor-small rotate: false - xy: 2438, 63 + xy: 2147, 47 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-water-tiny +block-water-extractor-tiny rotate: false - xy: 2774, 82 + xy: 3275, 172 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-water-xlarge +block-water-extractor-xlarge rotate: false xy: 3359, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-wave-large +block-water-large rotate: false - xy: 1993, 203 + xy: 1379, 245 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-wave-medium +block-water-medium rotate: false - xy: 1529, 67 + xy: 1051, 7 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-wave-small +block-water-small rotate: false - xy: 2438, 37 + xy: 2173, 47 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-wave-tiny +block-water-tiny rotate: false - xy: 2756, 46 + xy: 3293, 172 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-wave-xlarge +block-water-xlarge rotate: false xy: 3409, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-white-tree-dead-large +block-wave-large rotate: false - xy: 2035, 245 + xy: 1421, 245 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-white-tree-dead-medium +block-wave-medium rotate: false - xy: 1563, 67 + xy: 1085, 7 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-white-tree-dead-small +block-wave-small rotate: false - xy: 2454, 89 + xy: 2199, 47 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-white-tree-dead-tiny +block-wave-tiny rotate: false - xy: 2774, 64 + xy: 3311, 172 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-white-tree-dead-xlarge +block-wave-xlarge rotate: false xy: 3459, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-white-tree-large +block-white-tree-dead-large rotate: false - xy: 2119, 287 + xy: 1463, 245 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-white-tree-medium +block-white-tree-dead-medium rotate: false - xy: 1597, 67 + xy: 1119, 7 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-white-tree-small +block-white-tree-dead-small rotate: false - xy: 2460, 115 + xy: 2225, 47 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-white-tree-tiny +block-white-tree-dead-tiny rotate: false - xy: 2792, 82 + xy: 3329, 172 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-white-tree-xlarge +block-white-tree-dead-xlarge rotate: false xy: 3509, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 +block-white-tree-large + rotate: false + xy: 1505, 245 + size: 40, 40 + orig: 40, 40 + offset: 0, 0 + index: -1 +block-white-tree-medium + rotate: false + xy: 1153, 7 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +block-white-tree-small + rotate: false + xy: 2251, 47 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +block-white-tree-tiny + rotate: false + xy: 3347, 172 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +block-white-tree-xlarge + rotate: false + xy: 3559, 413 + size: 48, 48 + orig: 48, 48 + offset: 0, 0 + index: -1 button rotate: false - xy: 3011, 300 + xy: 2989, 258 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -19276,7 +21187,7 @@ button-right-disabled index: -1 button-edge-over-4 rotate: false - xy: 2497, 258 + xy: 4059, 310 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -19284,7 +21195,7 @@ button-edge-over-4 index: -1 button-over rotate: false - xy: 2707, 300 + xy: 4059, 281 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -19292,7 +21203,7 @@ button-over index: -1 button-red rotate: false - xy: 2535, 258 + xy: 4059, 252 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -19300,7 +21211,7 @@ button-red index: -1 button-right rotate: false - xy: 2821, 300 + xy: 2799, 258 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -19308,7 +21219,7 @@ button-right index: -1 button-right-down rotate: false - xy: 2745, 300 + xy: 2723, 258 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -19316,7 +21227,7 @@ button-right-down index: -1 button-right-over rotate: false - xy: 2783, 300 + xy: 2761, 258 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -19324,7 +21235,7 @@ button-right-over index: -1 button-select rotate: false - xy: 2464, 63 + xy: 2277, 47 size: 24, 24 split: 4, 4, 4, 4 orig: 24, 24 @@ -19332,7 +21243,7 @@ button-select index: -1 button-square rotate: false - xy: 2935, 300 + xy: 2913, 258 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -19340,7 +21251,7 @@ button-square index: -1 button-square-down rotate: false - xy: 2859, 300 + xy: 2837, 258 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -19348,7 +21259,7 @@ button-square-down index: -1 button-square-over rotate: false - xy: 2897, 300 + xy: 2875, 258 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -19356,7 +21267,7 @@ button-square-over index: -1 button-trans rotate: false - xy: 2973, 300 + xy: 2951, 258 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -19364,42 +21275,42 @@ button-trans index: -1 check-disabled rotate: false - xy: 1631, 67 + xy: 1187, 7 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 check-off rotate: false - xy: 1665, 67 + xy: 1221, 7 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 check-on rotate: false - xy: 1699, 67 + xy: 1255, 7 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 check-on-disabled rotate: false - xy: 1733, 67 + xy: 1289, 7 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 check-on-over rotate: false - xy: 1767, 67 + xy: 1323, 7 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 check-over rotate: false - xy: 1801, 67 + xy: 1357, 7 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -19413,14 +21324,14 @@ clear index: -1 crater rotate: false - xy: 3453, 199 + xy: 1789, 1 size: 18, 18 orig: 18, 18 offset: 0, 0 index: -1 cursor rotate: false - xy: 845, 366 + xy: 2003, 247 size: 4, 4 orig: 4, 4 offset: 0, 0 @@ -19434,7 +21345,7 @@ discord-banner index: -1 flat-down-base rotate: false - xy: 3049, 300 + xy: 3027, 258 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -19449,7 +21360,7 @@ info-banner index: -1 inventory rotate: false - xy: 2278, 141 + xy: 3835, 271 size: 24, 40 split: 10, 10, 10, 14 orig: 24, 40 @@ -19457,147 +21368,147 @@ inventory index: -1 item-blast-compound-icon rotate: false - xy: 1835, 67 + xy: 1391, 7 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-coal-icon rotate: false - xy: 1869, 67 + xy: 1425, 7 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-copper-icon rotate: false - xy: 1903, 67 + xy: 1459, 7 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-graphite-icon rotate: false - xy: 1937, 67 + xy: 1493, 7 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-lead-icon rotate: false - xy: 1971, 67 + xy: 1527, 7 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-metaglass-icon rotate: false - xy: 2005, 67 + xy: 1561, 7 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-phase-fabric-icon rotate: false - xy: 2039, 67 + xy: 1595, 143 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-plastanium-icon rotate: false - xy: 2073, 67 + xy: 1595, 109 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-pyratite-icon rotate: false - xy: 3473, 193 + xy: 1595, 75 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-sand-icon rotate: false - xy: 3507, 193 + xy: 1595, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-scrap-icon rotate: false - xy: 3541, 193 + xy: 1595, 7 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-silicon-icon rotate: false - xy: 3575, 193 + xy: 1615, 177 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-spore-pod-icon rotate: false - xy: 3609, 193 + xy: 1629, 143 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-surge-alloy-icon rotate: false - xy: 3643, 193 + xy: 1629, 109 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-thorium-icon rotate: false - xy: 3668, 301 + xy: 1629, 75 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-titanium-icon rotate: false - xy: 3677, 267 + xy: 1629, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-cryofluid-icon rotate: false - xy: 3677, 233 + xy: 1629, 7 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-oil-icon rotate: false - xy: 3677, 199 + xy: 1649, 179 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-slag-icon rotate: false - xy: 1087, 33 + xy: 1663, 145 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-water-icon rotate: false - xy: 1121, 33 + xy: 1663, 111 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 logic-node rotate: false - xy: 1155, 33 + xy: 1663, 77 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -19618,7 +21529,7 @@ nomap index: -1 pane rotate: false - xy: 3125, 300 + xy: 3103, 258 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -19626,7 +21537,7 @@ pane index: -1 pane-2 rotate: false - xy: 3087, 300 + xy: 3065, 258 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -19634,7 +21545,7 @@ pane-2 index: -1 scroll rotate: false - xy: 2464, 26 + xy: 2303, 36 size: 24, 35 split: 10, 10, 6, 5 orig: 24, 35 @@ -19642,7 +21553,7 @@ scroll index: -1 scroll-horizontal rotate: false - xy: 901, 169 + xy: 3407, 261 size: 35, 24 split: 6, 5, 10, 10 orig: 35, 24 @@ -19650,70 +21561,70 @@ scroll-horizontal index: -1 scroll-knob-horizontal-black rotate: false - xy: 859, 169 + xy: 859, 172 size: 40, 24 orig: 40, 24 offset: 0, 0 index: -1 scroll-knob-vertical-black rotate: false - xy: 2304, 141 + xy: 3861, 271 size: 24, 40 orig: 24, 40 offset: 0, 0 index: -1 scroll-knob-vertical-thin rotate: false - xy: 3766, 245 + xy: 3995, 271 size: 12, 40 orig: 12, 40 offset: 0, 0 index: -1 selection rotate: false - xy: 309, 354 + xy: 1001, 310 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 slider rotate: false - xy: 3754, 329 + xy: 3689, 277 size: 1, 8 orig: 1, 8 offset: 0, 0 index: -1 slider-knob rotate: false - xy: 1970, 27 + xy: 3489, 197 size: 29, 38 orig: 29, 38 offset: 0, 0 index: -1 slider-knob-down rotate: false - xy: 2001, 27 + xy: 3520, 197 size: 29, 38 orig: 29, 38 offset: 0, 0 index: -1 slider-knob-over rotate: false - xy: 2032, 27 + xy: 3489, 157 size: 29, 38 orig: 29, 38 offset: 0, 0 index: -1 slider-vertical rotate: false - xy: 2194, 83 + xy: 309, 354 size: 8, 1 orig: 8, 1 offset: 0, 0 index: -1 underline rotate: false - xy: 3315, 300 + xy: 3293, 258 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -19721,7 +21632,7 @@ underline index: -1 underline-2 rotate: false - xy: 3163, 300 + xy: 3141, 258 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -19729,7 +21640,7 @@ underline-2 index: -1 underline-disabled rotate: false - xy: 3201, 300 + xy: 3179, 258 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -19737,7 +21648,7 @@ underline-disabled index: -1 underline-red rotate: false - xy: 3239, 300 + xy: 3217, 258 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -19745,7 +21656,7 @@ underline-red index: -1 underline-white rotate: false - xy: 3277, 300 + xy: 3255, 258 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -19753,35 +21664,35 @@ underline-white index: -1 unit-alpha-large rotate: false - xy: 2035, 203 + xy: 1547, 245 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 unit-alpha-medium rotate: false - xy: 1189, 33 + xy: 1663, 43 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unit-alpha-small rotate: false - xy: 2480, 89 + xy: 2329, 46 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 unit-alpha-tiny rotate: false - xy: 2774, 46 + xy: 3365, 172 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 unit-alpha-xlarge rotate: false - xy: 3559, 413 + xy: 3609, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -19795,189 +21706,189 @@ unit-antumbra-large index: -1 unit-antumbra-medium rotate: false - xy: 2063, 33 + xy: 3776, 271 size: 28, 32 orig: 28, 32 offset: 0, 0 index: -1 unit-antumbra-small rotate: false - xy: 3734, 339 + xy: 257, 20 size: 21, 24 orig: 21, 24 offset: 0, 0 index: -1 unit-antumbra-tiny rotate: false - xy: 2607, 261 + xy: 2623, 219 size: 14, 16 orig: 14, 16 offset: 0, 0 index: -1 unit-antumbra-xlarge rotate: false - xy: 945, 363 + xy: 959, 363 size: 43, 48 orig: 43, 48 offset: 0, 0 index: -1 unit-arkyid-large rotate: false - xy: 2077, 245 + xy: 1589, 245 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 unit-arkyid-medium rotate: false - xy: 1223, 33 + xy: 1663, 9 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unit-arkyid-small rotate: false - xy: 2486, 115 + xy: 2358, 110 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 unit-arkyid-tiny rotate: false - xy: 2792, 64 + xy: 3383, 172 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 unit-arkyid-xlarge rotate: false - xy: 3609, 413 + xy: 3659, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-atrax-large rotate: false - xy: 2161, 298 + xy: 1631, 256 size: 40, 29 orig: 40, 29 offset: 0, 0 index: -1 unit-atrax-medium rotate: false - xy: 1257, 42 + xy: 1683, 186 size: 32, 23 orig: 32, 23 offset: 0, 0 index: -1 unit-atrax-small rotate: false - xy: 982, 6 + xy: 1731, 25 size: 24, 17 orig: 24, 17 offset: 0, 0 index: -1 unit-atrax-tiny rotate: false - xy: 2707, 287 + xy: 2723, 245 size: 16, 11 orig: 16, 11 offset: 0, 0 index: -1 unit-atrax-xlarge rotate: false - xy: 3659, 427 + xy: 3709, 427 size: 48, 34 orig: 48, 34 offset: 0, 0 index: -1 unit-beta-large rotate: false - xy: 2077, 205 + xy: 1673, 247 size: 40, 38 orig: 40, 38 offset: 0, 0 index: -1 unit-beta-medium rotate: false - xy: 1085, 1 + xy: 3776, 239 size: 32, 30 orig: 32, 30 offset: 0, 0 index: -1 unit-beta-small rotate: false - xy: 2201, 1 + xy: 2358, 85 size: 24, 23 orig: 24, 23 offset: 0, 0 index: -1 unit-beta-tiny rotate: false - xy: 2810, 83 + xy: 881, 155 size: 16, 15 orig: 16, 15 offset: 0, 0 index: -1 unit-beta-xlarge rotate: false - xy: 3709, 415 + xy: 3759, 415 size: 48, 46 orig: 48, 46 offset: 0, 0 index: -1 unit-bryde-large rotate: false - xy: 2119, 245 + xy: 1715, 245 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 unit-bryde-medium rotate: false - xy: 1291, 33 + xy: 3791, 205 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unit-bryde-small rotate: false - xy: 2227, 8 + xy: 2355, 59 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 unit-bryde-tiny rotate: false - xy: 2792, 46 + xy: 3401, 172 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 unit-bryde-xlarge rotate: false - xy: 3759, 413 + xy: 3809, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-corvus-large rotate: false - xy: 2203, 301 + xy: 1757, 259 size: 40, 26 orig: 40, 26 offset: 0, 0 index: -1 unit-corvus-medium rotate: false - xy: 916, 37 + xy: 1697, 1 size: 31, 20 orig: 31, 20 offset: 0, 0 index: -1 unit-corvus-small rotate: false - xy: 3740, 218 + xy: 3859, 313 size: 24, 15 orig: 24, 15 offset: 0, 0 @@ -19991,336 +21902,336 @@ unit-corvus-tiny index: -1 unit-corvus-xlarge rotate: false - xy: 3809, 430 + xy: 3859, 430 size: 48, 31 orig: 48, 31 offset: 0, 0 index: -1 unit-crawler-large rotate: false - xy: 2161, 256 + xy: 1799, 245 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 unit-crawler-medium rotate: false - xy: 1325, 33 + xy: 3825, 329 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unit-crawler-small rotate: false - xy: 3763, 192 + xy: 2355, 33 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 unit-crawler-tiny rotate: false - xy: 2810, 65 + xy: 2735, 154 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 unit-crawler-xlarge rotate: false - xy: 3859, 413 + xy: 3909, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-dagger-large rotate: false - xy: 2203, 259 + xy: 1841, 245 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 unit-dagger-medium rotate: false - xy: 1359, 33 + xy: 1697, 152 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unit-dagger-small rotate: false - xy: 2490, 63 + xy: 2329, 20 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 unit-dagger-tiny rotate: false - xy: 2828, 82 + xy: 2753, 154 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 unit-dagger-xlarge rotate: false - xy: 3909, 413 + xy: 3959, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-eclipse-large rotate: false - xy: 2245, 287 + xy: 1883, 245 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 unit-eclipse-medium rotate: false - xy: 1393, 33 + xy: 1697, 118 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unit-eclipse-small rotate: false - xy: 2490, 37 + xy: 2355, 7 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 unit-eclipse-tiny rotate: false - xy: 2810, 47 + xy: 2771, 154 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 unit-eclipse-xlarge rotate: false - xy: 3959, 413 + xy: 4009, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-flare-large rotate: false - xy: 2287, 287 + xy: 1925, 245 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 unit-flare-medium rotate: false - xy: 1427, 33 + xy: 1697, 84 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unit-flare-small rotate: false - xy: 2506, 89 + xy: 2384, 99 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 unit-flare-tiny rotate: false - xy: 2828, 64 + xy: 2789, 154 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 unit-flare-xlarge rotate: false - xy: 4009, 413 + xy: 3859, 380 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-fortress-large rotate: false - xy: 2119, 211 + xy: 1967, 253 size: 40, 32 orig: 40, 32 offset: 0, 0 index: -1 unit-fortress-medium rotate: false - xy: 1119, 6 + xy: 1697, 57 size: 32, 25 orig: 32, 25 offset: 0, 0 index: -1 unit-fortress-small rotate: false - xy: 1008, 4 + xy: 1757, 23 size: 24, 19 orig: 24, 19 offset: 0, 0 index: -1 unit-fortress-tiny rotate: false - xy: 3754, 313 + xy: 2476, 125 size: 16, 12 orig: 16, 12 offset: 0, 0 index: -1 unit-fortress-xlarge rotate: false - xy: 3809, 390 + xy: 3909, 373 size: 48, 38 orig: 48, 38 offset: 0, 0 index: -1 unit-gamma-large rotate: false - xy: 2161, 214 + xy: 2009, 245 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 unit-gamma-medium rotate: false - xy: 1461, 33 + xy: 1697, 23 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unit-gamma-small rotate: false - xy: 2512, 115 + xy: 1783, 29 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 unit-gamma-tiny rotate: false - xy: 2846, 82 + xy: 2807, 154 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 unit-gamma-xlarge rotate: false - xy: 3659, 377 + xy: 3959, 363 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-horizon-large rotate: false - xy: 2203, 217 + xy: 2051, 245 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 unit-horizon-medium rotate: false - xy: 1495, 33 + xy: 3586, 185 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unit-horizon-small rotate: false - xy: 2516, 63 + xy: 2410, 99 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 unit-horizon-tiny rotate: false - xy: 2846, 64 + xy: 2825, 154 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 unit-horizon-xlarge rotate: false - xy: 3709, 365 + xy: 4009, 363 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-mace-large rotate: false - xy: 2245, 245 + xy: 2093, 245 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 unit-mace-medium rotate: false - xy: 1529, 33 + xy: 3620, 185 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unit-mace-small rotate: false - xy: 2516, 37 + xy: 1809, 29 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 unit-mace-tiny rotate: false - xy: 2864, 82 + xy: 2843, 154 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 unit-mace-xlarge rotate: false - xy: 3759, 363 + xy: 3709, 377 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-mega-large rotate: false - xy: 2329, 287 + xy: 2135, 245 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 unit-mega-medium rotate: false - xy: 1563, 33 + xy: 3654, 185 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unit-mega-small rotate: false - xy: 2532, 89 + xy: 2436, 99 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 unit-mega-tiny rotate: false - xy: 2864, 64 + xy: 2861, 154 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 unit-mega-xlarge rotate: false - xy: 3809, 340 + xy: 3759, 365 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-minke-large rotate: false - xy: 881, 85 + xy: 3481, 245 size: 34, 40 orig: 34, 40 offset: 0, 0 index: -1 unit-minke-medium rotate: false - xy: 2123, 33 + xy: 3806, 271 size: 27, 32 orig: 27, 32 offset: 0, 0 @@ -20334,210 +22245,210 @@ unit-minke-small index: -1 unit-minke-tiny rotate: false - xy: 1785, 15 + xy: 4044, 253 size: 13, 16 orig: 13, 16 offset: 0, 0 index: -1 unit-minke-xlarge rotate: false - xy: 1035, 363 + xy: 859, 198 size: 41, 48 orig: 41, 48 offset: 0, 0 index: -1 unit-mono-large rotate: false - xy: 2287, 245 + xy: 2177, 245 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 unit-mono-medium rotate: false - xy: 1597, 33 + xy: 3688, 183 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unit-mono-small rotate: false - xy: 2538, 115 + xy: 1835, 29 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 unit-mono-tiny rotate: false - xy: 2882, 82 + xy: 2879, 154 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 unit-mono-xlarge rotate: false - xy: 3859, 363 + xy: 3809, 363 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-nova-large rotate: false - xy: 2371, 287 + xy: 2219, 245 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 unit-nova-medium rotate: false - xy: 1631, 33 + xy: 3722, 171 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unit-nova-small rotate: false - xy: 2542, 63 + xy: 1861, 29 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 unit-nova-tiny rotate: false - xy: 2882, 64 + xy: 2897, 154 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 unit-nova-xlarge rotate: false - xy: 3909, 363 + xy: 3859, 330 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-oct-large rotate: false - xy: 2329, 245 + xy: 2261, 245 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 unit-oct-medium rotate: false - xy: 1665, 33 + xy: 3756, 171 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unit-oct-small rotate: false - xy: 2542, 37 + xy: 1887, 29 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 unit-oct-tiny rotate: false - xy: 2900, 82 + xy: 2915, 154 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 unit-oct-xlarge rotate: false - xy: 3959, 363 + xy: 3909, 323 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-omura-large rotate: false - xy: 2093, 25 + xy: 3520, 155 size: 28, 40 orig: 28, 40 offset: 0, 0 index: -1 unit-omura-medium rotate: false - xy: 2467, 186 + xy: 1733, 211 size: 22, 32 orig: 22, 32 offset: 0, 0 index: -1 unit-omura-small rotate: false - xy: 3763, 287 + xy: 2933, 146 size: 16, 24 orig: 16, 24 offset: 0, 0 index: -1 unit-omura-tiny rotate: false - xy: 1856, 15 + xy: 4084, 156 size: 11, 16 orig: 11, 16 offset: 0, 0 index: -1 unit-omura-xlarge rotate: false - xy: 881, 35 + xy: 3517, 237 size: 33, 48 orig: 33, 48 offset: 0, 0 index: -1 unit-poly-large rotate: false - xy: 2413, 287 + xy: 2303, 245 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 unit-poly-medium rotate: false - xy: 1699, 33 + xy: 3790, 171 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unit-poly-small rotate: false - xy: 2558, 89 + xy: 1913, 29 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 unit-poly-tiny rotate: false - xy: 2900, 64 + xy: 2951, 154 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 unit-poly-xlarge rotate: false - xy: 4009, 363 + xy: 3959, 313 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-pulsar-large rotate: false - xy: 2371, 251 + xy: 2345, 251 size: 40, 34 orig: 40, 34 offset: 0, 0 index: -1 unit-pulsar-medium rotate: false - xy: 1733, 38 + xy: 2345, 222 size: 32, 27 orig: 32, 27 offset: 0, 0 index: -1 unit-pulsar-small rotate: false - xy: 1034, 3 + xy: 1763, 1 size: 24, 20 orig: 24, 20 offset: 0, 0 @@ -20551,168 +22462,168 @@ unit-pulsar-tiny index: -1 unit-pulsar-xlarge rotate: false - xy: 131, 4 + xy: 4009, 321 size: 48, 40 orig: 48, 40 offset: 0, 0 index: -1 unit-quad-large rotate: false - xy: 2455, 287 + xy: 2387, 245 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 unit-quad-medium rotate: false - xy: 1937, 34 + xy: 3776, 332 size: 31, 31 orig: 31, 31 offset: 0, 0 index: -1 unit-quad-small rotate: false - xy: 2564, 115 + xy: 1939, 29 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 unit-quad-tiny rotate: false - xy: 2828, 47 + xy: 3692, 396 size: 15, 15 orig: 15, 15 offset: 0, 0 index: -1 unit-quad-xlarge rotate: false - xy: 3859, 313 + xy: 4009, 271 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-quasar-large rotate: false - xy: 2497, 287 + xy: 2429, 245 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 unit-quasar-medium rotate: false - xy: 1767, 33 + xy: 2343, 188 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unit-quasar-small rotate: false - xy: 2568, 63 + xy: 1965, 29 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 unit-quasar-tiny rotate: false - xy: 2918, 82 + xy: 2969, 154 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 unit-quasar-xlarge rotate: false - xy: 3909, 313 + xy: 859, 363 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-reign-large rotate: false - xy: 2245, 217 + xy: 1757, 231 size: 40, 26 orig: 40, 26 offset: 0, 0 index: -1 unit-reign-medium rotate: false - xy: 949, 3 + xy: 1730, 1 size: 31, 20 orig: 31, 20 offset: 0, 0 index: -1 unit-reign-small rotate: false - xy: 2568, 46 + xy: 1991, 30 size: 24, 15 orig: 24, 15 offset: 0, 0 index: -1 unit-reign-tiny rotate: false - xy: 181, 1 + xy: 3734, 365 size: 15, 10 orig: 15, 10 offset: 0, 0 index: -1 unit-reign-xlarge rotate: false - xy: 181, 13 + xy: 859, 330 size: 48, 31 orig: 48, 31 offset: 0, 0 index: -1 unit-risso-large rotate: false - xy: 881, 127 + xy: 3444, 245 size: 35, 40 orig: 35, 40 offset: 0, 0 index: -1 unit-risso-medium rotate: false - xy: 2107, 67 + xy: 3551, 177 size: 28, 32 orig: 28, 32 offset: 0, 0 index: -1 unit-risso-small rotate: false - xy: 2264, 191 + xy: 2447, 219 size: 21, 24 orig: 21, 24 offset: 0, 0 index: -1 unit-risso-tiny rotate: false - xy: 3661, 175 + xy: 2539, 227 size: 14, 16 orig: 14, 16 offset: 0, 0 index: -1 unit-risso-xlarge rotate: false - xy: 990, 363 + xy: 959, 313 size: 43, 48 orig: 43, 48 offset: 0, 0 index: -1 unit-scepter-large rotate: false - xy: 2413, 253 + xy: 2471, 253 size: 40, 32 orig: 40, 32 offset: 0, 0 index: -1 unit-scepter-medium rotate: false - xy: 1801, 39 + xy: 2379, 217 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 unit-scepter-small rotate: false - xy: 2490, 16 + xy: 2017, 26 size: 24, 19 orig: 24, 19 offset: 0, 0 @@ -20726,84 +22637,84 @@ unit-scepter-tiny index: -1 unit-scepter-xlarge rotate: false - xy: 231, 5 + xy: 859, 289 size: 48, 39 orig: 48, 39 offset: 0, 0 index: -1 unit-sei-large rotate: false - xy: 2539, 287 + xy: 2513, 245 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 unit-sei-medium rotate: false - xy: 1835, 33 + xy: 2413, 211 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unit-sei-small rotate: false - xy: 2516, 11 + xy: 2043, 21 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 unit-sei-tiny rotate: false - xy: 2918, 64 + xy: 2987, 154 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 unit-sei-xlarge rotate: false - xy: 3959, 313 + xy: 909, 363 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-spiroct-large rotate: false - xy: 2455, 254 + xy: 2555, 254 size: 40, 31 orig: 40, 31 offset: 0, 0 index: -1 unit-spiroct-medium rotate: false - xy: 1153, 6 + xy: 3776, 305 size: 31, 25 orig: 31, 25 offset: 0, 0 index: -1 unit-spiroct-small rotate: false - xy: 2542, 16 + xy: 2069, 26 size: 24, 19 orig: 24, 19 offset: 0, 0 index: -1 unit-spiroct-tiny rotate: false - xy: 3772, 313 + xy: 3692, 382 size: 15, 12 orig: 15, 12 offset: 0, 0 index: -1 unit-spiroct-xlarge rotate: false - xy: 4009, 323 + xy: 909, 323 size: 48, 38 orig: 48, 38 offset: 0, 0 index: -1 unit-toxopid-large rotate: false - xy: 3429, 287 + xy: 3552, 245 size: 33, 40 orig: 33, 40 offset: 0, 0 @@ -20817,42 +22728,42 @@ unit-toxopid-medium index: -1 unit-toxopid-small rotate: false - xy: 2590, 115 + xy: 2147, 21 size: 20, 24 orig: 20, 24 offset: 0, 0 index: -1 unit-toxopid-tiny rotate: false - xy: 3793, 345 + xy: 899, 1 size: 13, 16 orig: 13, 16 offset: 0, 0 index: -1 unit-toxopid-xlarge rotate: false - xy: 2581, 279 + xy: 2597, 237 size: 40, 48 orig: 40, 48 offset: 0, 0 index: -1 unit-vela-large rotate: false - xy: 2623, 295 + xy: 2639, 253 size: 40, 32 orig: 40, 32 offset: 0, 0 index: -1 unit-vela-medium rotate: false - xy: 1869, 39 + xy: 2377, 189 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 unit-vela-small rotate: false - xy: 2568, 25 + xy: 2095, 26 size: 24, 19 orig: 24, 19 offset: 0, 0 @@ -20866,49 +22777,49 @@ unit-vela-tiny index: -1 unit-vela-xlarge rotate: false - xy: 845, 372 + xy: 859, 248 size: 48, 39 orig: 48, 39 offset: 0, 0 index: -1 unit-zenith-large rotate: false - xy: 2665, 287 + xy: 2681, 245 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 unit-zenith-medium rotate: false - xy: 1903, 33 + xy: 2411, 177 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unit-zenith-small rotate: false - xy: 2584, 89 + xy: 2121, 21 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 unit-zenith-tiny rotate: false - xy: 2936, 82 + xy: 3005, 154 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 unit-zenith-xlarge rotate: false - xy: 895, 363 + xy: 909, 273 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 wavepane rotate: false - xy: 3353, 300 + xy: 3331, 258 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -20916,7 +22827,7 @@ wavepane index: -1 white-pane rotate: false - xy: 3391, 300 + xy: 3369, 258 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -20931,7 +22842,7 @@ whiteui index: -1 window-empty rotate: false - xy: 3711, 218 + xy: 1731, 122 size: 27, 61 split: 4, 4, 2, 2 orig: 27, 61 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index 6a698b472a..71293fe7a0 100644 Binary files a/core/assets/sprites/sprites.png and b/core/assets/sprites/sprites.png differ diff --git a/core/assets/sprites/sprites2.png b/core/assets/sprites/sprites2.png index efc457f2e4..fba6d8fe48 100644 Binary files a/core/assets/sprites/sprites2.png and b/core/assets/sprites/sprites2.png differ diff --git a/core/assets/sprites/sprites3.png b/core/assets/sprites/sprites3.png index 6e90118bff..6e26e044e2 100644 Binary files a/core/assets/sprites/sprites3.png and b/core/assets/sprites/sprites3.png differ diff --git a/core/assets/sprites/sprites4.png b/core/assets/sprites/sprites4.png index 1a7eeb2a5c..4a76287a49 100644 Binary files a/core/assets/sprites/sprites4.png and b/core/assets/sprites/sprites4.png differ diff --git a/core/assets/sprites/sprites5.png b/core/assets/sprites/sprites5.png index 9fb3b87450..a85adcfbb9 100644 Binary files a/core/assets/sprites/sprites5.png and b/core/assets/sprites/sprites5.png differ diff --git a/core/src/mindustry/Vars.java b/core/src/mindustry/Vars.java index e0871c74ac..37ba22d3cb 100644 --- a/core/src/mindustry/Vars.java +++ b/core/src/mindustry/Vars.java @@ -85,9 +85,9 @@ public class Vars implements Loadable{ /** range for moving items for logic units */ public static final float logicItemTransferRange = 45f; /** duration of time between turns in ticks */ - public static final float turnDuration = 20 * Time.toMinutes; + public static final float turnDuration = 2 * Time.toMinutes; /** turns needed to destroy a sector completely */ - public static final float sectorDestructionTurns = 3f; + public static final float sectorDestructionTurns = 2f; /** min armor fraction damage; e.g. 0.05 = at least 5% damage */ public static final float minArmorDamage = 0.1f; /** launch animation duration */ @@ -184,7 +184,7 @@ public class Vars implements Loadable{ public static GameState state; public static EntityCollisions collisions; public static DefaultWaves defaultWaves; - public static mindustry.audio.LoopControl loops; + public static LoopControl loops; public static Platform platform = new Platform(){}; public static Mods mods; public static Schematics schematics; diff --git a/core/src/mindustry/ai/BaseRegistry.java b/core/src/mindustry/ai/BaseRegistry.java index d5922ac822..269b79d3bf 100644 --- a/core/src/mindustry/ai/BaseRegistry.java +++ b/core/src/mindustry/ai/BaseRegistry.java @@ -9,6 +9,7 @@ import mindustry.game.*; import mindustry.game.Schematic.*; import mindustry.type.*; import mindustry.world.*; +import mindustry.world.blocks.environment.*; import mindustry.world.blocks.production.*; import mindustry.world.blocks.sandbox.*; import mindustry.world.blocks.storage.*; @@ -19,9 +20,13 @@ import java.io.*; import static mindustry.Vars.*; public class BaseRegistry{ + /** cores, sorted by tier */ public Seq cores = new Seq<>(); + /** parts with no requirement */ public Seq parts = new Seq<>(); public ObjectMap> reqParts = new ObjectMap<>(); + public ObjectMap ores = new ObjectMap<>(); + public ObjectMap oreFloors = new ObjectMap<>(); public Seq forResource(Content item){ return reqParts.get(item, Seq::new); @@ -32,6 +37,15 @@ public class BaseRegistry{ parts.clear(); reqParts.clear(); + //load ore types and corresponding items + for(Block block : content.blocks()){ + if(block instanceof OreBlock && block.asFloor().itemDrop != null){ + ores.put(block.asFloor().itemDrop, (OreBlock)block); + }else if(block.isFloor() && block.asFloor().itemDrop != null && !oreFloors.containsKey(block.asFloor().itemDrop)){ + oreFloors.put(block.asFloor().itemDrop, block.asFloor()); + } + } + String[] names = Core.files.internal("basepartnames").readString().split("\n"); for(String name : names){ diff --git a/core/src/mindustry/ai/WaveSpawner.java b/core/src/mindustry/ai/WaveSpawner.java index 417909a92b..9cecf32ac1 100644 --- a/core/src/mindustry/ai/WaveSpawner.java +++ b/core/src/mindustry/ai/WaveSpawner.java @@ -77,14 +77,18 @@ public class WaveSpawner{ eachGroundSpawn((spawnX, spawnY, doShockwave) -> { if(doShockwave){ - Time.run(20f, () -> Fx.spawnShockwave.at(spawnX, spawnY, state.rules.dropZoneRadius)); - Time.run(40f, () -> Damage.damage(state.rules.waveTeam, spawnX, spawnY, state.rules.dropZoneRadius, 99999999f, true)); + doShockwave(spawnX, spawnY); } }); Time.runTask(121f, () -> spawning = false); } + public void doShockwave(float x, float y){ + Time.run(20f, () -> Fx.spawnShockwave.at(x, y, state.rules.dropZoneRadius)); + Time.run(40f, () -> Damage.damage(state.rules.waveTeam, x, y, state.rules.dropZoneRadius, 99999999f, true)); + } + private void eachGroundSpawn(SpawnConsumer cons){ for(Tile spawn : spawns){ cons.accept(spawn.worldx(), spawn.worldy(), true); diff --git a/core/src/mindustry/ai/formations/patterns/CircleFormation.java b/core/src/mindustry/ai/formations/patterns/CircleFormation.java index 0988657adf..9636d97036 100644 --- a/core/src/mindustry/ai/formations/patterns/CircleFormation.java +++ b/core/src/mindustry/ai/formations/patterns/CircleFormation.java @@ -15,7 +15,7 @@ public class CircleFormation extends FormationPattern{ float radius = spacing / (float)Math.sin(180f / slots * Mathf.degRad); outLocation.set(Angles.trnsx(angle, radius), Angles.trnsy(angle, radius), angle); }else{ - outLocation.set(0, 0, 360f * slotNumber); + outLocation.set(0, spacing * 1.1f, 360f * slotNumber); } outLocation.z += angleOffset; diff --git a/core/src/mindustry/ai/types/BuilderAI.java b/core/src/mindustry/ai/types/BuilderAI.java index 1e1875e176..8e8c74f986 100644 --- a/core/src/mindustry/ai/types/BuilderAI.java +++ b/core/src/mindustry/ai/types/BuilderAI.java @@ -17,13 +17,17 @@ public class BuilderAI extends AIController{ @Nullable Builderc following; @Override - public void updateUnit(){ + public void updateMovement(){ Builderc builder = (Builderc)unit; if(builder.moving()){ builder.lookAt(builder.vel().angle()); } + if(target != null && shouldShoot()){ + unit.lookAt(target); + } + builder.updateBuilding(true); if(following != null){ @@ -95,13 +99,29 @@ public class BuilderAI extends AIController{ }else if(Build.validPlace(content.block(block.block), unit.team(), block.x, block.y, block.rotation)){ //it's valid. //add build request. builder.addBuild(new BuildPlan(block.x, block.y, block.rotation, content.block(block.block), block.config)); + //shift build plan to tail so next unit builds something else. + blocks.addLast(blocks.removeFirst()); }else{ //shift head of queue to tail, try something else next time blocks.removeFirst(); blocks.addLast(block); } } - } } + + @Override + public AIController fallback(){ + return unit.type().flying ? new FlyingAI() : new GroundAI(); + } + + @Override + public boolean useFallback(){ + return state.rules.waves && unit.team == state.rules.waveTeam && !unit.team.rules().ai; + } + + @Override + public boolean shouldShoot(){ + return !((Builderc)unit).isBuilding(); + } } diff --git a/core/src/mindustry/ai/types/LogicAI.java b/core/src/mindustry/ai/types/LogicAI.java index df856d6688..a7b606b932 100644 --- a/core/src/mindustry/ai/types/LogicAI.java +++ b/core/src/mindustry/ai/types/LogicAI.java @@ -21,6 +21,7 @@ public class LogicAI extends AIController{ public LUnitControl control = LUnitControl.stop; public float moveX, moveY, moveRad; public float itemTimer, payTimer, controlTimer = logicControlTimeout, targetTimer; + @Nullable public Building controller; public BuildPlan plan = new BuildPlan(); diff --git a/core/src/mindustry/ai/types/RepairAI.java b/core/src/mindustry/ai/types/RepairAI.java index 84baf1c555..5f021ae828 100644 --- a/core/src/mindustry/ai/types/RepairAI.java +++ b/core/src/mindustry/ai/types/RepairAI.java @@ -2,27 +2,33 @@ package mindustry.ai.types; import mindustry.entities.*; import mindustry.entities.units.*; +import mindustry.gen.*; import mindustry.world.blocks.ConstructBlock.*; -//note that repair AI doesn't attack anything even if it theoretically can public class RepairAI extends AIController{ @Override protected void updateMovement(){ - boolean shoot = false; - - if(target != null){ - if(!target.within(unit, unit.type().range * 0.8f)){ - moveTo(target, unit.type().range * 0.8f); - } + if(target instanceof Building){ + boolean shoot = false; if(target.within(unit, unit.type().range)){ unit.aim(target); shoot = true; } + + unit.controlWeapons(shoot); + }else if(target == null){ + unit.controlWeapons(false); } - unit.controlWeapons(shoot); + if(target != null){ + if(!target.within(unit, unit.type().range * 0.65f)){ + moveTo(target, unit.type().range * 0.65f); + } + + unit.lookAt(target); + } } @Override @@ -30,5 +36,10 @@ public class RepairAI extends AIController{ target = Units.findDamagedTile(unit.team, unit.x, unit.y); if(target instanceof ConstructBuild) target = null; + + if(target == null){ + super.updateTargeting(); + } } + } diff --git a/core/src/mindustry/ai/types/SuicideAI.java b/core/src/mindustry/ai/types/SuicideAI.java index 7278062605..2eae6e409f 100644 --- a/core/src/mindustry/ai/types/SuicideAI.java +++ b/core/src/mindustry/ai/types/SuicideAI.java @@ -6,6 +6,8 @@ import mindustry.entities.*; import mindustry.entities.units.*; import mindustry.gen.*; import mindustry.world.*; +import mindustry.world.blocks.distribution.*; +import mindustry.world.blocks.liquid.*; import mindustry.world.meta.*; public class SuicideAI extends GroundAI{ @@ -14,7 +16,7 @@ public class SuicideAI extends GroundAI{ @Override public void updateUnit(){ - if(Units.invalidateTarget(target, unit.team(), unit.x(), unit.y(), Float.MAX_VALUE)){ + if(Units.invalidateTarget(target, unit.team, unit.x, unit.y, Float.MAX_VALUE)){ target = null; } @@ -26,7 +28,7 @@ public class SuicideAI extends GroundAI{ boolean rotate = false, shoot = false, moveToTarget = false; - if(!Units.invalidateTarget(target, unit, unit.range())){ + if(!Units.invalidateTarget(target, unit, unit.range()) && unit.hasWeapons()){ rotate = true; shoot = unit.within(target, unit.type().weapons.first().bullet.range() + (target instanceof Building ? ((Building)target).block.size * Vars.tilesize / 2f : ((Hitboxc)target).hitSize() / 2f)); @@ -35,29 +37,36 @@ public class SuicideAI extends GroundAI{ unit.aimLook(Predict.intercept(unit, target, unit.type().weapons.first().bullet.speed)); } - blockedByBlock = false; + //do not move toward walls or transport blocks + if(!(target instanceof Building build && ( + build.block.group == BlockGroup.walls || + build.block.group == BlockGroup.liquids || + build.block.group == BlockGroup.transportation + ))){ + blockedByBlock = false; - //raycast for target - boolean blocked = Vars.world.raycast(unit.tileX(), unit.tileY(), target.tileX(), target.tileY(), (x, y) -> { - Tile tile = Vars.world.tile(x, y); - if(tile != null && tile.build == target) return false; - if(tile != null && tile.build != null && tile.build.team != unit.team()){ - blockedByBlock = true; - return true; - }else{ - return tile == null || tile.solid(); + //raycast for target + boolean blocked = Vars.world.raycast(unit.tileX(), unit.tileY(), target.tileX(), target.tileY(), (x, y) -> { + Tile tile = Vars.world.tile(x, y); + if(tile != null && tile.build == target) return false; + if(tile != null && tile.build != null && tile.build.team != unit.team()){ + blockedByBlock = true; + return true; + }else{ + return tile == null || tile.solid(); + } + }); + + //shoot when there's an enemy block in the way + if(blockedByBlock){ + shoot = true; } - }); - //shoot when there's an enemy block in the way - if(blockedByBlock){ - shoot = true; - } - - if(!blocked){ - moveToTarget = true; - //move towards target directly - unit.moveAt(vec.set(target).sub(unit).limit(unit.type().speed)); + if(!blocked){ + moveToTarget = true; + //move towards target directly + unit.moveAt(vec.set(target).sub(unit).limit(unit.type().speed)); + } } } @@ -78,4 +87,10 @@ public class SuicideAI extends GroundAI{ unit.controlWeapons(rotate, shoot); } + + @Override + protected Teamc target(float x, float y, float range, boolean air, boolean ground){ + return Units.closestTarget(unit.team, x, y, range, u -> u.checkTarget(air, ground), t -> ground && + !(t.block instanceof Conveyor || t.block instanceof Conduit)); //do not target conveyors/conduits + } } diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 65105e30fa..05ed572f7e 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -35,7 +35,7 @@ public class Blocks implements ContentList{ public static Block //environment - air, spawn, cliff, deepwater, water, taintedWater, tar, slag, stone, craters, charr, sand, darksand, dirt, mud, ice, snow, darksandTaintedWater, + air, spawn, cliff, deepwater, water, taintedWater, tar, slag, stone, craters, charr, sand, darksand, dirt, mud, ice, snow, darksandTaintedWater, space, dacite, stoneWall, dirtWall, sporeWall, iceWall, daciteWall, sporePine, snowPine, pine, shrubs, whiteTree, whiteTreeDead, sporeCluster, iceSnow, sandWater, darksandWater, duneWall, sandWall, moss, sporeMoss, shale, shaleWall, shaleBoulder, sandBoulder, daciteBoulder, grass, salt, metalFloor, metalFloorDamaged, metalFloor2, metalFloor3, metalFloor5, basalt, magmarock, hotrock, snowWall, boulder, snowBoulder, saltWall, @@ -216,6 +216,13 @@ public class Blocks implements ContentList{ lightColor = Color.orange.cpy().a(0.38f); }}; + space = new Floor("space"){{ + cacheLayer = CacheLayer.space; + placeableOn = false; + solid = true; + variants = 0; + }}; + stone = new Floor("stone"); craters = new Floor("craters"){{ @@ -695,7 +702,7 @@ public class Blocks implements ContentList{ drawer = new DrawAnimation(); consumes.item(Items.sporePod, 1); - consumes.power(0.60f); + consumes.power(0.7f); }}; pulverizer = new GenericCrafter("pulverizer"){{ @@ -720,7 +727,7 @@ public class Blocks implements ContentList{ hasPower = hasItems = hasLiquids = true; consumes.liquid(Liquids.oil, 0.1f); - consumes.power(0.5f); + consumes.power(0.7f); }}; incinerator = new Incinerator("incinerator"){{ @@ -822,27 +829,27 @@ public class Blocks implements ContentList{ }}; scrapWall = new Wall("scrap-wall"){{ - requirements(Category.defense, BuildVisibility.sandboxOnly, with()); + requirements(Category.defense, BuildVisibility.sandboxOnly, with(Items.scrap, 6)); health = 60 * wallHealthMultiplier; variants = 5; }}; scrapWallLarge = new Wall("scrap-wall-large"){{ - requirements(Category.defense, BuildVisibility.sandboxOnly, with()); + requirements(Category.defense, BuildVisibility.sandboxOnly, ItemStack.mult(scrapWall.requirements, 4)); health = 60 * 4 * wallHealthMultiplier; size = 2; variants = 4; }}; scrapWallHuge = new Wall("scrap-wall-huge"){{ - requirements(Category.defense, BuildVisibility.sandboxOnly, with()); + requirements(Category.defense, BuildVisibility.sandboxOnly, ItemStack.mult(scrapWall.requirements, 9)); health = 60 * 9 * wallHealthMultiplier; size = 3; variants = 3; }}; scrapWallGigantic = new Wall("scrap-wall-gigantic"){{ - requirements(Category.defense, BuildVisibility.sandboxOnly, with()); + requirements(Category.defense, BuildVisibility.sandboxOnly, ItemStack.mult(scrapWall.requirements, 16)); health = 60 * 16 * wallHealthMultiplier; size = 4; }}; @@ -987,7 +994,7 @@ public class Blocks implements ContentList{ router = new Router("router"){{ requirements(Category.distribution, with(Items.copper, 3)); - buildCostMultiplier = 2f; + buildCostMultiplier = 4f; }}; distributor = new Router("distributor"){{ @@ -1280,7 +1287,7 @@ public class Blocks implements ContentList{ }}; cultivator = new Cultivator("cultivator"){{ - requirements(Category.production, with(Items.copper, 10, Items.lead, 25, Items.silicon, 10)); + requirements(Category.production, with(Items.copper, 25, Items.lead, 25, Items.silicon, 10)); outputItem = new ItemStack(Items.sporePod, 1); craftTime = 140; size = 2; @@ -1288,7 +1295,7 @@ public class Blocks implements ContentList{ hasPower = true; hasItems = true; - consumes.power(0.80f); + consumes.power(0.9f); consumes.liquid(Liquids.water, 0.2f); }}; @@ -1334,6 +1341,7 @@ public class Blocks implements ContentList{ size = 4; unitCapModifier = 14; + researchCostMultiplier = 0.04f; }}; coreNucleus = new CoreBlock("core-nucleus"){{ @@ -1345,20 +1353,19 @@ public class Blocks implements ContentList{ size = 5; unitCapModifier = 20; + researchCostMultiplier = 0.06f; }}; vault = new StorageBlock("vault"){{ requirements(Category.effect, with(Items.titanium, 250, Items.thorium, 125)); size = 3; itemCapacity = 1000; - group = BlockGroup.storage; }}; container = new StorageBlock("container"){{ requirements(Category.effect, with(Items.titanium, 100)); size = 2; itemCapacity = 300; - group = BlockGroup.storage; }}; unloader = new Unloader("unloader"){{ @@ -1527,9 +1534,9 @@ public class Blocks implements ContentList{ hasPower = true; size = 2; - force = 4.5f; + force = 5f; scaledForce = 5.5f; - range = 110f; + range = 160f; damage = 0.4f; health = 160 * size * size; rotateSpeed = 10; diff --git a/core/src/mindustry/content/Bullets.java b/core/src/mindustry/content/Bullets.java index 514a9d9518..221dc44e8d 100644 --- a/core/src/mindustry/content/Bullets.java +++ b/core/src/mindustry/content/Bullets.java @@ -354,6 +354,8 @@ public class Bullets implements ContentList{ width = 16f; height = 23f; shootEffect = Fx.shootBig; + pierceCap = 2; + pierceBuilding = true; }}; standardIncendiaryBig = new BasicBulletType(7f, 60, "bullet"){{ @@ -363,6 +365,8 @@ public class Bullets implements ContentList{ backColor = Pal.lightOrange; status = StatusEffects.burning; shootEffect = Fx.shootBig; + pierceCap = 2; + pierceBuilding = true; }}; damageLightning = new BulletType(0.0001f, 0f){{ diff --git a/core/src/mindustry/content/StatusEffects.java b/core/src/mindustry/content/StatusEffects.java index 6752cf68e6..4cdfadec76 100644 --- a/core/src/mindustry/content/StatusEffects.java +++ b/core/src/mindustry/content/StatusEffects.java @@ -33,7 +33,7 @@ public class StatusEffects implements ContentList{ freezing = new StatusEffect("freezing"){{ speedMultiplier = 0.6f; - armorMultiplier = 0.8f; + healthMultiplier = 0.8f; effect = Fx.freezing; init(() -> { @@ -81,7 +81,7 @@ public class StatusEffects implements ContentList{ melting = new StatusEffect("melting"){{ speedMultiplier = 0.8f; - armorMultiplier = 0.8f; + healthMultiplier = 0.8f; damage = 0.3f; effect = Fx.melting; @@ -93,7 +93,7 @@ public class StatusEffects implements ContentList{ sapped = new StatusEffect("sapped"){{ speedMultiplier = 0.7f; - armorMultiplier = 0.8f; + healthMultiplier = 0.8f; effect = Fx.sapped; effectChance = 0.1f; }}; @@ -115,7 +115,7 @@ public class StatusEffects implements ContentList{ }}; overdrive = new StatusEffect("overdrive"){{ - armorMultiplier = 0.95f; + healthMultiplier = 0.95f; speedMultiplier = 1.15f; damageMultiplier = 1.4f; damage = -0.01f; @@ -132,13 +132,13 @@ public class StatusEffects implements ContentList{ }}; shielded = new StatusEffect("shielded"){{ - armorMultiplier = 3f; + healthMultiplier = 3f; }}; boss = new StatusEffect("boss"){{ permanent = true; - damageMultiplier = 1.5f; - armorMultiplier = 1.5f; + damageMultiplier = 2f; + healthMultiplier = 2f; }}; shocked = new StatusEffect("shocked"); diff --git a/core/src/mindustry/content/TechTree.java b/core/src/mindustry/content/TechTree.java index 9ad3992557..e9aa178388 100644 --- a/core/src/mindustry/content/TechTree.java +++ b/core/src/mindustry/content/TechTree.java @@ -110,8 +110,6 @@ public class TechTree implements ContentList{ node(Items.coal, with(Items.lead, 3000), () -> { node(Items.graphite, with(Items.coal, 1000), () -> { - node(illuminator, () -> { - }); node(graphitePress, () -> { node(Items.titanium, with(Items.graphite, 6000, Items.copper, 10000, Items.lead, 10000), () -> { @@ -230,6 +228,9 @@ public class TechTree implements ContentList{ }); }); }); + + node(illuminator, () -> { + }); }); }); diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java index 9a92882cf6..9a1b851118 100644 --- a/core/src/mindustry/content/UnitTypes.java +++ b/core/src/mindustry/content/UnitTypes.java @@ -26,10 +26,7 @@ public class UnitTypes implements ContentList{ public static @EntityDef({Unitc.class, Mechc.class}) UnitType vela; //legs - public static @EntityDef({Unitc.class, Legsc.class}) UnitType corvus; - - //legs - public static @EntityDef({Unitc.class, Legsc.class}) UnitType atrax; + public static @EntityDef({Unitc.class, Legsc.class}) UnitType corvus, atrax; //legs + building public static @EntityDef({Unitc.class, Legsc.class, Builderc.class}) UnitType spiroct, arkyid, toxopid; @@ -164,7 +161,7 @@ public class UnitTypes implements ContentList{ y = 1f; x = 16f; shootY = 8f; - reload = 50f; + reload = 45f; recoil = 5f; shake = 2f; ejectEffect = Fx.shellEjectBig; @@ -173,7 +170,7 @@ public class UnitTypes implements ContentList{ inaccuracy = 3f; shotDelay = 4f; - bullet = new BasicBulletType(7f, 45){{ + bullet = new BasicBulletType(7f, 50){{ width = 11f; height = 20f; lifetime = 25f; @@ -182,7 +179,7 @@ public class UnitTypes implements ContentList{ lightningLength = 6; lightningColor = Pal.surge; //standard bullet damage is far too much for lightning - lightningDamage = 25; + lightningDamage = 30; }}; }}, @@ -230,8 +227,9 @@ public class UnitTypes implements ContentList{ ejectEffect = Fx.shellEjectBig; shootSound = Sounds.artillery; - bullet = new BasicBulletType(13f, 55){{ + bullet = new BasicBulletType(13f, 60){{ pierce = true; + pierceCap = 10; width = 14f; height = 33f; lifetime = 15f; @@ -250,6 +248,8 @@ public class UnitTypes implements ContentList{ width = 10f; height = 10f; pierce = true; + pierceBuilding = true; + pierceCap = 3; lifetime = 20f; hitEffect = Fx.flakExplosion; @@ -514,7 +514,7 @@ public class UnitTypes implements ContentList{ crawler = new UnitType("crawler"){{ defaultController = SuicideAI::new; - speed = 0.92f; + speed = 1f; hitSize = 8f; health = 180; mechSideSway = 0.25f; @@ -529,9 +529,9 @@ public class UnitTypes implements ContentList{ hitEffect = Fx.pulverize; lifetime = 10f; speed = 1f; - splashDamageRadius = 55f; + splashDamageRadius = 70f; instantDisappear = true; - splashDamage = 60f; + splashDamage = 80f; killShooter = true; hittable = false; collidesAir = true; @@ -1145,7 +1145,7 @@ public class UnitTypes implements ContentList{ speed = 1.9f; rotateSpeed = 15f; accel = 0.1f; - range = 70f; + range = 130f; health = 400; buildSpeed = 0.5f; engineOffset = 6.5f; @@ -1187,8 +1187,6 @@ public class UnitTypes implements ContentList{ healPercent = 5.5f; collidesTeam = true; backColor = Pal.heal; - frontColor = Color.white; - backColor = Pal.heal; trailColor = Pal.heal; }}; }}); @@ -1233,7 +1231,7 @@ public class UnitTypes implements ContentList{ }}; quad = new UnitType("quad"){{ - armor = 4f; + armor = 8f; health = 6000; speed = 1.2f; rotateSpeed = 2f; @@ -1256,7 +1254,7 @@ public class UnitTypes implements ContentList{ new Weapon(){{ x = y = 0f; mirror = false; - reload = 60f; + reload = 55f; minShootVelocity = 0.01f; bullet = new BasicBulletType(){{ @@ -1289,9 +1287,9 @@ public class UnitTypes implements ContentList{ speed = 0.001f; collides = false; - healPercent = 10f; - splashDamage = 240f; - splashDamageRadius = 115f; + healPercent = 15f; + splashDamage = 320f; + splashDamageRadius = 120f; }}; }}); }}; @@ -1546,7 +1544,7 @@ public class UnitTypes implements ContentList{ xRand = 8f; shotDelay = 1f; - bullet = new MissileBulletType(4.2f, 25){{ + bullet = new MissileBulletType(4.2f, 30){{ homingPower = 0.12f; width = 8f; height = 8f; @@ -1554,8 +1552,8 @@ public class UnitTypes implements ContentList{ drag = -0.003f; homingRange = 80f; keepVelocity = false; - splashDamageRadius = 25f; - splashDamage = 25f; + splashDamageRadius = 30f; + splashDamage = 35f; lifetime = 56f; trailColor = Pal.bulletYellowBack; backColor = Pal.bulletYellowBack; diff --git a/core/src/mindustry/content/Weathers.java b/core/src/mindustry/content/Weathers.java index a2ffbb098f..273fdb5899 100644 --- a/core/src/mindustry/content/Weathers.java +++ b/core/src/mindustry/content/Weathers.java @@ -152,7 +152,7 @@ public class Weathers implements ContentList{ if(tile != null && tile.floor().liquidDrop == Liquids.water){ Draw.color(Tmp.c1.set(tile.floor().mapColor).mul(1.5f).a(state.opacity())); Draw.rect(splashes[(int)(life * (splashes.length - 1))], x, y); - }else{ + }else if(tile != null && tile.floor().liquidDrop == null && !tile.floor().solid){ Draw.color(Color.royal, Color.white, 0.3f); Draw.alpha(Mathf.slope(life) * state.opacity()); diff --git a/core/src/mindustry/core/Control.java b/core/src/mindustry/core/Control.java index 86cf82c797..efe2327074 100644 --- a/core/src/mindustry/core/Control.java +++ b/core/src/mindustry/core/Control.java @@ -317,6 +317,7 @@ public class Control implements ApplicationListener, Loadable{ }else{ net.reset(); logic.reset(); + sector.setSecondsPassed(0); world.loadSector(sector); state.rules.sector = sector; //assign origin when launching diff --git a/core/src/mindustry/core/Logic.java b/core/src/mindustry/core/Logic.java index dd54bcc59d..df536552df 100644 --- a/core/src/mindustry/core/Logic.java +++ b/core/src/mindustry/core/Logic.java @@ -9,7 +9,6 @@ import mindustry.game.EventType.*; import mindustry.game.*; import mindustry.game.Teams.*; import mindustry.gen.*; -import mindustry.maps.*; import mindustry.type.*; import mindustry.type.Weather.*; import mindustry.world.*; @@ -89,13 +88,16 @@ public class Logic implements ApplicationListener{ if(state.isCampaign()){ long seconds = state.rules.sector.getSecondsPassed(); CoreBuild core = state.rules.defaultTeam.core(); + //THE WAVES NEVER END + state.rules.waves = true; //apply fractional damage based on how many turns have passed for this sector - float turnsPassed = seconds / (turnDuration / 60f); + //float turnsPassed = seconds / (turnDuration / 60f); - if(state.rules.sector.hasWaves() && turnsPassed > 0 && state.rules.sector.hasBase()){ - SectorDamage.apply(turnsPassed / sectorDestructionTurns); - } + //TODO sector damage disabled for now + //if(state.rules.sector.hasWaves() && turnsPassed > 0 && state.rules.sector.hasBase()){ + // SectorDamage.apply(turnsPassed / sectorDestructionTurns); + //} //add resources based on turns passed if(state.rules.sector.save != null && core != null){ @@ -197,6 +199,8 @@ public class Logic implements ApplicationListener{ state.rules.waves = false; } + //TODO capturing is disabled + /* //if there's a "win" wave and no enemies are present, win automatically if(state.rules.waves && state.enemies == 0 && state.rules.winWave > 0 && state.wave >= state.rules.winWave && !spawner.isSpawning()){ //the sector has been conquered - waves get disabled @@ -209,7 +213,7 @@ public class Logic implements ApplicationListener{ if(!headless){ control.saves.saveSector(state.rules.sector); } - } + }*/ }else{ if(!state.rules.attackMode && state.teams.playerCores().size == 0 && !state.gameOver){ state.gameOver = true; diff --git a/core/src/mindustry/core/NetServer.java b/core/src/mindustry/core/NetServer.java index fa64e60be9..77ab732cf6 100644 --- a/core/src/mindustry/core/NetServer.java +++ b/core/src/mindustry/core/NetServer.java @@ -329,8 +329,8 @@ public class NetServer implements ApplicationListener{ votes += d; voted.addAll(player.uuid(), admins.getInfo(player.uuid()).lastIP); - Call.sendMessage(Strings.format("[lightgray]A player has voted on kicking[orange] @[].[accent] (@/@)\n[lightgray]Type[orange] /vote [] to agree.", - target.name, votes, votesRequired())); + Call.sendMessage(Strings.format("[lightgray]@[lightgray] has voted on kicking[orange] @[].[accent] (@/@)\n[lightgray]Type[orange] /vote [] to agree.", + player.name, target.name, votes, votesRequired())); checkPass(); } diff --git a/core/src/mindustry/core/World.java b/core/src/mindustry/core/World.java index 709b0bfb23..03a18c01ed 100644 --- a/core/src/mindustry/core/World.java +++ b/core/src/mindustry/core/World.java @@ -65,6 +65,11 @@ public class World{ return tile == null || tile.block().solid; } + public boolean wallSolidFull(int x, int y){ + Tile tile = tile(x, y); + return tile == null || (tile.block().solid && tile.block().fillsTile); + } + public boolean isAccessible(int x, int y){ return !wallSolid(x, y - 1) || !wallSolid(x, y + 1) || !wallSolid(x - 1, y) || !wallSolid(x + 1, y); } diff --git a/core/src/mindustry/ctype/UnlockableContent.java b/core/src/mindustry/ctype/UnlockableContent.java index 56e9c31146..f6e6d0a2dc 100644 --- a/core/src/mindustry/ctype/UnlockableContent.java +++ b/core/src/mindustry/ctype/UnlockableContent.java @@ -22,7 +22,7 @@ public abstract class UnlockableContent extends MappableContent{ /** Whether this content is always unlocked in the tech tree. */ public boolean alwaysUnlocked = false; /** Icons by Cicon ID.*/ - protected TextureRegion[] cicons = new TextureRegion[mindustry.ui.Cicon.all.length]; + protected TextureRegion[] cicons = new TextureRegion[Cicon.all.length]; /** Unlock state. Loaded from settings. Do not modify outside of the constructor. */ protected boolean unlocked; diff --git a/core/src/mindustry/editor/EditorTile.java b/core/src/mindustry/editor/EditorTile.java index 3731cf3d99..5ff533325d 100644 --- a/core/src/mindustry/editor/EditorTile.java +++ b/core/src/mindustry/editor/EditorTile.java @@ -26,7 +26,7 @@ public class EditorTile extends Tile{ if(type instanceof OverlayFloor){ //don't place on liquids - if(!floor.isLiquid){ + if(floor.hasSurface()){ setOverlayID(type.id); } return; @@ -96,7 +96,14 @@ public class EditorTile extends Tile{ super.recache(); } } - + + @Override + protected void changed(){ + if(state.isGame()){ + super.changed(); + } + } + @Override protected void changeEntity(Team team, Prov entityprov, int rotation){ if(skip()){ diff --git a/core/src/mindustry/editor/EditorTool.java b/core/src/mindustry/editor/EditorTool.java index 2dff5e9f46..194ec97e4c 100644 --- a/core/src/mindustry/editor/EditorTool.java +++ b/core/src/mindustry/editor/EditorTool.java @@ -118,7 +118,7 @@ public enum EditorTool{ if(editor.drawBlock.isOverlay()){ Block dest = tile.overlay(); if(dest == editor.drawBlock) return; - tester = t -> t.overlay() == dest && !t.floor().isLiquid; + tester = t -> t.overlay() == dest && t.floor().hasSurface(); setter = t -> t.setOverlay(editor.drawBlock); }else if(editor.drawBlock.isFloor()){ Block dest = tile.floor(); diff --git a/core/src/mindustry/editor/MapEditorDialog.java b/core/src/mindustry/editor/MapEditorDialog.java index 6ff8546b19..4f7eb008fd 100644 --- a/core/src/mindustry/editor/MapEditorDialog.java +++ b/core/src/mindustry/editor/MapEditorDialog.java @@ -557,6 +557,12 @@ public class MapEditorDialog extends Dialog implements Disposable{ t.add(slider).width(size * 3f - 20).padTop(4f); }).padTop(5).growX().top(); + mid.row(); + + mid.table(t -> { + t.button("@editor.center", Icon.move, Styles.cleart, () -> view.center()).growX().margin(9f); + }).growX().top(); + }).margin(0).left().growY(); diff --git a/core/src/mindustry/editor/MapGenerateDialog.java b/core/src/mindustry/editor/MapGenerateDialog.java index a4a4c0c181..fae31dc7d5 100644 --- a/core/src/mindustry/editor/MapGenerateDialog.java +++ b/core/src/mindustry/editor/MapGenerateDialog.java @@ -417,7 +417,7 @@ public class MapGenerateDialog extends BaseDialog{ public void set(Block floor, Block wall, Block ore, Team team){ this.floor = floor.id; this.block = wall.id; - this.ore = floor.asFloor().isLiquid ? 0 : ore.id; + this.ore = !floor.asFloor().hasSurface() ? 0 : ore.id; this.team = (byte)team.id; } diff --git a/core/src/mindustry/editor/MapView.java b/core/src/mindustry/editor/MapView.java index 7ee088eec5..a54c0f49b8 100644 --- a/core/src/mindustry/editor/MapView.java +++ b/core/src/mindustry/editor/MapView.java @@ -171,6 +171,10 @@ public class MapView extends Element implements GestureListener{ this.grid = grid; } + public void center(){ + offsetx = offsety = 0; + } + @Override public void act(float delta){ super.act(delta); diff --git a/core/src/mindustry/entities/Effect.java b/core/src/mindustry/entities/Effect.java index 9d17cfcfc5..920729e608 100644 --- a/core/src/mindustry/entities/Effect.java +++ b/core/src/mindustry/entities/Effect.java @@ -146,7 +146,7 @@ public class Effect{ if(headless || region == null || !Core.atlas.isFound(region)) return; Tile tile = world.tileWorld(x, y); - if(tile == null || tile.floor().isLiquid) return; + if(tile == null || !tile.floor().hasSurface()) return; Decal decal = Decal.create(); decal.set(x, y); diff --git a/core/src/mindustry/entities/EntityCollisions.java b/core/src/mindustry/entities/EntityCollisions.java index 2d8402e92c..b4139991a4 100644 --- a/core/src/mindustry/entities/EntityCollisions.java +++ b/core/src/mindustry/entities/EntityCollisions.java @@ -127,7 +127,7 @@ public class EntityCollisions{ public static boolean legsSolid(int x, int y){ Tile tile = world.tile(x, y); - return tile == null || tile.staticDarkness() >= 2; + return tile == null || tile.staticDarkness() >= 2 || tile.floor().solid; } public static boolean waterSolid(int x, int y){ diff --git a/core/src/mindustry/entities/Puddles.java b/core/src/mindustry/entities/Puddles.java index 461e486001..0abdae4928 100644 --- a/core/src/mindustry/entities/Puddles.java +++ b/core/src/mindustry/entities/Puddles.java @@ -45,6 +45,10 @@ public class Puddles{ return; } + if(tile.floor().solid){ + return; + } + Puddle p = map.get(tile.pos()); if(p == null){ Puddle puddle = Puddle.create(); diff --git a/core/src/mindustry/entities/bullet/BulletType.java b/core/src/mindustry/entities/bullet/BulletType.java index 71414c3745..0c3a605f1b 100644 --- a/core/src/mindustry/entities/bullet/BulletType.java +++ b/core/src/mindustry/entities/bullet/BulletType.java @@ -25,6 +25,7 @@ public abstract class BulletType extends Content{ public float drawSize = 40f; public float drag = 0f; public boolean pierce, pierceBuilding; + public int pierceCap = -1; public Effect hitEffect, despawnEffect; /** Effect created when shooting. */ @@ -235,6 +236,11 @@ public abstract class BulletType extends Content{ } public void init(Bullet b){ + if(pierceCap >= 1) { + pierce = true; + //pierceBuilding is not enabled by default, because a bullet may want to *not* pierce buildings + } + if(killShooter && b.owner() instanceof Healthc){ ((Healthc)b.owner()).kill(); } @@ -311,7 +317,7 @@ public abstract class BulletType extends Content{ bullet.data = data; bullet.drag = drag; bullet.hitSize = hitSize; - bullet.damage = damage < 0 ? this.damage : damage; + bullet.damage = (damage < 0 ? this.damage : damage) * bullet.damageMultiplier(); bullet.add(); if(keepVelocity && owner instanceof Velc) bullet.vel.add(((Velc)owner).vel().x, ((Velc)owner).vel().y); diff --git a/core/src/mindustry/entities/comp/BuilderComp.java b/core/src/mindustry/entities/comp/BuilderComp.java index d57b1b5b6d..0aafd4d0c0 100644 --- a/core/src/mindustry/entities/comp/BuilderComp.java +++ b/core/src/mindustry/entities/comp/BuilderComp.java @@ -116,7 +116,6 @@ abstract class BuilderComp implements Unitc{ current.progress = entity.progress; } - /** Draw all current build requests. Does not draw the beam effect, only the positions. */ void drawBuildRequests(){ diff --git a/core/src/mindustry/entities/comp/BuildingComp.java b/core/src/mindustry/entities/comp/BuildingComp.java index aee2464d9e..15d79a8942 100644 --- a/core/src/mindustry/entities/comp/BuildingComp.java +++ b/core/src/mindustry/entities/comp/BuildingComp.java @@ -53,10 +53,11 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc, transient Block block; transient Seq proximity = new Seq<>(8); transient boolean updateFlow; - transient byte dump; + transient byte cdump; transient int rotation; transient boolean enabled = true; transient float enabledControlTime; + transient String lastAccessed; PowerModule power; ItemModule items; @@ -348,6 +349,11 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc, //endregion //region handler methods + /** Called when an unloader takes an item. */ + public void itemTaken(Item item){ + + } + /** Called when this block is dropped as a payload. */ public void dropped(){ @@ -443,7 +449,7 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc, public boolean dumpPayload(Payload todump){ if(proximity.size == 0) return false; - int dump = this.dump; + int dump = this.cdump; for(int i = 0; i < proximity.size; i++){ Building other = proximity.get((i + dump) % proximity.size); @@ -477,7 +483,7 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc, } public void dumpLiquid(Liquid liquid){ - int dump = this.dump; + int dump = this.cdump; for(int i = 0; i < proximity.size; i++){ incrementDump(proximity.size); @@ -507,15 +513,15 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc, } } - public float moveLiquidForward(float leakResistance, Liquid liquid){ + public float moveLiquidForward(boolean leaks, Liquid liquid){ Tile next = tile.getNearby(rotation); if(next == null) return 0; if(next.build != null){ return moveLiquid(next.build, liquid); - }else if(leakResistance != 100f && !next.block().solid && !next.block().hasLiquids){ - float leakAmount = liquids.get(liquid) / leakResistance; + }else if(leaks && !next.block().solid && !next.block().hasLiquids){ + float leakAmount = liquids.get(liquid) / 1.5f; Puddles.deposit(next, tile, liquid, leakAmount); liquids.remove(liquid, leakAmount); } @@ -577,7 +583,7 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc, * containers, it gets added to the block's inventory. */ public void offload(Item item){ - int dump = this.dump; + int dump = this.cdump; for(int i = 0; i < proximity.size; i++){ incrementDump(proximity.size); @@ -595,7 +601,7 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc, * Tries to put this item into a nearby container. Returns success. Unlike #offload(), this method does not change the block inventory. */ public boolean put(Item item){ - int dump = this.dump; + int dump = this.cdump; for(int i = 0; i < proximity.size; i++){ incrementDump(proximity.size); @@ -621,7 +627,7 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc, public boolean dump(Item todump){ if(!block.hasItems || items.total() == 0 || (todump != null && !items.has(todump))) return false; - int dump = this.dump; + int dump = this.cdump; if(proximity.size == 0) return false; @@ -656,7 +662,7 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc, } public void incrementDump(int prox){ - dump = (byte)((dump + 1) % prox); + cdump = (byte)((cdump + 1) % prox); } /** Used for dumping items. */ @@ -874,6 +880,10 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc, //null is of type void.class; anonymous classes use their superclass. Class type = value == null ? void.class : value.getClass().isAnonymousClass() ? value.getClass().getSuperclass() : value.getClass(); + if(builder != null && builder.isPlayer()){ + lastAccessed = builder.getPlayer().name; + } + if(block.configurations.containsKey(type)){ block.configurations.get(type).get(this, value); } @@ -1038,6 +1048,11 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc, } } + if(net.active() && lastAccessed != null){ + table.row(); + table.add(Core.bundle.format("lastaccessed", lastAccessed)).growX().wrap().left(); + } + table.marginBottom(-5); } } @@ -1165,10 +1180,6 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc, proximity.add(tile); } - for(Building other : tmpTiles){ - other.onProximityUpdate(); - } - onProximityAdded(); onProximityUpdate(); diff --git a/core/src/mindustry/entities/comp/BulletComp.java b/core/src/mindustry/entities/comp/BulletComp.java index 00640b4603..4deb7cc9dc 100644 --- a/core/src/mindustry/entities/comp/BulletComp.java +++ b/core/src/mindustry/entities/comp/BulletComp.java @@ -19,12 +19,11 @@ import static mindustry.Vars.*; abstract class BulletComp implements Timedc, Damagec, Hitboxc, Teamc, Posc, Drawc, Shielderc, Ownerc, Velc, Bulletc, Timerc{ @Import Team team; @Import Entityc owner; - @Import float x,y; + @Import float x, y, damage; IntSeq collided = new IntSeq(6); Object data; BulletType type; - float damage; float fdata; @Override @@ -76,11 +75,6 @@ abstract class BulletComp implements Timedc, Damagec, Hitboxc, Teamc, Posc, Draw return type.drawSize; } - @Override - public float damage(){ - return damage * damageMultiplier(); - } - @Replace @Override public boolean collides(Hitboxc other){ @@ -150,6 +144,10 @@ abstract class BulletComp implements Timedc, Damagec, Hitboxc, Teamc, Posc, Draw return false; }); } + + if(type.pierceCap != -1 && collided.size >= type.pierceCap) { + remove(); + } } @Override diff --git a/core/src/mindustry/entities/comp/DamageComp.java b/core/src/mindustry/entities/comp/DamageComp.java index e46a7ec87c..d9b6105352 100644 --- a/core/src/mindustry/entities/comp/DamageComp.java +++ b/core/src/mindustry/entities/comp/DamageComp.java @@ -4,5 +4,5 @@ import mindustry.annotations.Annotations.*; @Component abstract class DamageComp{ - abstract float damage(); + float damage; } diff --git a/core/src/mindustry/entities/comp/PayloadComp.java b/core/src/mindustry/entities/comp/PayloadComp.java index a27c7721be..ac1f4fa323 100644 --- a/core/src/mindustry/entities/comp/PayloadComp.java +++ b/core/src/mindustry/entities/comp/PayloadComp.java @@ -86,10 +86,10 @@ abstract class PayloadComp implements Posc, Rotc, Hitboxc, Unitc{ return true; } - if(payload instanceof BuildPayload){ - return dropBlock((BuildPayload)payload); - }else if(payload instanceof UnitPayload){ - return dropUnit((UnitPayload)payload); + if(payload instanceof BuildPayload b){ + return dropBlock(b); + }else if(payload instanceof UnitPayload p){ + return dropUnit(p); } return false; } @@ -126,6 +126,8 @@ abstract class PayloadComp implements Posc, Rotc, Hitboxc, Unitc{ int rot = (int)((rotation + 45f) / 90f) % 4; payload.place(on, rot); + if(isPlayer()) payload.build.lastAccessed = getPlayer().name; + Fx.unitDrop.at(tile); Fx.placeBlock.at(on.drawx(), on.drawy(), on.block().size); return true; diff --git a/core/src/mindustry/entities/comp/PlayerComp.java b/core/src/mindustry/entities/comp/PlayerComp.java index 1e4a88a640..4ee481b032 100644 --- a/core/src/mindustry/entities/comp/PlayerComp.java +++ b/core/src/mindustry/entities/comp/PlayerComp.java @@ -188,6 +188,11 @@ abstract class PlayerComp implements UnitController, Entityc, Syncc, Timerc, Dra if(unit.isRemote()){ unit.snapInterpolation(); } + + //reset selected block when switching units + if(!headless && isLocal()){ + control.input.block = null; + } } Events.fire(new UnitChangeEvent(self(), unit)); diff --git a/core/src/mindustry/entities/comp/ShieldComp.java b/core/src/mindustry/entities/comp/ShieldComp.java index 359637414e..274286b801 100644 --- a/core/src/mindustry/entities/comp/ShieldComp.java +++ b/core/src/mindustry/entities/comp/ShieldComp.java @@ -9,7 +9,7 @@ import static mindustry.Vars.*; @Component abstract class ShieldComp implements Healthc, Posc{ - @Import float health, hitTime, x, y; + @Import float health, hitTime, x, y, healthMultiplier; @Import boolean dead; /** Absorbs health damage. */ @@ -22,6 +22,7 @@ abstract class ShieldComp implements Healthc, Posc{ @Replace @Override public void damage(float amount){ + amount /= healthMultiplier; //apply armor amount = Math.max(amount - armor, minArmorDamage * amount); diff --git a/core/src/mindustry/entities/comp/StatusComp.java b/core/src/mindustry/entities/comp/StatusComp.java index 3a31b13b95..fcce0d0a02 100644 --- a/core/src/mindustry/entities/comp/StatusComp.java +++ b/core/src/mindustry/entities/comp/StatusComp.java @@ -19,7 +19,7 @@ abstract class StatusComp implements Posc, Flyingc{ private Seq statuses = new Seq<>(); private transient Bits applied = new Bits(content.getBy(ContentType.status).size); - @ReadOnly transient float speedMultiplier = 1, damageMultiplier = 1, armorMultiplier = 1, reloadMultiplier = 1; + @ReadOnly transient float speedMultiplier = 1, damageMultiplier = 1, healthMultiplier = 1, reloadMultiplier = 1; @Import UnitType type; @@ -104,7 +104,7 @@ abstract class StatusComp implements Posc, Flyingc{ } applied.clear(); - speedMultiplier = damageMultiplier = armorMultiplier = reloadMultiplier = 1f; + speedMultiplier = damageMultiplier = healthMultiplier = reloadMultiplier = 1f; if(statuses.isEmpty()) return; @@ -122,7 +122,7 @@ abstract class StatusComp implements Posc, Flyingc{ statuses.remove(index); }else{ speedMultiplier *= entry.effect.speedMultiplier; - armorMultiplier *= entry.effect.armorMultiplier; + healthMultiplier *= entry.effect.healthMultiplier; damageMultiplier *= entry.effect.damageMultiplier; reloadMultiplier *= entry.effect.reloadMultiplier; entry.effect.update(self(), entry.time); diff --git a/core/src/mindustry/entities/comp/WeaponsComp.java b/core/src/mindustry/entities/comp/WeaponsComp.java index 08d87081f6..d891dbc1e4 100644 --- a/core/src/mindustry/entities/comp/WeaponsComp.java +++ b/core/src/mindustry/entities/comp/WeaponsComp.java @@ -111,7 +111,7 @@ abstract class WeaponsComp implements Teamc, Posc, Rotc, Velc, Statusc{ //update continuous state if(weapon.continuous && mount.bullet != null){ - if(!mount.bullet.isAdded() || mount.bullet.time >= mount.bullet.lifetime){ + if(!mount.bullet.isAdded() || mount.bullet.time >= mount.bullet.lifetime || mount.bullet.type != weapon.bullet){ mount.bullet = null; }else{ mount.bullet.rotation(weaponRotation + 90); diff --git a/core/src/mindustry/entities/units/AIController.java b/core/src/mindustry/entities/units/AIController.java index d235972212..b02fa5dc00 100644 --- a/core/src/mindustry/entities/units/AIController.java +++ b/core/src/mindustry/entities/units/AIController.java @@ -21,6 +21,7 @@ public class AIController implements UnitController{ protected Unit unit; protected Interval timer = new Interval(4); + protected AIController fallback; /** main target that is being faced */ protected Teamc target; @@ -34,11 +35,27 @@ public class AIController implements UnitController{ @Override public void updateUnit(){ + //use fallback AI when possible + if(useFallback() && (fallback != null || (fallback = fallback()) != null)){ + if(fallback.unit != unit) fallback.unit(unit); + fallback.updateUnit(); + return; + } + updateVisuals(); updateTargeting(); updateMovement(); } + @Nullable + protected AIController fallback(){ + return null; + } + + protected boolean useFallback(){ + return false; + } + protected UnitCommand command(){ return unit.team.data().command; } diff --git a/core/src/mindustry/game/DefaultWaves.java b/core/src/mindustry/game/DefaultWaves.java index 5f980fcfde..53a0bfa99c 100644 --- a/core/src/mindustry/game/DefaultWaves.java +++ b/core/src/mindustry/game/DefaultWaves.java @@ -1,5 +1,6 @@ package mindustry.game; +import arc.func.*; import arc.math.*; import arc.struct.*; import arc.util.*; @@ -37,6 +38,7 @@ public class DefaultWaves{ unitScaling = 1.7f; spacing = 2; max = 4; + shieldScaling = 15f; }}, new SpawnGroup(pulsar){{ @@ -54,10 +56,12 @@ public class DefaultWaves{ }}, new SpawnGroup(dagger){{ - begin = 8; + begin = 12; unitScaling = 1; unitAmount = 4; spacing = 2; + shieldScaling = 10f; + max = 20; }}, new SpawnGroup(mace){{ @@ -65,12 +69,15 @@ public class DefaultWaves{ spacing = 3; unitScaling = 1; end = 40; + shieldScaling = 20f; }}, - new SpawnGroup(mace){{ + new SpawnGroup(spiroct){{ begin = 45; spacing = 3; - unitScaling = 2; + unitScaling = 1; + max = 10; + shieldScaling = 10f; effect = StatusEffects.overdrive; }}, @@ -86,17 +93,19 @@ public class DefaultWaves{ begin = 16; unitScaling = 1; spacing = 2; + shieldScaling = 20f; }}, - new SpawnGroup(dagger){{ + new SpawnGroup(quasar){{ begin = 82; spacing = 3; unitAmount = 4; unitScaling = 3; + shieldScaling = 30f; effect = StatusEffects.overdrive; }}, - new SpawnGroup(dagger){{ + new SpawnGroup(pulsar){{ begin = 41; spacing = 5; unitAmount = 1; @@ -110,6 +119,7 @@ public class DefaultWaves{ unitAmount = 2; unitScaling = 2; max = 20; + shieldScaling = 30; }}, new SpawnGroup(dagger){{ @@ -135,6 +145,7 @@ public class DefaultWaves{ unitAmount = 2; spacing = 2; unitScaling = 2; + shieldScaling = 20; }}, new SpawnGroup(flare){{ @@ -142,6 +153,8 @@ public class DefaultWaves{ unitAmount = 4; unitScaling = 3; spacing = 5; + shields = 100f; + shieldScaling = 10f; effect = StatusEffects.overdrive; }}, @@ -151,13 +164,15 @@ public class DefaultWaves{ unitScaling = 3; spacing = 5; max = 16; + shieldScaling = 30; }}, - new SpawnGroup(horizon){{ + new SpawnGroup(nova){{ begin = 53; unitAmount = 2; unitScaling = 3; spacing = 4; + shieldScaling = 20; }}, new SpawnGroup(atrax){{ @@ -165,6 +180,7 @@ public class DefaultWaves{ unitAmount = 4; unitScaling = 1; spacing = 3; + shieldScaling = 5f; }}, new SpawnGroup(scepter){{ @@ -172,6 +188,7 @@ public class DefaultWaves{ unitAmount = 1; unitScaling = 1; spacing = 30; + shieldScaling = 10f; }}, new SpawnGroup(reign){{ @@ -179,13 +196,32 @@ public class DefaultWaves{ unitAmount = 1; unitScaling = 1; spacing = 40; + shieldScaling = 20f; }}, new SpawnGroup(antumbra){{ - begin = 131; + begin = 120; unitAmount = 1; unitScaling = 1; spacing = 40; + shieldScaling = 20f; + }}, + + new SpawnGroup(vela){{ + begin = 100; + unitAmount = 1; + unitScaling = 1; + spacing = 30; + shieldScaling = 20f; + }}, + + new SpawnGroup(corvus){{ + begin = 145; + unitAmount = 1; + unitScaling = 1; + spacing = 35; + shieldScaling = 30f; + shields = 100; }}, new SpawnGroup(horizon){{ @@ -193,6 +229,17 @@ public class DefaultWaves{ unitAmount = 2; unitScaling = 3; spacing = 4; + shields = 40f; + shieldScaling = 20f; + }}, + + new SpawnGroup(atrax){{ + begin = 210; + unitAmount = 1; + unitScaling = 1; + spacing = 35; + shields = 1000; + shieldScaling = 35f; }} ); } @@ -200,7 +247,7 @@ public class DefaultWaves{ } //TODO move elsewhere - public static Seq generate(){ + public static Seq generate(float difficulty){ UnitType[][] species = { {dagger, mace, fortress, scepter, reign}, {nova, pulsar, quasar, vela, corvus}, @@ -216,58 +263,72 @@ public class DefaultWaves{ Seq out = new Seq<>(); //max reasonable wave, after which everything gets boring - int cap = 400; + int cap = 200; - //main sequence - float shieldStart = 30, shieldsPerWave = 12; - UnitType[] curSpecies = Structs.random(species); - int curTier = 0; + float shieldStart = 30, shieldsPerWave = 20 + difficulty*30f; - for(int i = 0; i < cap;){ - int f = i; - int next = Mathf.random(15, 25); + Intc createProgression = start -> { + //main sequence + UnitType[] curSpecies = Structs.random(species); + int curTier = 0; - float shieldAmount = Math.max((i - shieldStart) * shieldsPerWave, 0); + for(int i = start; i < cap;){ + int f = i; + int next = Mathf.random(8, 16); - //main progression - out.add(new SpawnGroup(curSpecies[Math.min(curTier, curSpecies.length - 1)]){{ - unitAmount = f == 0 ? 1 : 10; - begin = f; - end = f + next >= cap ? never : f + next; - max = 16; - unitScaling = Mathf.random(1f, 2f); - shields = shieldAmount; - shieldScaling = shieldsPerWave; - }}); + float shieldAmount = Math.max((i - shieldStart) * shieldsPerWave, 0); + int space = start == 0 ? 1 : Mathf.random(1, 2); - //extra progression that tails out, blends in - out.add(new SpawnGroup(curSpecies[Math.min(curTier, curSpecies.length - 1)]){{ - unitAmount = 6; - begin = f + next; - end = f + next + Mathf.random(8, 12); - max = 10; - unitScaling = Mathf.random(2f); - spacing = Mathf.random(2, 3); - shields = shieldAmount; - shieldScaling = shieldsPerWave; - }}); + //main progression + out.add(new SpawnGroup(curSpecies[Math.min(curTier, curSpecies.length - 1)]){{ + unitAmount = f == 0 ? 1 : 10; + begin = f; + end = f + next >= cap ? never : f + next; + max = 20; + unitScaling = Mathf.random(1f, 2f); + shields = shieldAmount; + shieldScaling = shieldsPerWave; + spacing = space; + }}); - i += next; - if(curTier < 3 || Mathf.chance(0.2)){ - curTier ++; + //extra progression that tails out, blends in + out.add(new SpawnGroup(curSpecies[Math.min(curTier, curSpecies.length - 1)]){{ + unitAmount = 6; + begin = f + next; + end = f + next + Mathf.random(8, 12); + max = 14; + unitScaling = Mathf.random(2f); + spacing = Mathf.random(2, 3); + shields = shieldAmount; + shieldScaling = shieldsPerWave; + }}); + + i += next; + if(curTier < 3 || Mathf.chance(0.2)){ + curTier ++; + } + + //do not spawn bosses + curTier = Math.min(curTier, 3); + + //small chance to switch species + if(Mathf.chance(0.3)){ + curSpecies = Structs.random(species); + } } + }; - //do not spawn bosses - curTier = Math.min(curTier, 3); + createProgression.get(0); - //small chance to switch species - if(Mathf.chance(0.3)){ - curSpecies = Structs.random(species); - } + int step = 5 + Mathf.random(3); + + while(step <= cap){ + createProgression.get(step); + step += (int)(Mathf.random(12, 25) * Mathf.lerp(1f, 0.4f, difficulty)); } - int bossWave = Mathf.random(30, 60); - int bossSpacing = Mathf.random(30, 50); + int bossWave = (int)(Mathf.random(30, 60) * Mathf.lerp(1f, 0.7f, difficulty)); + int bossSpacing = (int)(Mathf.random(25, 40) * Mathf.lerp(1f, 0.6f, difficulty)); //main boss progression out.add(new SpawnGroup(Structs.random(species)[4]){{ @@ -283,7 +344,7 @@ public class DefaultWaves{ //alt boss progression out.add(new SpawnGroup(Structs.random(species)[4]){{ unitAmount = 1; - begin = bossWave + Mathf.random(4, 6) * bossSpacing; + begin = bossWave + Mathf.random(3, 5) * bossSpacing; spacing = bossSpacing; end = never; max = 16; @@ -291,6 +352,14 @@ public class DefaultWaves{ shieldScaling = shieldsPerWave; }}); + //shift back waves on higher difficulty for a harder start + int shift = Math.max((int)(difficulty * 15 - 5), 0); + + for(SpawnGroup group : out){ + group.begin -= shift; + group.end -= shift; + } + return out; } } diff --git a/core/src/mindustry/game/Objectives.java b/core/src/mindustry/game/Objectives.java index 535f1d3e13..a4097c51fc 100644 --- a/core/src/mindustry/game/Objectives.java +++ b/core/src/mindustry/game/Objectives.java @@ -28,6 +28,7 @@ public class Objectives{ } } + //TODO fix public static class SectorComplete extends SectorObjective{ public SectorComplete(SectorPreset zone){ @@ -38,12 +39,12 @@ public class Objectives{ @Override public boolean complete(){ - return preset.sector.isCaptured(); + return preset.sector.save != null && preset.sector.save.meta.wave >= preset.sector.save.meta.rules.winWave; } @Override public String display(){ - return Core.bundle.format("requirement.capture", preset.localizedName); + return Core.bundle.format("requirement.wave", preset.sector.save == null ? "" : preset.sector.save.meta.rules.winWave, preset.localizedName); } } diff --git a/core/src/mindustry/game/Schematic.java b/core/src/mindustry/game/Schematic.java index 3aeb222d29..e539ae69a2 100644 --- a/core/src/mindustry/game/Schematic.java +++ b/core/src/mindustry/game/Schematic.java @@ -62,6 +62,10 @@ public class Schematic implements Publishable, Comparable{ return tags.get("name", "unknown"); } + public String description(){ + return tags.get("description", ""); + } + public void save(){ schematics.saveChanges(this); } @@ -90,7 +94,7 @@ public class Schematic implements Publishable, Comparable{ @Override public String steamDescription(){ - return null; + return description(); } @Override diff --git a/core/src/mindustry/game/SectorInfo.java b/core/src/mindustry/game/SectorInfo.java index dc56902c60..b66dc5bf95 100644 --- a/core/src/mindustry/game/SectorInfo.java +++ b/core/src/mindustry/game/SectorInfo.java @@ -10,6 +10,8 @@ import mindustry.world.*; import mindustry.world.blocks.storage.CoreBlock.*; import mindustry.world.modules.*; +import java.util.*; + import static mindustry.Vars.*; public class SectorInfo{ @@ -42,7 +44,15 @@ public class SectorInfo{ /** Counter refresh state. */ private transient Interval time = new Interval(); /** Core item storage to prevent spoofing. */ - private transient int[] lastCoreItems; + private transient int[] coreItemCounts; + + /** Handles core item changes. */ + public void handleCoreItem(Item item, int amount){ + if(coreItemCounts == null){ + coreItemCounts = new int[content.items().size]; + } + coreItemCounts[item.id] += amount; + } /** @return the real location items go when launched on this sector */ public Sector getRealDestination(){ @@ -105,12 +115,6 @@ public class SectorInfo{ universe.runTurn(); } - //create last stored core items - if(lastCoreItems == null){ - lastCoreItems = new int[content.items().size]; - updateCoreDeltas(); - } - CoreBuild ent = state.rules.defaultTeam.core(); //refresh throughput @@ -124,15 +128,16 @@ public class SectorInfo{ stat.loaded = true; } - //how the resources changed - only interested in negative deltas, since that's what happens during spoofing - int coreDelta = Math.min(ent == null ? 0 : ent.items.get(item) - lastCoreItems[item.id], 0); - //add counter, subtract how many items were taken from the core during this time - stat.means.add(Math.max(stat.counter + coreDelta, 0)); + stat.means.add(Math.max(stat.counter, 0)); stat.counter = 0; stat.mean = stat.means.rawMean(); }); + if(coreItemCounts == null){ + coreItemCounts = new int[content.items().size]; + } + //refresh core items for(Item item : content.items()){ ExportStat stat = production.get(item, ExportStat::new); @@ -143,21 +148,14 @@ public class SectorInfo{ //get item delta //TODO is preventing negative production a good idea? - int delta = Math.max((ent == null ? 0 : ent.items.get(item)) - lastCoreItems[item.id], 0); + int delta = Math.max(ent == null ? 0 : coreItemCounts[item.id], 0); //store means stat.means.add(delta); stat.mean = stat.means.rawMean(); } - updateCoreDeltas(); - } - } - - private void updateCoreDeltas(){ - CoreBuild ent = state.rules.defaultTeam.core(); - for(int i = 0; i < lastCoreItems.length; i++){ - lastCoreItems[i] = ent == null ? 0 : ent.items.get(i); + Arrays.fill(coreItemCounts, 0); } } diff --git a/core/src/mindustry/game/SpawnGroup.java b/core/src/mindustry/game/SpawnGroup.java index fda8514d48..f9ae7c74d3 100644 --- a/core/src/mindustry/game/SpawnGroup.java +++ b/core/src/mindustry/game/SpawnGroup.java @@ -1,5 +1,6 @@ package mindustry.game; +import arc.util.*; import arc.util.serialization.*; import arc.util.serialization.Json.*; import mindustry.content.*; @@ -27,7 +28,7 @@ public class SpawnGroup implements Serializable{ /** The spacing, in waves, of spawns. For example, 2 = spawns every other wave */ public int spacing = 1; /** Maximum amount of units that spawn */ - public int max = 100; + public int max = 40; /** How many waves need to pass before the amount of units spawned increases by 1 */ public float unitScaling = never; /** Shield points that this unit has. */ @@ -37,8 +38,10 @@ public class SpawnGroup implements Serializable{ /** Amount of enemies spawned initially, with no scaling */ public int unitAmount = 1; /** Status effect applied to the spawned unit. Null to disable. */ + @Nullable public StatusEffect effect; /** Items this unit spawns with. Null to disable. */ + @Nullable public ItemStack items; public SpawnGroup(UnitType type){ @@ -51,6 +54,7 @@ public class SpawnGroup implements Serializable{ /** Returns the amount of units spawned on a specific wave. */ public int getUnitsSpawned(int wave){ + if(spacing == 0) spacing = 1; if(wave < begin || wave > end || (wave - begin) % spacing != 0){ return 0; } @@ -84,12 +88,12 @@ public class SpawnGroup implements Serializable{ if(begin != 0) json.writeValue("begin", begin); if(end != never) json.writeValue("end", end); if(spacing != 1) json.writeValue("spacing", spacing); - //if(max != 40) json.writeValue("max", max); + if(max != 40) json.writeValue("max", max); if(unitScaling != never) json.writeValue("scaling", unitScaling); if(shields != 0) json.writeValue("shields", shields); if(shieldScaling != 0) json.writeValue("shieldScaling", shieldScaling); if(unitAmount != 1) json.writeValue("amount", unitAmount); - if(effect != null) json.writeValue("effect", effect.id); + if(effect != null) json.writeValue("effect", effect.name); } @Override @@ -101,12 +105,18 @@ public class SpawnGroup implements Serializable{ begin = data.getInt("begin", 0); end = data.getInt("end", never); spacing = data.getInt("spacing", 1); - //max = data.getInt("max", 40); + max = data.getInt("max", 40); unitScaling = data.getFloat("scaling", never); shields = data.getFloat("shields", 0); shieldScaling = data.getFloat("shieldScaling", 0); unitAmount = data.getInt("amount", 1); - effect = content.getByID(ContentType.status, data.getInt("effect", -1)); + + //old boss effect ID + if(data.has("effect") && data.get("effect").isNumber() && data.getInt("effect", -1) == 8){ + effect = StatusEffects.boss; + }else{ + effect = content.getByName(ContentType.status, data.has("effect") && data.get("effect").isString() ? data.getString("effect", "none") : "none"); + } } @Override diff --git a/core/src/mindustry/game/Universe.java b/core/src/mindustry/game/Universe.java index b2c9c7d039..892b93b731 100644 --- a/core/src/mindustry/game/Universe.java +++ b/core/src/mindustry/game/Universe.java @@ -140,8 +140,9 @@ public class Universe{ if(!sector.isBeingPlayed()){ sector.setSecondsPassed(sector.getSecondsPassed() + actuallyPassed); + //TODO sector damage disabled for now //check if the sector has been attacked too many times... - if(sector.hasBase() && sector.hasWaves() && sector.getSecondsPassed() * 60f > turnDuration * sectorDestructionTurns){ + /*if(sector.hasBase() && sector.hasWaves() && sector.getSecondsPassed() * 60f > turnDuration * sectorDestructionTurns){ //fire event for losing the sector Events.fire(new SectorLoseEvent(sector)); @@ -151,17 +152,17 @@ public class Universe{ //clear recieved sector.setExtraItems(new ItemSeq()); sector.save = null; - } + }*/ } //export to another sector if(sector.save != null && sector.save.meta != null && sector.save.meta.secinfo != null && sector.save.meta.secinfo.destination != null){ Sector to = sector.save.meta.secinfo.destination; if(to.save != null){ - ItemSeq items = to.getExtraItems(); + ItemSeq items = new ItemSeq(); //calculated exported items to this sector sector.save.meta.secinfo.export.each((item, stat) -> items.add(item, (int)(stat.mean * newSecondsPassed))); - to.setExtraItems(items); + to.addItems(items); } } diff --git a/core/src/mindustry/graphics/CacheLayer.java b/core/src/mindustry/graphics/CacheLayer.java index 3174c5d2a4..b0273799e4 100644 --- a/core/src/mindustry/graphics/CacheLayer.java +++ b/core/src/mindustry/graphics/CacheLayer.java @@ -51,6 +51,17 @@ public enum CacheLayer{ endShader(Shaders.slag); } }, + space{ + @Override + public void begin(){ + beginShader(); + } + + @Override + public void end(){ + endShader(Shaders.space); + } + }, normal(5), walls(3); diff --git a/core/src/mindustry/graphics/OverlayRenderer.java b/core/src/mindustry/graphics/OverlayRenderer.java index ea988e5e78..19569ed1a3 100644 --- a/core/src/mindustry/graphics/OverlayRenderer.java +++ b/core/src/mindustry/graphics/OverlayRenderer.java @@ -7,6 +7,7 @@ import arc.math.*; import arc.math.geom.*; import arc.util.*; import mindustry.*; +import mindustry.ai.types.*; import mindustry.gen.*; import mindustry.input.*; import mindustry.ui.*; @@ -151,6 +152,13 @@ public class OverlayRenderer{ input.drawOverSelect(); + if(ui.hudfrag.blockfrag.hover() instanceof Unit unit && unit.controller() instanceof LogicAI ai && ai.controller instanceof Building build){ + Drawf.square(build.x, build.y, build.block.size * tilesize/2f + 2f); + if(!unit.within(build, unit.hitSize * 2f)){ + Drawf.arrow(unit.x, unit.y, build.x, build.y, unit.hitSize *2f, 4f); + } + } + //draw selection overlay when dropping item if(input.isDroppingItem()){ Vec2 v = Core.input.mouseWorld(input.getMouseX(), input.getMouseY()); diff --git a/core/src/mindustry/graphics/Shaders.java b/core/src/mindustry/graphics/Shaders.java index f1390b5884..cefb7b1bab 100644 --- a/core/src/mindustry/graphics/Shaders.java +++ b/core/src/mindustry/graphics/Shaders.java @@ -19,7 +19,7 @@ public class Shaders{ public static UnitBuild build; public static DarknessShader darkness; public static LightShader light; - public static SurfaceShader water, mud, tar, slag; + public static SurfaceShader water, mud, tar, slag, space; public static PlanetShader planet; public static PlanetGridShader planetGrid; public static AtmosphereShader atmosphere; @@ -44,6 +44,7 @@ public class Shaders{ mud = new SurfaceShader("mud"); tar = new SurfaceShader("tar"); slag = new SurfaceShader("slag"); + space = new SpaceShader("space"); planet = new PlanetShader(); planetGrid = new PlanetGridShader(); atmosphere = new AtmosphereShader(); @@ -196,6 +197,34 @@ public class Shaders{ } } + //seed: 8kmfuix03fw + public static class SpaceShader extends SurfaceShader{ + Texture texture; + + public SpaceShader(String frag){ + super(frag); + + Core.assets.load("sprites/space.png", Texture.class).loaded = t -> { + texture = (Texture)t; + texture.setFilter(TextureFilter.linear); + texture.setWrap(TextureWrap.mirroredRepeat); + }; + } + + @Override + public void apply(){ + setUniformf("u_campos", Core.camera.position.x, Core.camera.position.y); + setUniformf("u_ccampos", Core.camera.position); + setUniformf("u_resolution", Core.graphics.getWidth(), Core.graphics.getHeight()); + setUniformf("u_time", Time.time()); + + texture.bind(1); + renderer.effectBuffer.getTexture().bind(0); + + setUniformi("u_stars", 1); + } + } + public static class SurfaceShader extends LoadShader{ public SurfaceShader(String frag){ @@ -225,7 +254,7 @@ public class Shaders{ public static class LoadShader extends Shader{ public LoadShader(String frag, String vert){ - super(Core.files.internal("shaders/" + vert + ".vert").readString(), Core.files.internal("shaders/" + frag + ".frag").readString()); + super(Core.files.internal("shaders/" + vert + ".vert"), Core.files.internal("shaders/" + frag + ".frag")); } } } diff --git a/core/src/mindustry/graphics/g3d/PlanetRenderer.java b/core/src/mindustry/graphics/g3d/PlanetRenderer.java index e0e76c0cee..e3eb74a7b5 100644 --- a/core/src/mindustry/graphics/g3d/PlanetRenderer.java +++ b/core/src/mindustry/graphics/g3d/PlanetRenderer.java @@ -23,10 +23,6 @@ public class PlanetRenderer implements Disposable{ shadowColor = new Color(0, 0, 0, 0.7f); private static final Seq points = new Seq<>(); - private static final PlanetInterfaceRenderer emptyRenderer = new PlanetInterfaceRenderer(){ - @Override public void renderSectors(Planet planet){} - @Override public void renderProjections(){} - }; /** Camera direction relative to the planet. Length is determined by zoom. */ public final Vec3 camPos = new Vec3(); diff --git a/core/src/mindustry/input/DesktopInput.java b/core/src/mindustry/input/DesktopInput.java index 0b21a2cea4..7099f254dd 100644 --- a/core/src/mindustry/input/DesktopInput.java +++ b/core/src/mindustry/input/DesktopInput.java @@ -176,7 +176,7 @@ public class DesktopInput extends InputHandler{ public void update(){ super.update(); - if(net.active() && Core.input.keyTap(Binding.player_list) && (scene.getKeyboardFocus() == null || scene.getKeyboardFocus().isDescendantOf(ui.listfrag.content))){ + if(net.active() && Core.input.keyTap(Binding.player_list) && (scene.getKeyboardFocus() == null || scene.getKeyboardFocus().isDescendantOf(ui.listfrag.content) || scene.getKeyboardFocus().isDescendantOf(ui.minimapfrag.elem))){ ui.listfrag.toggle(); } diff --git a/core/src/mindustry/input/InputHandler.java b/core/src/mindustry/input/InputHandler.java index 6b3509a052..eebe40e15b 100644 --- a/core/src/mindustry/input/InputHandler.java +++ b/core/src/mindustry/input/InputHandler.java @@ -124,7 +124,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{ @Remote(called = Loc.server, targets = Loc.both, forward = true) public static void requestItem(Player player, Building tile, Item item, int amount){ - if(player == null || tile == null || !tile.interactable(player.team()) || !player.within(tile, buildingRange)) return; + if(player == null || tile == null || !tile.interactable(player.team()) || !player.within(tile, buildingRange) || player.dead()) return; amount = Math.min(player.unit().maxAccepted(item), amount); int fa = amount; @@ -256,7 +256,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{ } @Remote(targets = Loc.both, called = Loc.server, forward = true, unreliable = true) - public static void rotateBlock(Player player, Building tile, boolean direction){ + public static void rotateBlock(@Nullable Player player, Building tile, boolean direction){ if(tile == null) return; if(net.server() && (!Units.canInteract(player, tile) || @@ -264,6 +264,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{ throw new ValidateException(player, "Player cannot rotate a block."); } + if(player != null) tile.lastAccessed = player.name; tile.rotation = Mathf.mod(tile.rotation + Mathf.sign(direction), 4); tile.updateProximity(); tile.noSleep(); @@ -271,7 +272,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{ @Remote(targets = Loc.both, forward = true, called = Loc.server) public static void transferInventory(Player player, Building tile){ - if(player == null || tile == null || !player.within(tile, buildingRange) || tile.items == null) return; + if(player == null || tile == null || !player.within(tile, buildingRange) || tile.items == null || player.dead()) return; if(net.server() && (player.unit().stack.amount <= 0 || !Units.canInteract(player, tile) || !netServer.admins.allowAction(player, ActionType.depositItem, tile.tile, action -> { @@ -531,6 +532,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{ }); }else{ lastSchematic.tags.put("name", text); + lastSchematic.tags.put("description", ""); schematics.add(lastSchematic); ui.showInfoFade("@schematic.saved"); ui.schematics.showInfo(lastSchematic); diff --git a/core/src/mindustry/io/TypeIO.java b/core/src/mindustry/io/TypeIO.java index 066ddc0efe..669cd65d53 100644 --- a/core/src/mindustry/io/TypeIO.java +++ b/core/src/mindustry/io/TypeIO.java @@ -290,12 +290,15 @@ public class TypeIO{ public static void writeController(Writes write, UnitController control){ //no real unit controller state is written, only the type - if(control instanceof Player){ + if(control instanceof Player p){ write.b(0); - write.i(((Player)control).id); - }else if(control instanceof FormationAI){ + write.i(p.id); + }else if(control instanceof FormationAI form){ write.b(1); - write.i(((FormationAI)control).leader.id); + write.i(form.leader.id); + }else if(control instanceof LogicAI logic && logic.controller != null){ + write.b(3); + write.i(logic.controller.pos()); }else{ write.b(2); } @@ -312,6 +315,19 @@ public class TypeIO{ }else if(type == 1){ //formation controller int id = read.i(); return prev instanceof FormationAI ? prev : new FormationAI(Groups.unit.getByID(id), null); + }else if(type == 3){ + int pos = read.i(); + if(prev instanceof LogicAI pai){ + pai.controller = world.build(pos); + return pai; + }else{ + //create new AI for assignment + LogicAI out = new LogicAI(); + //instantly time out when updated. + out.controlTimer = LogicAI.logicControlTimeout; + out.controller = world.build(pos); + return out; + } }else{ //there are two cases here: //1: prev controller was not a player, carry on diff --git a/core/src/mindustry/logic/LAssembler.java b/core/src/mindustry/logic/LAssembler.java index e355416427..4f72d121aa 100644 --- a/core/src/mindustry/logic/LAssembler.java +++ b/core/src/mindustry/logic/LAssembler.java @@ -52,6 +52,9 @@ public class LAssembler{ } } + //used as a special value for any environmental solid block + putConst("@solid", Blocks.stoneWall); + putConst("@air", Blocks.air); for(UnitType type : Vars.content.units()){ diff --git a/core/src/mindustry/logic/LExecutor.java b/core/src/mindustry/logic/LExecutor.java index f36a5d6a16..3bcfaf46ee 100644 --- a/core/src/mindustry/logic/LExecutor.java +++ b/core/src/mindustry/logic/LExecutor.java @@ -6,6 +6,7 @@ import arc.util.*; import arc.util.noise.*; import mindustry.*; import mindustry.ai.types.*; +import mindustry.content.*; import mindustry.ctype.*; import mindustry.entities.*; import mindustry.game.*; @@ -251,6 +252,11 @@ public class LExecutor{ case spawn -> { res = Geometry.findClosest(unit.x, unit.y, Vars.spawner.getSpawns()); } + case damaged -> { + Building b = Units.findDamagedTile(unit.team, unit.x, unit.y); + res = b == null ? null : b.tile; + build = true; + } } if(res != null && (!build || res.build != null)){ @@ -390,7 +396,9 @@ public class LExecutor{ if(exec.bool(p1)){ Unit result = Units.closest(unit.team, unit.x, unit.y, unit.type().hitSize * 2f, u -> u.isAI() && u.isGrounded() && pay.canPickup(u) && u.within(unit, u.hitSize + unit.hitSize * 1.2f)); - Call.pickedUnitPayload(unit, result); + if(result != null){ + Call.pickedUnitPayload(unit, result); + } }else{ //buildings Building tile = world.buildWorld(unit.x, unit.y); @@ -433,12 +441,16 @@ public class LExecutor{ } case getBlock -> { float x = exec.numf(p1), y = exec.numf(p2); - if(unit.within(x, y, unit.range())){ + float range = Math.max(unit.range(), buildingRange); + if(!unit.within(x, y, range)){ exec.setobj(p3, null); + exec.setnum(p4, 0); }else{ Tile tile = world.tileWorld(x, y); - Block block = tile == null || !tile.synthetic() ? null : tile.block(); + //any environmental solid block is returned as StoneWall, aka "@solid" + Block block = tile == null ? null : !tile.synthetic() ? (tile.solid() ? Blocks.stoneWall : Blocks.air) : tile.block(); exec.setobj(p3, block); + exec.setnum(p4, tile != null && tile.build != null ? tile.build.rotation : 0); } } case itemDrop -> { diff --git a/core/src/mindustry/logic/LLocate.java b/core/src/mindustry/logic/LLocate.java index 679136e74f..84da2321f9 100644 --- a/core/src/mindustry/logic/LLocate.java +++ b/core/src/mindustry/logic/LLocate.java @@ -3,7 +3,8 @@ package mindustry.logic; public enum LLocate{ ore, building, - spawn; + spawn, + damaged; public static final LLocate[] all = values(); } diff --git a/core/src/mindustry/logic/LStatements.java b/core/src/mindustry/logic/LStatements.java index a96adaf9d9..ba4d31e9a1 100644 --- a/core/src/mindustry/logic/LStatements.java +++ b/core/src/mindustry/logic/LStatements.java @@ -889,7 +889,7 @@ public class LStatements{ table.row(); } - case spawn -> { + case spawn, damaged -> { table.row(); } } diff --git a/core/src/mindustry/logic/LUnitControl.java b/core/src/mindustry/logic/LUnitControl.java index 879578e59b..2166b00690 100644 --- a/core/src/mindustry/logic/LUnitControl.java +++ b/core/src/mindustry/logic/LUnitControl.java @@ -15,7 +15,7 @@ public enum LUnitControl{ mine("x", "y"), flag("value"), build("x", "y", "block", "rotation"), - getBlock("x", "y", "result"), + getBlock("x", "y", "result", "resRot"), within("x", "y", "radius", "result"); public final String[] params; diff --git a/core/src/mindustry/maps/Map.java b/core/src/mindustry/maps/Map.java index edef90cea7..0fdc818139 100644 --- a/core/src/mindustry/maps/Map.java +++ b/core/src/mindustry/maps/Map.java @@ -98,7 +98,9 @@ public class Map implements Comparable, Publishable{ public Rules rules(Rules base){ try{ - Rules result = JsonIO.read(Rules.class, base, tags.get("rules", "{}")); + //this replacement is a MASSIVE hack but it fixes some incorrect overwriting of team-specific rules. + //may need to be tweaked later + Rules result = JsonIO.read(Rules.class, base, tags.get("rules", "{}").replace("teams:{2:{infiniteAmmo:true}},", "")); if(result.spawns.isEmpty()) result.spawns = Vars.defaultWaves.get(); return result; }catch(Exception e){ diff --git a/core/src/mindustry/maps/filters/DistortFilter.java b/core/src/mindustry/maps/filters/DistortFilter.java index 0d3691f1f7..32c8f18a14 100644 --- a/core/src/mindustry/maps/filters/DistortFilter.java +++ b/core/src/mindustry/maps/filters/DistortFilter.java @@ -3,7 +3,6 @@ package mindustry.maps.filters; import arc.util.*; import mindustry.maps.filters.FilterOption.*; import mindustry.world.*; -import mindustry.world.blocks.environment.*; public class DistortFilter extends GenerateFilter{ float scl = 40, mag = 5; @@ -27,6 +26,6 @@ public class DistortFilter extends GenerateFilter{ in.floor = tile.floor(); if(!tile.block().synthetic() && !in.block.synthetic()) in.block = tile.block(); - if(!((Floor)in.floor).isLiquid) in.ore = tile.overlay(); + in.ore = tile.overlay(); } } diff --git a/core/src/mindustry/maps/filters/GenerateFilter.java b/core/src/mindustry/maps/filters/GenerateFilter.java index 6d0f48d121..c884d5296e 100644 --- a/core/src/mindustry/maps/filters/GenerateFilter.java +++ b/core/src/mindustry/maps/filters/GenerateFilter.java @@ -20,7 +20,7 @@ public abstract class GenerateFilter{ apply(); tile.setFloor(in.floor.asFloor()); - tile.setOverlay(in.floor.asFloor().isLiquid ? Blocks.air : in.ore); + tile.setOverlay(!in.floor.asFloor().hasSurface() ? Blocks.air : in.ore); if(!tile.block().synthetic() && !in.block.synthetic()){ tile.setBlock(in.block); diff --git a/core/src/mindustry/maps/generators/BaseGenerator.java b/core/src/mindustry/maps/generators/BaseGenerator.java index 8a5120f59d..3a28078f74 100644 --- a/core/src/mindustry/maps/generators/BaseGenerator.java +++ b/core/src/mindustry/maps/generators/BaseGenerator.java @@ -4,6 +4,7 @@ import arc.func.*; import arc.math.*; import arc.math.geom.*; import arc.struct.*; +import arc.util.*; import mindustry.ai.BaseRegistry.*; import mindustry.content.*; import mindustry.game.*; @@ -12,7 +13,6 @@ import mindustry.gen.*; import mindustry.type.*; import mindustry.world.*; import mindustry.world.blocks.defense.*; -import mindustry.world.blocks.environment.*; import mindustry.world.blocks.power.*; import mindustry.world.blocks.production.*; import mindustry.world.meta.*; @@ -26,8 +26,6 @@ public class BaseGenerator{ private Tiles tiles; private Team team; - private ObjectMap ores = new ObjectMap<>(); - private ObjectMap oreFloors = new ObjectMap<>(); private Seq cores; public void generate(Tiles tiles, Seq cores, Tile spawn, Team team, Sector sector, float difficulty){ @@ -40,14 +38,6 @@ public class BaseGenerator{ Mathf.rand.setSeed(sector.id); - for(Block block : content.blocks()){ - if(block instanceof OreBlock && block.asFloor().itemDrop != null){ - ores.put(block.asFloor().itemDrop, (OreBlock)block); - }else if(block.isFloor() && block.asFloor().itemDrop != null && !oreFloors.containsKey(block.asFloor().itemDrop)){ - oreFloors.put(block.asFloor().itemDrop, block.asFloor()); - } - } - //TODO limit base size float costBudget = 1000; @@ -70,7 +60,7 @@ public class BaseGenerator{ for(Tile tile : cores){ tile.clearOverlay(); - Schematics.placeLoadout(coreschem.schematic, tile.x, tile.y, team, coreschem.required instanceof Item ? ores.get((Item)coreschem.required) : Blocks.oreCopper); + Schematics.placeLoadout(coreschem.schematic, tile.x, tile.y, team, coreschem.required instanceof Item ? bases.ores.get((Item)coreschem.required) : Blocks.oreCopper); //fill core with every type of item (even non-material) Building entity = tile.build; @@ -87,10 +77,10 @@ public class BaseGenerator{ || (tile.floor().liquidDrop != null && Mathf.chance(nonResourceChance * 2))) && Mathf.chance(resourceChance)){ Seq parts = bases.forResource(tile.drop() != null ? tile.drop() : tile.floor().liquidDrop); if(!parts.isEmpty()){ - tryPlace(parts.getFrac(bracket + Mathf.range(bracketRange)), tile.x, tile.y); + tryPlace(parts.getFrac(bracket + Mathf.range(bracketRange)), tile.x, tile.y, team); } }else if(Mathf.chance(nonResourceChance)){ - tryPlace(bases.parts.getFrac(bracket + Mathf.range(bracketRange)), tile.x, tile.y); + tryPlace(bases.parts.getFrac(bracket + Mathf.range(bracketRange)), tile.x, tile.y, team); } }); @@ -164,7 +154,19 @@ public class BaseGenerator{ core.circle(range, (x, y) -> cons.get(tiles.getn(x, y))); } - boolean tryPlace(BasePart part, int x, int y){ + /** + * Tries to place a base part at a certain location with a certain team. + * @return success state + * */ + public static boolean tryPlace(BasePart part, int x, int y, Team team){ + return tryPlace(part, x, y, team, null); + } + + /** + * Tries to place a base part at a certain location with a certain team. + * @return success state + * */ + public static boolean tryPlace(BasePart part, int x, int y, Team team, @Nullable Intc2 posc){ int rotation = Mathf.range(2); axis.set((int)(part.schematic.width / 2f), (int)(part.schematic.height / 2f)); Schematic result = Schematics.rotate(part.schematic, rotation); @@ -180,6 +182,10 @@ public class BaseGenerator{ if(isTaken(tile.block, realX, realY)){ return false; } + + if(posc != null){ + posc.get(realX, realY); + } } if(part.required instanceof Item item){ @@ -188,12 +194,12 @@ public class BaseGenerator{ tile.block.iterateTaken(tile.x + cx, tile.y + cy, (ex, ey) -> { - if(!tiles.getn(ex, ey).floor().isLiquid){ - set(tiles.getn(ex, ey), item); + if(world.tiles.getn(ex, ey).floor().hasSurface()){ + set(world.tiles.getn(ex, ey), item); } - Tile rand = tiles.getc(ex + Mathf.range(1), ey + Mathf.range(1)); - if(!rand.floor().isLiquid){ + Tile rand = world.tiles.getc(ex + Mathf.range(1), ey + Mathf.range(1)); + if(rand.floor().hasSurface()){ //random ores nearby to make it look more natural set(rand, item); } @@ -221,15 +227,15 @@ public class BaseGenerator{ return true; } - void set(Tile tile, Item item){ - if(ores.containsKey(item)){ - tile.setOverlay(ores.get(item)); - }else if(oreFloors.containsKey(item)){ - tile.setFloor(oreFloors.get(item)); + static void set(Tile tile, Item item){ + if(bases.ores.containsKey(item)){ + tile.setOverlay(bases.ores.get(item)); + }else if(bases.oreFloors.containsKey(item)){ + tile.setFloor(bases.oreFloors.get(item)); } } - boolean isTaken(Block block, int x, int y){ + static boolean isTaken(Block block, int x, int y){ int offsetx = -(block.size - 1) / 2; int offsety = -(block.size - 1) / 2; int pad = 1; @@ -245,8 +251,8 @@ public class BaseGenerator{ return false; } - boolean overlaps(int x, int y){ - Tile tile = tiles.get(x, y); + static boolean overlaps(int x, int y){ + Tile tile = world.tiles.get(x, y); return tile == null || !tile.block().alwaysReplace || world.getDarkness(x, y) > 0; } diff --git a/core/src/mindustry/maps/generators/BasicGenerator.java b/core/src/mindustry/maps/generators/BasicGenerator.java index 542f84cf29..e20350e6d3 100644 --- a/core/src/mindustry/maps/generators/BasicGenerator.java +++ b/core/src/mindustry/maps/generators/BasicGenerator.java @@ -69,7 +69,7 @@ public abstract class BasicGenerator implements WorldGenerator{ public void ores(Seq ores){ pass((x, y) -> { - if(floor.asFloor().isLiquid) return; + if(!floor.asFloor().hasSurface()) return; int offsetX = x - 4, offsetY = y + 23; for(int i = ores.size - 1; i >= 0; i--){ @@ -124,7 +124,7 @@ public abstract class BasicGenerator implements WorldGenerator{ Block[] blocks = {Blocks.darkPanel3}; int secSize = 20; pass((x, y) -> { - if(floor.asFloor().isLiquid) return; + if(!floor.asFloor().hasSurface()) return; int mx = x % secSize, my = y % secSize; int sclx = x / secSize, scly = y / secSize; diff --git a/core/src/mindustry/maps/generators/PlanetGenerator.java b/core/src/mindustry/maps/generators/PlanetGenerator.java index 6bbc15ed2f..2f0bd37058 100644 --- a/core/src/mindustry/maps/generators/PlanetGenerator.java +++ b/core/src/mindustry/maps/generators/PlanetGenerator.java @@ -1,6 +1,7 @@ package mindustry.maps.generators; import arc.math.geom.*; +import arc.struct.*; import arc.util.noise.*; import mindustry.graphics.g3d.*; import mindustry.graphics.g3d.PlanetGrid.*; @@ -8,6 +9,7 @@ import mindustry.type.*; import mindustry.world.*; public abstract class PlanetGenerator extends BasicGenerator implements HexMesher{ + protected IntSeq ints = new IntSeq(); protected Sector sector; /** Should generate sector bases for a planet. */ diff --git a/core/src/mindustry/maps/planet/SerpuloPlanetGenerator.java b/core/src/mindustry/maps/planet/SerpuloPlanetGenerator.java index 6c5f047a90..ee2f6b437c 100644 --- a/core/src/mindustry/maps/planet/SerpuloPlanetGenerator.java +++ b/core/src/mindustry/maps/planet/SerpuloPlanetGenerator.java @@ -7,6 +7,7 @@ import arc.struct.*; import arc.util.*; import arc.util.noise.*; import mindustry.ai.*; +import mindustry.ai.BaseRegistry.*; import mindustry.content.*; import mindustry.game.*; import mindustry.maps.generators.*; @@ -21,6 +22,7 @@ public class SerpuloPlanetGenerator extends PlanetGenerator{ float scl = 5f; float waterOffset = 0.07f; + //TODO fix sand near snow (sector 173) Block[][] arr = { {Blocks.water, Blocks.darksandWater, Blocks.darksand, Blocks.darksand, Blocks.darksand, Blocks.darksand, Blocks.sand, Blocks.sand, Blocks.sand, Blocks.sand, Blocks.darksandTaintedWater, Blocks.stone, Blocks.stone}, @@ -29,9 +31,9 @@ public class SerpuloPlanetGenerator extends PlanetGenerator{ {Blocks.water, Blocks.sandWater, Blocks.sand, Blocks.salt, Blocks.salt, Blocks.salt, Blocks.sand, Blocks.stone, Blocks.stone, Blocks.stone, Blocks.snow, Blocks.iceSnow, Blocks.ice}, {Blocks.deepwater, Blocks.water, Blocks.sandWater, Blocks.sand, Blocks.salt, Blocks.sand, Blocks.sand, Blocks.basalt, Blocks.snow, Blocks.snow, Blocks.snow, Blocks.snow, Blocks.ice}, {Blocks.deepwater, Blocks.water, Blocks.sandWater, Blocks.sand, Blocks.sand, Blocks.sand, Blocks.moss, Blocks.iceSnow, Blocks.snow, Blocks.snow, Blocks.ice, Blocks.snow, Blocks.ice}, - {Blocks.deepwater, Blocks.sandWater, Blocks.sand, Blocks.sand, Blocks.moss, Blocks.moss, Blocks.snow, Blocks.snow, Blocks.snow, Blocks.ice, Blocks.ice, Blocks.snow, Blocks.ice}, - {Blocks.taintedWater, Blocks.darksandTaintedWater, Blocks.darksand, Blocks.darksand, Blocks.basalt, Blocks.moss, Blocks.snow, Blocks.snow, Blocks.snow, Blocks.ice, Blocks.snow, Blocks.ice, Blocks.ice}, - {Blocks.darksandWater, Blocks.darksand, Blocks.darksand, Blocks.darksand, Blocks.moss, Blocks.sporeMoss, Blocks.snow, Blocks.snow, Blocks.snow, Blocks.snow, Blocks.snow, Blocks.ice, Blocks.ice}, + {Blocks.deepwater, Blocks.sandWater, Blocks.sand, Blocks.sand, Blocks.moss, Blocks.moss, Blocks.snow, Blocks.basalt, Blocks.basalt, Blocks.basalt, Blocks.ice, Blocks.snow, Blocks.ice}, + {Blocks.taintedWater, Blocks.darksandTaintedWater, Blocks.darksand, Blocks.darksand, Blocks.basalt, Blocks.moss, Blocks.basalt, Blocks.hotrock, Blocks.basalt, Blocks.ice, Blocks.snow, Blocks.ice, Blocks.ice}, + {Blocks.darksandWater, Blocks.darksand, Blocks.darksand, Blocks.darksand, Blocks.moss, Blocks.sporeMoss, Blocks.snow, Blocks.basalt, Blocks.basalt, Blocks.ice, Blocks.snow, Blocks.ice, Blocks.ice}, {Blocks.darksandWater, Blocks.darksand, Blocks.darksand, Blocks.sporeMoss, Blocks.ice, Blocks.ice, Blocks.snow, Blocks.snow, Blocks.snow, Blocks.snow, Blocks.ice, Blocks.ice, Blocks.ice}, {Blocks.taintedWater, Blocks.darksandTaintedWater, Blocks.darksand, Blocks.sporeMoss, Blocks.sporeMoss, Blocks.ice, Blocks.ice, Blocks.snow, Blocks.snow, Blocks.ice, Blocks.ice, Blocks.ice, Blocks.ice}, {Blocks.darksandTaintedWater, Blocks.darksandTaintedWater, Blocks.darksand, Blocks.sporeMoss, Blocks.moss, Blocks.sporeMoss, Blocks.iceSnow, Blocks.snow, Blocks.ice, Blocks.ice, Blocks.ice, Blocks.ice, Blocks.ice}, @@ -143,7 +145,7 @@ public class SerpuloPlanetGenerator extends PlanetGenerator{ float constraint = 1.3f; float radius = width / 2f / Mathf.sqrt3; int rooms = rand.random(2, 5); - Seq array = new Seq<>(); + Seq roomseq = new Seq<>(); for(int i = 0; i < rooms; i++){ Tmp.v1.trns(rand.random(360f), rand.random(radius / constraint)); @@ -151,7 +153,7 @@ public class SerpuloPlanetGenerator extends PlanetGenerator{ float ry = (height/2f + Tmp.v1.y); float maxrad = radius - Tmp.v1.len(); float rrad = Math.min(rand.random(9f, maxrad / 2f), 30f); - array.add(new Room((int)rx, (int)ry, (int)rrad)); + roomseq.add(new Room((int)rx, (int)ry, (int)rrad)); } //check positions on the map to place the player spawn. this needs to be in the corner of the map @@ -180,13 +182,13 @@ public class SerpuloPlanetGenerator extends PlanetGenerator{ } if(waterTiles <= 4 || (i + angleStep >= 360)){ - array.add(spawn = new Room(cx, cy, rand.random(8, 15))); + roomseq.add(spawn = new Room(cx, cy, rand.random(8, 15))); for(int j = 0; j < enemySpawns; j++){ float enemyOffset = rand.range(60f); Tmp.v1.set(cx - width/2, cy - height/2).rotate(180f + enemyOffset).add(width/2, height/2); Room espawn = new Room((int)Tmp.v1.x, (int)Tmp.v1.y, rand.random(8, 15)); - array.add(espawn); + roomseq.add(espawn); enemies.add(espawn); } @@ -194,16 +196,16 @@ public class SerpuloPlanetGenerator extends PlanetGenerator{ } } - for(Room room : array){ + for(Room room : roomseq){ erase(room.x, room.y, room.radius); } int connections = rand.random(Math.max(rooms - 1, 1), rooms + 3); for(int i = 0; i < connections; i++){ - array.random(rand).connect(array.random(rand)); + roomseq.random(rand).connect(roomseq.random(rand)); } - for(Room room : array){ + for(Room room : roomseq){ spawn.connect(room); } @@ -236,7 +238,7 @@ public class SerpuloPlanetGenerator extends PlanetGenerator{ } pass((x, y) -> { - if(floor.asFloor().isLiquid) return; + if(!floor.asFloor().hasSurface()) return; int offsetX = x - 4, offsetY = y + 23; for(int i = ores.size - 1; i >= 0; i--){ @@ -250,10 +252,6 @@ public class SerpuloPlanetGenerator extends PlanetGenerator{ } }); - for(Room espawn : enemies){ - tiles.getn(espawn.x, espawn.y).setOverlay(Blocks.spawn); - } - trimDark(); median(2); @@ -261,40 +259,168 @@ public class SerpuloPlanetGenerator extends PlanetGenerator{ tech(); pass((x, y) -> { - if(floor == Blocks.sporeMoss && rand.chance(0.9)){ - floor = Blocks.moss; - } - - //random stuff - - for(int i = 0; i < 4; i++){ - Tile near = world.tile(x + Geometry.d4[i].x, y + Geometry.d4[i].y); - if(near != null && near.block() != Blocks.air){ - return; + //random moss + if(floor == Blocks.sporeMoss){ + if(Math.abs(0.5f - noise(x - 90, y, 4, 0.8, 65)) > 0.02){ + floor = Blocks.moss; } } - if(rand.chance(0.01) && !floor.asFloor().isLiquid && block == Blocks.air){ - block = dec.get(floor, floor.asFloor().decoration); + //tar + if(floor == Blocks.darksand){ + if(Math.abs(0.5f - noise(x - 40, y, 2, 0.7, 80)) > 0.25f && + Math.abs(0.5f - noise(x, y + sector.id*10, 1, 1, 60)) > 0.41f && !(roomseq.contains(r -> Mathf.within(x, y, r.x, r.y, 15)))){ + floor = Blocks.tar; + ore = Blocks.air; + } + } + + //hotrock tweaks + if(floor == Blocks.hotrock){ + if(rand.chance(0.3)){ + floor = Blocks.basalt; + }else{ + ore = Blocks.air; + boolean all = true; + for(Point2 p : Geometry.d4){ + Tile other = tiles.get(x + p.x, y + p.y); + if(other == null || (other.floor() != Blocks.hotrock && other.floor() != Blocks.magmarock)){ + all = false; + } + } + if(all){ + floor = Blocks.magmarock; + } + } + } + + if(rand.chance(0.0075)){ + //random spore trees + boolean any = false; + boolean all = true; + for(Point2 p : Geometry.d4){ + Tile other = tiles.get(x + p.x, y + p.y); + if(other != null && other.block() == Blocks.air){ + any = true; + }else{ + all = false; + } + } + if(any && ((block == Blocks.snowWall || block == Blocks.iceWall) || (all && block == Blocks.air && floor == Blocks.snow && rand.chance(0.03)))){ + block = rand.chance(0.5) ? Blocks.whiteTree : Blocks.whiteTreeDead; + } + } + + //random stuff + dec: { + for(int i = 0; i < 4; i++){ + Tile near = world.tile(x + Geometry.d4[i].x, y + Geometry.d4[i].y); + if(near != null && near.block() != Blocks.air){ + break dec; + } + } + + if(rand.chance(0.01) && floor.asFloor().hasSurface() && block == Blocks.air){ + block = dec.get(floor, floor.asFloor().decoration); + } } }); + float difficulty = sector.baseCoverage; + ints.clear(); + ints.ensureCapacity(width * height / 4); + + int ruinCount = rand.random(-2, 4); + if(ruinCount > 0){ + int padding = 25; + + //create list of potential positions + for(int x = padding; x < width - padding; x++){ + for(int y = padding; y < height - padding; y++){ + Tile tile = tiles.getn(x, y); + if(!tile.solid() && (tile.drop() != null || tile.floor().liquidDrop != null)){ + ints.add(tile.pos()); + } + } + } + + ints.shuffle(rand); + + int placed = 0; + float diffRange = 0.4f; + //try each position + for(int i = 0; i < ints.size && placed < ruinCount; i++){ + int val = ints.items[i]; + int x = Point2.x(val), y = Point2.y(val); + + //do not overwrite player spawn + if(Mathf.within(x, y, spawn.x, spawn.y, 18f)){ + continue; + } + + float range = difficulty + rand.random(diffRange); + + Tile tile = tiles.getn(x, y); + BasePart part = null; + if(tile.overlay().itemDrop != null){ + part = bases.forResource(tile.drop()).getFrac(range); + }else if(tile.floor().liquidDrop != null && rand.chance(0.05)){ + part = bases.forResource(tile.floor().liquidDrop).getFrac(range); + }else if(rand.chance(0.05)){ //ore-less parts are less likely to occur. + part = bases.parts.getFrac(range); + } + + //actually place the part + if(part != null && BaseGenerator.tryPlace(part, x, y, Team.derelict, (cx, cy) -> { + Tile other = tiles.getn(cx, cy); + other.setOverlay(Blocks.oreScrap); + for(int j = 1; j <= 2; j++){ + for(Point2 p : Geometry.d8){ + Tile t = tiles.get(cx + p.x*j, cy + p.y*j); + if(t != null && t.floor().hasSurface() && rand.chance(j == 1 ? 0.4 : 0.2)){ + t.setOverlay(Blocks.oreScrap); + } + } + } + })){ + placed ++; + + int debrisRadius = Math.max(part.schematic.width, part.schematic.height)/2 + 3; + Geometry.circle(x, y, tiles.width, tiles.height, debrisRadius, (cx, cy) -> { + float dst = Mathf.dst(cx, cy, x, y); + float removeChance = Mathf.lerp(0.05f, 0.5f, dst / debrisRadius); + + Tile other = tiles.getn(cx, cy); + if(other.build != null && other.isCenter()){ + if(other.team() == Team.derelict && rand.chance(removeChance)){ + other.remove(); + }else if(rand.chance(0.5)){ + other.build.health = other.build.health - rand.random(other.build.health * 0.9f); + } + } + }); + } + } + } + Schematics.placeLaunchLoadout(spawn.x, spawn.y); - float difficulty = sector.baseCoverage; + for(Room espawn : enemies){ + tiles.getn(espawn.x, espawn.y).setOverlay(Blocks.spawn); + } if(sector.hasEnemyBase()){ basegen.generate(tiles, enemies.map(r -> tiles.getn(r.x, r.y)), tiles.get(spawn.x, spawn.y), state.rules.waveTeam, sector, difficulty); state.rules.attackMode = true; }else{ - state.rules.winWave = 15 * (int)Math.max(difficulty * 5, 1); + state.rules.winWave = 15 * (int)Math.max(difficulty * 10, 1); } state.rules.waves = true; //TODO better waves - state.rules.spawns = defaultWaves.get(); + state.rules.spawns = DefaultWaves.generate(difficulty); } @Override diff --git a/core/src/mindustry/mod/ContentParser.java b/core/src/mindustry/mod/ContentParser.java index 45faf7449c..b9c119ee32 100644 --- a/core/src/mindustry/mod/ContentParser.java +++ b/core/src/mindustry/mod/ContentParser.java @@ -318,8 +318,8 @@ public class ContentParser{ private TypeParser parser(ContentType type, Func constructor){ return (mod, name, value) -> { T item; - if(Vars.content.getByName(type, name) != null){ - item = (T)Vars.content.getByName(type, name); + if(locate(type, name) != null){ + item = (T)locate(type, name); readBundle(type, name, value); }else{ readBundle(type, name, value); @@ -553,63 +553,12 @@ public class ContentParser{ private void readFields(Object object, JsonValue jsonMap, boolean stripType){ if(stripType) jsonMap.remove("type"); - - if(object instanceof UnlockableContent unlock){ - JsonValue research = jsonMap.getChild("research"); - //add research tech node - if(research != null){ - String researchName; - ItemStack[] customRequirements; - - //research can be a single string or an object with parent and requirements - if(research.isString()){ - researchName = research.asString(); - customRequirements = null; - }else{ - researchName = research.getString("parent"); - customRequirements = research.hasChild("requirements") ? parser.readValue(ItemStack[].class, research.getChild("requirements")) : null; - } - - //remove old node - TechNode lastNode = TechTree.all.find(t -> t.content == unlock); - if(lastNode != null){ - lastNode.remove(); - } - - TechNode node = new TechNode(null, unlock, customRequirements == null ? unlock.researchRequirements() : customRequirements); - LoadedMod cur = currentMod; - - postreads.add(() -> { - currentContent = unlock; - currentMod = cur; - - //remove old node from parent - if(node.parent != null){ - node.parent.children.remove(node); - } - - - //find parent node. - TechNode parent = TechTree.all.find(t -> t.content.name.equals(researchName) || t.content.name.equals(currentMod.name + "-" + researchName)); - - if(parent == null){ - throw new IllegalArgumentException("Content '" + researchName + "' isn't in the tech tree, but '" + unlock.name + "' requires it to be researched."); - } - - //add this node to the parent - if(!parent.children.contains(node)){ - parent.children.add(node); - } - //reparent the node - node.parent = parent; - }); - - } - } readFields(object, jsonMap); } void readFields(Object object, JsonValue jsonMap){ + JsonValue research = jsonMap.remove("research"); + toBeParsed.remove(object); Class type = object.getClass(); ObjectMap fields = parser.getFields(type); @@ -640,6 +589,57 @@ public class ContentParser{ throw ex; } } + + + if(object instanceof UnlockableContent unlock && research != null){ + + //add research tech node + String researchName; + ItemStack[] customRequirements; + + //research can be a single string or an object with parent and requirements + if(research.isString()){ + researchName = research.asString(); + customRequirements = null; + }else{ + researchName = research.getString("parent"); + customRequirements = research.has("requirements") ? parser.readValue(ItemStack[].class, research.get("requirements")) : null; + } + + //remove old node + TechNode lastNode = TechTree.all.find(t -> t.content == unlock); + if(lastNode != null){ + lastNode.remove(); + } + + TechNode node = new TechNode(null, unlock, customRequirements == null ? unlock.researchRequirements() : customRequirements); + LoadedMod cur = currentMod; + + postreads.add(() -> { + currentContent = unlock; + currentMod = cur; + + //remove old node from parent + if(node.parent != null){ + node.parent.children.remove(node); + } + + + //find parent node. + TechNode parent = TechTree.all.find(t -> t.content.name.equals(researchName) || t.content.name.equals(currentMod.name + "-" + researchName)); + + if(parent == null){ + throw new IllegalArgumentException("Content '" + researchName + "' isn't in the tech tree, but '" + unlock.name + "' requires it to be researched."); + } + + //add this node to the parent + if(!parent.children.contains(node)){ + parent.children.add(node); + } + //reparent the node + node.parent = parent; + }); + } } /** Tries to resolve a class from a list of potential class names. */ diff --git a/core/src/mindustry/type/Sector.java b/core/src/mindustry/type/Sector.java index 6d042296d1..4c1df28945 100644 --- a/core/src/mindustry/type/Sector.java +++ b/core/src/mindustry/type/Sector.java @@ -8,6 +8,7 @@ import arc.util.*; import mindustry.*; import mindustry.game.Saves.*; import mindustry.graphics.g3d.PlanetGrid.*; +import mindustry.world.modules.*; import static mindustry.Vars.*; @@ -143,9 +144,17 @@ public class Sector{ } public void removeItem(Item item, int amount){ + ItemSeq seq = new ItemSeq(); + seq.add(item, -amount); + addItems(seq); + } + + public void addItems(ItemSeq items){ if(isBeingPlayed()){ if(state.rules.defaultTeam.core() != null){ - state.rules.defaultTeam.items().remove(item, amount); + ItemModule storage = state.rules.defaultTeam.items(); + int cap = state.rules.defaultTeam.core().storageCapacity; + items.each((item, amount) -> storage.add(item, Math.min(cap - storage.get(item), amount))); } }else{ ItemSeq recv = getExtraItems(); @@ -170,7 +179,7 @@ public class Sector{ }); } - recv.remove(item, amount); + recv.add(items); setExtraItems(recv); } diff --git a/core/src/mindustry/type/StatusEffect.java b/core/src/mindustry/type/StatusEffect.java index fda8dbbbf2..eb0bedb60c 100644 --- a/core/src/mindustry/type/StatusEffect.java +++ b/core/src/mindustry/type/StatusEffect.java @@ -13,8 +13,8 @@ import mindustry.gen.*; public class StatusEffect extends MappableContent{ /** Damage dealt by the unit with the effect. */ public float damageMultiplier = 1f; - /** Unit armor multiplier. */ - public float armorMultiplier = 1f; + /** Unit health multiplier. */ + public float healthMultiplier = 1f; /** Unit speed multiplier */ public float speedMultiplier = 1f; /** Unit speed multiplier */ diff --git a/core/src/mindustry/ui/dialogs/CustomRulesDialog.java b/core/src/mindustry/ui/dialogs/CustomRulesDialog.java index e14629b594..42fac7be72 100644 --- a/core/src/mindustry/ui/dialogs/CustomRulesDialog.java +++ b/core/src/mindustry/ui/dialogs/CustomRulesDialog.java @@ -24,8 +24,8 @@ import static arc.util.Time.*; import static mindustry.Vars.*; public class CustomRulesDialog extends BaseDialog{ - private Table main; Rules rules; + private Table main; private Prov resetter; private LoadoutDialog loadoutDialog; private BaseDialog banDialog; @@ -166,7 +166,7 @@ public class CustomRulesDialog extends BaseDialog{ title("@rules.title.enemy"); check("@rules.attack", b -> rules.attackMode = b, () -> rules.attackMode); - check("@rules.buildai", b -> rules.waveTeam.rules().ai = b, () -> rules.waveTeam.rules().ai); + check("@rules.buildai", b -> rules.teams.get(rules.waveTeam).ai = rules.teams.get(rules.waveTeam).infiniteResources = b, () -> rules.teams.get(rules.waveTeam).ai); number("@rules.enemycorebuildradius", f -> rules.enemyCoreBuildRadius = f * tilesize, () -> Math.min(rules.enemyCoreBuildRadius / tilesize, 200)); title("@rules.title.environment"); diff --git a/core/src/mindustry/ui/dialogs/ModsDialog.java b/core/src/mindustry/ui/dialogs/ModsDialog.java index 4695091886..866c3460e4 100644 --- a/core/src/mindustry/ui/dialogs/ModsDialog.java +++ b/core/src/mindustry/ui/dialogs/ModsDialog.java @@ -107,11 +107,13 @@ public class ModsDialog extends BaseDialog{ Core.settings.put("lastmod", text); ui.loadfrag.show(); - // Try to download the 6.0 branch first, but if it doesnt exist try master. + //Try to download the 6.0 branch first, but if it doesn't exist try master. githubImport("6.0", text, e1 -> { githubImport("master", text, e2 -> { - ui.showErrorMessage(Core.bundle.format("connectfail", e2)); - ui.loadfrag.hide(); + githubImport("main", text, e3 -> { + ui.showErrorMessage(Core.bundle.format("connectfail", e2)); + ui.loadfrag.hide(); + }); }); }); }); diff --git a/core/src/mindustry/ui/dialogs/PausedDialog.java b/core/src/mindustry/ui/dialogs/PausedDialog.java index 559450a591..f09e2fe185 100644 --- a/core/src/mindustry/ui/dialogs/PausedDialog.java +++ b/core/src/mindustry/ui/dialogs/PausedDialog.java @@ -35,17 +35,18 @@ public class PausedDialog extends BaseDialog{ if(!mobile){ //TODO localize - cont.label(() -> state.getSector() == null ? "" : - ("[lightgray]Next turn in [accent]" + state.getSector().displayTimeRemaining() + - (state.rules.winWave > 0 && !state.getSector().isCaptured() ? "\n[lightgray]Reach wave[accent] " + state.rules.winWave + "[] to capture" : ""))) - .visible(() -> state.getSector() != null).colspan(2); + //TODO capturing is disabled, remove? + //cont.label(() -> state.getSector() == null ? "" : + //("[lightgray]Next turn in [accent]" + state.getSector().displayTimeRemaining() + + // (state.rules.winWave > 0 && !state.getSector().isCaptured() ? "\n[lightgray]Reach wave[accent] " + state.rules.winWave + "[] to capture" : ""))) + // .visible(() -> state.getSector() != null).colspan(2); cont.row(); float dw = 220f; cont.defaults().width(dw).height(55).pad(5f); - cont.button("@back", Icon.left, this::hide); - cont.button("@settings", Icon.settings, ui.settings::show); + cont.button("@back", Icon.left, this::hide).name("back"); + cont.button("@settings", Icon.settings, ui.settings::show).name("settings"); if(!state.rules.tutorial){ if(!state.isCampaign() && !state.isEditor()){ diff --git a/core/src/mindustry/ui/dialogs/PlanetDialog.java b/core/src/mindustry/ui/dialogs/PlanetDialog.java index b230f08a4f..dd63a1afeb 100644 --- a/core/src/mindustry/ui/dialogs/PlanetDialog.java +++ b/core/src/mindustry/ui/dialogs/PlanetDialog.java @@ -29,18 +29,21 @@ import static mindustry.graphics.g3d.PlanetRenderer.*; import static mindustry.ui.dialogs.PlanetDialog.Mode.*; public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{ - final FrameBuffer buffer = new FrameBuffer(2, 2, true); - final PlanetRenderer planets = renderer.planets; - final LaunchLoadoutDialog loadouts = new LaunchLoadoutDialog(); - final Table stable = new Table().background(Styles.black3); + //if true, enables launching anywhere for testing + public static boolean debugSelect = false; - int launchRange; - float zoom = 1f, selectAlpha = 1f; - @Nullable Sector selected, hovered, launchSector; - CoreBuild launcher; - Mode mode = look; - boolean launching; - Cons listener = s -> {}; + public final FrameBuffer buffer = new FrameBuffer(2, 2, true); + public final PlanetRenderer planets = renderer.planets; + public final LaunchLoadoutDialog loadouts = new LaunchLoadoutDialog(); + public final Table stable = new Table().background(Styles.black3); + + public int launchRange; + public float zoom = 1f, selectAlpha = 1f; + public @Nullable Sector selected, hovered, launchSector; + public CoreBuild launcher; + public Mode mode = look; + public boolean launching; + public Cons listener = s -> {}; public PlanetDialog(){ super("", Styles.fullDialog); @@ -149,25 +152,27 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{ public void renderSectors(Planet planet){ //draw all sector stuff - for(Sector sec : planet.sectors){ + if(!debugSelect){ + for(Sector sec : planet.sectors){ - if(selectAlpha > 0.01f){ - if(canSelect(sec) || sec.unlocked()){ - if(sec.baseCoverage > 0){ - planets.fill(sec, Tmp.c1.set(Team.crux.color).a(0.5f * sec.baseCoverage * selectAlpha), -0.002f); + if(selectAlpha > 0.01f){ + if(canSelect(sec) || sec.unlocked()){ + if(sec.baseCoverage > 0){ + planets.fill(sec, Tmp.c1.set(Team.crux.color).a(0.5f * sec.baseCoverage * selectAlpha), -0.002f); + } + + Color color = + sec.hasBase() ? Team.sharded.color : + sec.preset != null ? Team.derelict.color : + sec.hasEnemyBase() ? Team.crux.color : + null; + + if(color != null){ + planets.drawSelection(sec, Tmp.c1.set(color).mul(0.8f).a(selectAlpha), 0.026f, -0.001f); + } + }else{ + planets.fill(sec, Tmp.c1.set(shadowColor).mul(1, 1, 1, selectAlpha), -0.001f); } - - Color color = - sec.hasBase() ? Team.sharded.color : - sec.preset != null ? Team.derelict.color : - sec.hasEnemyBase() ? Team.crux.color : - null; - - if(color != null){ - planets.drawSelection(sec, Tmp.c1.set(color).mul(0.8f).a(selectAlpha), 0.026f, -0.001f); - } - }else{ - planets.fill(sec, Tmp.c1.set(shadowColor).mul(1, 1, 1, selectAlpha), -0.001f); } } } @@ -232,7 +237,6 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{ cont.clear(); titleTable.remove(); - cont.stack( new Element(){ { @@ -240,7 +244,7 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{ addListener(new ElementGestureListener(){ @Override public void tap(InputEvent event, float x, float y, int count, KeyCode button){ - if(hovered != null && (mode == launch ? canSelect(hovered) && hovered != launchSector : hovered.unlocked())){ + if(hovered != null && ((mode == launch ? canSelect(hovered) && hovered != launchSector : hovered.unlocked()) || debugSelect)){ selected = hovered; } @@ -258,9 +262,10 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{ } }, new Table(t -> { + t.touchable = Touchable.disabled; //TODO localize t.top(); - t.label(() -> mode == select ? "@sectors.select" : mode == launch ? "Select Launch Sector" : "Turn " + universe.turn()).style(Styles.outlineLabel).color(Pal.accent); + t.label(() -> mode == select ? "@sectors.select" : mode == launch ? "Select Launch Sector" : "").style(Styles.outlineLabel).color(Pal.accent); })).grow(); } @@ -333,6 +338,8 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{ stable.add("[accent]Difficulty: " + (int)(sector.baseCoverage * 10)).row(); } + //TODO sector damage is disabled, remove when finalized + /* if(sector.hasBase() && sector.hasWaves()){ //TODO localize when finalized //these mechanics are likely to change and as such are not added to the bundle @@ -340,7 +347,7 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{ stable.row(); stable.add("[accent]" + Mathf.ceil(sectorDestructionTurns - (sector.getSecondsPassed() * 60) / turnDuration) + " turn(s)\nuntil destruction"); stable.row(); - } + }*/ if(sector.save != null){ stable.add("@sectors.resources").row(); @@ -403,7 +410,7 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{ stable.row(); - if((sector.hasBase() && mode == look) || canSelect(sector) || (sector.preset != null && sector.preset.alwaysUnlocked)){ + if((sector.hasBase() && mode == look) || canSelect(sector) || (sector.preset != null && sector.preset.alwaysUnlocked) || debugSelect){ stable.button(mode == select ? "@sectors.select" : sector.hasBase() ? "@sectors.resume" : "@sectors.launch", Styles.transt, () -> { boolean shouldHide = true; @@ -463,7 +470,7 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{ stable.act(0f); } - enum Mode{ + public enum Mode{ /** Look around for existing sectors. Can only deploy. */ look, /** Launch to a new location. */ diff --git a/core/src/mindustry/ui/dialogs/ResearchDialog.java b/core/src/mindustry/ui/dialogs/ResearchDialog.java index a87aa2d55c..9c5e6fd3ed 100644 --- a/core/src/mindustry/ui/dialogs/ResearchDialog.java +++ b/core/src/mindustry/ui/dialogs/ResearchDialog.java @@ -31,14 +31,14 @@ import java.util.*; import static mindustry.Vars.*; public class ResearchDialog extends BaseDialog{ - final float nodeSize = Scl.scl(60f); - ObjectSet nodes = new ObjectSet<>(); - TechTreeNode root = new TechTreeNode(TechTree.root, null); - Rect bounds = new Rect(); - ItemsDisplay itemDisplay; - View view; + public final float nodeSize = Scl.scl(60f); + public ObjectSet nodes = new ObjectSet<>(); + public TechTreeNode root = new TechTreeNode(TechTree.root, null); + public Rect bounds = new Rect(); + public ItemsDisplay itemDisplay; + public View view; - ItemSeq items; + public ItemSeq items; public ResearchDialog(){ super(""); @@ -114,7 +114,7 @@ public class ResearchDialog extends BaseDialog{ buttons.button("@database", Icon.book, () -> { hide(); ui.database.show(); - }).size(210f, 64f); + }).size(210f, 64f).name("database"); //scaling/drag input addListener(new InputListener(){ @@ -250,7 +250,7 @@ public class ResearchDialog extends BaseDialog{ return node.content.unlocked() || !node.objectives.contains(i -> !i.complete()); } - void showToast(String info){ + public void showToast(String info){ Table table = new Table(); table.actions(Actions.fadeOut(0.5f, Interp.fade), Actions.remove()); table.top().add(info); @@ -279,11 +279,11 @@ public class ResearchDialog extends BaseDialog{ } } - class TechTreeNode extends TreeNode{ - final TechNode node; - boolean visible = true, selectable = true; + public class TechTreeNode extends TreeNode{ + public final TechNode node; + public boolean visible = true, selectable = true; - TechTreeNode(TechNode node, TechTreeNode parent){ + public TechTreeNode(TechNode node, TechTreeNode parent){ this.node = node; this.parent = parent; this.width = this.height = nodeSize; @@ -297,11 +297,11 @@ public class ResearchDialog extends BaseDialog{ } } - class View extends Group{ - float panX = 0, panY = -200, lastZoom = -1; - boolean moved = false; - ImageButton hoverNode; - Table infoTable = new Table(); + public class View extends Group{ + public float panX = 0, panY = -200, lastZoom = -1; + public boolean moved = false; + public ImageButton hoverNode; + public Table infoTable = new Table(); { infoTable.touchable = Touchable.enabled; @@ -400,7 +400,8 @@ public class ResearchDialog extends BaseDialog{ } } - return false; + //can always spend when locked + return node.content.locked(); } void spend(TechNode node){ @@ -414,7 +415,7 @@ public class ResearchDialog extends BaseDialog{ ItemStack completed = node.finishedRequirements[i]; //amount actually taken from inventory - int used = Math.min(req.amount - completed.amount, items.get(req.item)); + int used = Math.max(Math.min(req.amount - completed.amount, items.get(req.item)), 0); items.remove(req.item, used); completed.amount += used; diff --git a/core/src/mindustry/ui/dialogs/SchematicsDialog.java b/core/src/mindustry/ui/dialogs/SchematicsDialog.java index 99a087d39f..8c99272e89 100644 --- a/core/src/mindustry/ui/dialogs/SchematicsDialog.java +++ b/core/src/mindustry/ui/dialogs/SchematicsDialog.java @@ -4,6 +4,7 @@ import arc.*; import arc.graphics.*; import arc.graphics.Texture.*; import arc.graphics.g2d.*; +import arc.input.*; import arc.math.*; import arc.scene.style.*; import arc.scene.ui.*; @@ -106,18 +107,36 @@ public class SchematicsDialog extends BaseDialog{ }); buttons.button(Icon.pencil, style, () -> { - ui.showTextInput("@schematic.rename", "@name", s.name(), res -> { - Schematic replacement = schematics.all().find(other -> other.name().equals(res) && other != s); - if(replacement != null){ - //renaming to an existing schematic is not allowed, as it is not clear how the tags would be merged, and which one should be removed - ui.showErrorMessage("@schematic.exists"); - return; - } + new Dialog("@schematic.rename"){{ + cont.margin(30).add("@name").padRight(6f); + TextField nameField = cont.field(s.name(), null).size(400f, 55f).addInputDialog().get(); - s.tags.put("name", res); - s.save(); - rebuildPane[0].run(); - }); + cont.row(); + + cont.margin(30).add("@editor.description").padRight(6f); + TextField descripionField = cont.area(s.description(), Styles.areaField, t -> {}).size(400f, 140f).addInputDialog().get(); + + Runnable accept = () -> { + s.tags.put("name", nameField.getText()); + s.tags.put("description", descripionField.getText()); + s.save(); + hide(); + rebuildPane[0].run(); + }; + + buttons.defaults().size(120, 54).pad(4); + buttons.button("@ok", accept).disabled(b -> nameField.getText().isEmpty()); + buttons.button("@cancel", this::hide); + + keyDown(KeyCode.enter, () -> { + if(!nameField.getText().isEmpty() && Core.scene.getKeyboardFocus() != descripionField){ + accept.run(); + } + }); + keyDown(KeyCode.escape, this::hide); + keyDown(KeyCode.back, this::hide); + show(); + }}; }); if(s.hasSteamID()){ diff --git a/core/src/mindustry/ui/fragments/HudFragment.java b/core/src/mindustry/ui/fragments/HudFragment.java index 8ee4447079..f56d507c4d 100644 --- a/core/src/mindustry/ui/fragments/HudFragment.java +++ b/core/src/mindustry/ui/fragments/HudFragment.java @@ -15,6 +15,7 @@ import arc.scene.ui.layout.*; import arc.struct.*; import arc.util.*; import mindustry.annotations.Annotations.*; +import mindustry.content.*; import mindustry.core.GameState.*; import mindustry.ctype.*; import mindustry.game.EventType.*; @@ -47,6 +48,26 @@ public class HudFragment extends Fragment{ @Override public void build(Group parent){ + //warn about guardian/boss waves + Events.on(WaveEvent.class, e -> { + int max = 10; + outer: + for(int i = state.wave - 1; i <= state.wave + max; i++){ + for(SpawnGroup group : state.rules.spawns){ + if(group.effect == StatusEffects.boss && group.getUnitsSpawned(i) > 0){ + int diff = (i + 2) - state.wave; + + //increments at which to warn about incoming guardian + if(diff == 1 || diff == 2 || diff == 5 || diff == 10){ + showToast(Icon.warning, Core.bundle.format("wave.guardianwarn" + (diff == 1 ? ".one" : ""), diff)); + } + + break outer; + } + } + } + }); + //TODO details and stuff Events.on(SectorCaptureEvent.class, e ->{ //TODO localize @@ -63,36 +84,25 @@ public class HudFragment extends Fragment{ coreItems.clear(); }); - Events.on(TurnEvent.class, e -> { - Seq attacked = universe.getAttacked(state.getSector().planet); - - if(attacked.any()){ - - //TODO localize - String text = attacked.size > 1 ? attacked.size + " sectors attacked." : "Sector " + attacked.first().id + " under attack."; - - showToast(Icon.warning, text); - } - - //ui.announce("[accent][[ Turn " + universe.turn() + " ]\n[scarlet]" + attackedSectors.size + "[lightgray] sector(s) attacked."); - }); - //paused table parent.fill(t -> { + t.name = "paused"; t.top().visible(() -> state.isPaused()).touchable = Touchable.disabled; t.table(Styles.black5, top -> top.add("@paused").style(Styles.outlineLabel).pad(8f)).growX(); }); //minimap + position parent.fill(t -> { + t.name = "minimap/position"; t.visible(() -> Core.settings.getBool("minimap") && !state.rules.tutorial && shown); //minimap - t.add(new Minimap()); + t.add(new Minimap()).name("minimap"); t.row(); //position t.label(() -> player.tileX() + "," + player.tileY()) .visible(() -> Core.settings.getBool("position") && !state.rules.tutorial) - .touchable(Touchable.disabled); + .touchable(Touchable.disabled) + .name("position"); t.top().right(); }); @@ -104,15 +114,18 @@ public class HudFragment extends Fragment{ if(mobile){ cont.table(select -> { + select.name = "mobile buttons"; select.left(); select.defaults().size(dsize).left(); ImageButtonStyle style = Styles.clearTransi; - select.button(Icon.menu, style, ui.paused::show); + select.button(Icon.menu, style, ui.paused::show).name("menu"); flip = select.button(Icon.upOpen, style, this::toggleMenus).get(); + flip.name = "flip"; - select.button(Icon.paste, style, ui.schematics::show); + select.button(Icon.paste, style, ui.schematics::show) + .name("schematics"); select.button(Icon.pause, style, () -> { if(net.active()){ @@ -141,7 +154,7 @@ public class HudFragment extends Fragment{ }else{ ui.database.show(); } - }).update(i -> { + }).name("chat").update(i -> { if(net.active() && mobile){ i.getStyle().imageUp = Icon.chat; }else if(state.isCampaign()){ @@ -167,14 +180,15 @@ public class HudFragment extends Fragment{ Table wavesMain, editorMain; - cont.stack(wavesMain = new Table(), editorMain = new Table()).height(wavesMain.getPrefHeight()); + cont.stack(wavesMain = new Table(), editorMain = new Table()).height(wavesMain.getPrefHeight()) + .name("waves/editor"); wavesMain.visible(() -> shown && !state.isEditor()); - wavesMain.top().left(); + wavesMain.top().left().name = "waves"; wavesMain.table(s -> { //wave info button with text - s.add(makeStatusTable()).grow(); + s.add(makeStatusTable()).grow().name("status"); //table with button to skip wave s.button(Icon.play, Styles.righti, 30f, () -> { @@ -183,18 +197,22 @@ public class HudFragment extends Fragment{ }else{ logic.skipWave(); } - }).growY().fillX().right().width(40f).disabled(b -> !canSkipWave()).visible(() -> state.rules.waves); + }).growY().fillX().right().width(40f).disabled(b -> !canSkipWave()) + .visible(() -> state.rules.waves).name("skip"); }).width(dsize * 5 + 4f); wavesMain.row(); wavesMain.table(Tex.button, t -> t.margin(10f).add(new Bar("boss.health", Pal.health, () -> state.boss() == null ? 0f : state.boss().healthf()).blink(Color.white)) - .grow()).fillX().visible(() -> state.rules.waves && state.boss() != null).height(60f).get(); + .grow()).fillX().visible(() -> state.rules.waves && state.boss() != null).height(60f).get() + .name = "boss"; wavesMain.row(); + editorMain.name = "editor"; editorMain.table(Tex.buttonEdge4, t -> { //t.margin(0f); + t.name = "teams"; t.add("@editor.teams").growX().left(); t.row(); t.table(teams -> { @@ -215,29 +233,33 @@ public class HudFragment extends Fragment{ }).width(dsize * 5 + 4f); editorMain.visible(() -> shown && state.isEditor()); - //fps display cont.table(info -> { + info.name = "fps/ping"; info.touchable = Touchable.disabled; info.top().left().margin(4).visible(() -> Core.settings.getBool("fps") && shown); info.update(() -> info.setTranslation(state.rules.waves || state.isEditor() ? 0f : -Scl.scl(dsize * 4 + 3), 0)); IntFormat fps = new IntFormat("fps"); IntFormat ping = new IntFormat("ping"); - info.label(() -> fps.get(Core.graphics.getFramesPerSecond())).left().style(Styles.outlineLabel); + info.label(() -> fps.get(Core.graphics.getFramesPerSecond())).left() + .style(Styles.outlineLabel).name("fps"); info.row(); - info.label(() -> ping.get(netClient.getPing())).visible(net::client).left().style(Styles.outlineLabel); + info.label(() -> ping.get(netClient.getPing())).visible(net::client).left() + .style(Styles.outlineLabel).name("ping"); }).top().left(); }); //core items parent.fill(t -> { + t.name = "coreitems"; t.top().add(coreItems); t.visible(() -> Core.settings.getBool("coreitems") && !mobile && !state.isPaused() && shown); }); //spawner warning parent.fill(t -> { + t.name = "nearpoint"; t.touchable = Touchable.disabled; t.table(Styles.black, c -> c.add("@nearpoint") .update(l -> l.setColor(Tmp.c1.set(Color.white).lerp(Color.scarlet, Mathf.absin(Time.time(), 10f, 1f)))) @@ -246,12 +268,14 @@ public class HudFragment extends Fragment{ }); parent.fill(t -> { + t.name = "waiting"; t.visible(() -> netServer.isWaitingForPlayers()); t.table(Tex.button, c -> c.add("@waiting.players")); }); //'core is under attack' table parent.fill(t -> { + t.name = "coreattack"; t.touchable = Touchable.disabled; float notifDuration = 240f; float[] coreAttackTime = {0}; @@ -262,6 +286,7 @@ public class HudFragment extends Fragment{ }); t.top().visible(() -> { + if(!shown) return false; if(state.isMenu() || !state.teams.get(player.team()).hasCore()){ coreAttackTime[0] = 0f; return false; @@ -284,6 +309,7 @@ public class HudFragment extends Fragment{ //tutorial text parent.fill(t -> { + t.name = "tutorial"; Runnable resize = () -> { t.clearChildren(); t.top().right().visible(() -> state.rules.tutorial); @@ -306,11 +332,13 @@ public class HudFragment extends Fragment{ //'saving' indicator parent.fill(t -> { + t.name = "saving"; t.bottom().visible(() -> control.saves.isSaving()); t.add("@saving").style(Styles.outlineLabel); }); parent.fill(p -> { + p.name = "hudtext"; p.top().table(Styles.black3, t -> t.margin(4).label(() -> hudText) .style(Styles.outlineLabel)).padTop(10).visible(p.color.a >= 0.001f); p.update(() -> { @@ -326,6 +354,7 @@ public class HudFragment extends Fragment{ //TODO DEBUG: rate table if(false) parent.fill(t -> { + t.name = "rates"; t.bottom().left(); t.table(Styles.black6, c -> { Bits used = new Bits(content.items().size); diff --git a/core/src/mindustry/ui/fragments/MenuFragment.java b/core/src/mindustry/ui/fragments/MenuFragment.java index 45faa9bf10..cd8d13be0d 100644 --- a/core/src/mindustry/ui/fragments/MenuFragment.java +++ b/core/src/mindustry/ui/fragments/MenuFragment.java @@ -45,6 +45,7 @@ public class MenuFragment extends Fragment{ parent.fill(c -> { container = c; + c.name = "menu container"; if(!mobile){ buildDesktop(); @@ -57,8 +58,8 @@ public class MenuFragment extends Fragment{ //info icon if(mobile){ - parent.fill(c -> c.bottom().left().button("", Styles.infot, ui.about::show).size(84, 45)); - parent.fill(c -> c.bottom().right().button("", Styles.discordt, ui.discord::show).size(84, 45)); + parent.fill(c -> c.bottom().left().button("", Styles.infot, ui.about::show).size(84, 45).name("info")); + parent.fill(c -> c.bottom().right().button("", Styles.discordt, ui.discord::show).size(84, 45).name("discord")); }else if(becontrol.active()){ parent.fill(c -> c.bottom().right().button("@be.check", Icon.refresh, () -> { ui.loadfrag.show(); @@ -68,7 +69,7 @@ public class MenuFragment extends Fragment{ ui.showInfo("@be.noupdates"); } }); - }).size(200, 60).update(t -> { + }).size(200, 60).name("becheck").update(t -> { t.getLabel().setColor(becontrol.isUpdateAvailable() ? Tmp.c1.set(Color.white).lerp(Pal.accent, Mathf.absin(5f, 1f)) : Color.white); })); } @@ -93,6 +94,7 @@ public class MenuFragment extends Fragment{ private void buildMobile(){ container.clear(); + container.name = "buttons"; container.setSize(Core.graphics.getWidth(), Core.graphics.getHeight()); float size = 120f; @@ -153,7 +155,6 @@ public class MenuFragment extends Fragment{ container.clear(); container.setSize(Core.graphics.getWidth(), Core.graphics.getHeight()); - float width = 230f; Drawable background = Styles.black6; @@ -161,6 +162,7 @@ public class MenuFragment extends Fragment{ container.add().width(Core.graphics.getWidth()/10f); container.table(background, t -> { t.defaults().width(width).height(70f); + t.name = "buttons"; buttons(t, new Buttoni("@play", Icon.play, @@ -183,6 +185,7 @@ public class MenuFragment extends Fragment{ container.table(background, t -> { submenu = t; + t.name = "submenu"; t.color.a = 0f; t.top(); t.defaults().width(width).height(70f); diff --git a/core/src/mindustry/ui/fragments/MinimapFragment.java b/core/src/mindustry/ui/fragments/MinimapFragment.java index 7c9d3b5994..43ad3163b0 100644 --- a/core/src/mindustry/ui/fragments/MinimapFragment.java +++ b/core/src/mindustry/ui/fragments/MinimapFragment.java @@ -18,7 +18,7 @@ public class MinimapFragment extends Fragment{ private boolean shown; float panx, pany, zoom = 1f, lastZoom = -1; private float baseSize = Scl.scl(5f); - private Element elem; + public Element elem; @Override public void build(Group parent){ diff --git a/core/src/mindustry/ui/fragments/PlayerListFragment.java b/core/src/mindustry/ui/fragments/PlayerListFragment.java index eae9407131..c006dcf3ff 100644 --- a/core/src/mindustry/ui/fragments/PlayerListFragment.java +++ b/core/src/mindustry/ui/fragments/PlayerListFragment.java @@ -24,7 +24,9 @@ public class PlayerListFragment extends Fragment{ @Override public void build(Group parent){ + content.name = "players"; parent.fill(cont -> { + cont.name = "playerlist"; cont.visible(() -> visible); cont.update(() -> { if(!(net.active() && state.isGame())){ @@ -47,6 +49,7 @@ public class PlayerListFragment extends Fragment{ sField = pane.field(null, text -> { rebuild(); }).grow().pad(8).get(); + sField.name = "search"; sField.setMaxLength(maxNameLength); sField.setMessageText(Core.bundle.format("players.search")); @@ -56,6 +59,7 @@ public class PlayerListFragment extends Fragment{ pane.table(menu -> { menu.defaults().growX().height(50f).fillY(); + menu.name = "menu"; menu.button("@server.bans", ui.bans::show).disabled(b -> net.client()); menu.button("@server.admins", ui.admins::show).disabled(b -> net.client()); @@ -99,6 +103,7 @@ public class PlayerListFragment extends Fragment{ }; table.margin(8); table.add(new Image(user.icon()).setScaling(Scaling.bounded)).grow(); + table.name = user.name(); button.add(table).size(h); button.labelWrap("[#" + user.color().toString().toUpperCase() + "]" + user.name()).width(170f).pad(10); diff --git a/core/src/mindustry/ui/fragments/ScriptConsoleFragment.java b/core/src/mindustry/ui/fragments/ScriptConsoleFragment.java index 73861538e3..3f33dd1b4b 100644 --- a/core/src/mindustry/ui/fragments/ScriptConsoleFragment.java +++ b/core/src/mindustry/ui/fragments/ScriptConsoleFragment.java @@ -39,7 +39,6 @@ public class ScriptConsoleFragment extends Table{ }; public ScriptConsoleFragment(){ - setFillParent(true); font = Fonts.def; diff --git a/core/src/mindustry/world/Block.java b/core/src/mindustry/world/Block.java index 189a9c21c1..95d9a426e0 100644 --- a/core/src/mindustry/world/Block.java +++ b/core/src/mindustry/world/Block.java @@ -193,6 +193,8 @@ public class Block extends UnlockableContent{ public BuildPlaceability buildPlaceability = BuildPlaceability.always; /** Multiplier for speed of building this block. */ public float buildCostMultiplier = 1f; + /** Multiplier for cost of research in tech tree. */ + public float researchCostMultiplier = 1; /** Whether this block has instant transfer.*/ public boolean instantTransfer = false; /** Whether you can rotate this block with Keybind rotateplaced + Scroll Wheel. */ @@ -619,7 +621,7 @@ public class Block extends UnlockableContent{ public ItemStack[] researchRequirements(){ ItemStack[] out = new ItemStack[requirements.length]; for(int i = 0; i < out.length; i++){ - int quantity = 40 + Mathf.round(Mathf.pow(requirements[i].amount, 1.25f) * 20, 10); + int quantity = 40 + Mathf.round(Mathf.pow(requirements[i].amount, 1.25f) * 20 * researchCostMultiplier, 10); out[i] = new ItemStack(requirements[i].item, UI.roundAmount(quantity)); } diff --git a/core/src/mindustry/world/Tile.java b/core/src/mindustry/world/Tile.java index 0f761ad745..7478f81db4 100644 --- a/core/src/mindustry/world/Tile.java +++ b/core/src/mindustry/world/Tile.java @@ -346,7 +346,7 @@ public class Tile implements Position, QuadTreeObject, Displayable{ } public boolean solid(){ - return block.solid || (build != null && build.checkSolid()); + return block.solid || floor.solid || (build != null && build.checkSolid()); } public boolean breakable(){ diff --git a/core/src/mindustry/world/blocks/ConstructBlock.java b/core/src/mindustry/world/blocks/ConstructBlock.java index 7f50b81c01..c228397a32 100644 --- a/core/src/mindustry/world/blocks/ConstructBlock.java +++ b/core/src/mindustry/world/blocks/ConstructBlock.java @@ -58,7 +58,7 @@ public class ConstructBlock extends Block{ } @Remote(called = Loc.server) - public static void constructFinish(Tile tile, Block block, Unit builder, byte rotation, Team team, Object config){ + public static void constructFinish(Tile tile, Block block, @Nullable Unit builder, byte rotation, Team team, Object config){ if(tile == null) return; float healthf = tile.build == null ? 1f : tile.build.healthf(); @@ -76,6 +76,10 @@ public class ConstructBlock extends Block{ if(prev != null && prev.size > 0){ tile.build.overwrote(prev); } + + if(builder != null && builder.isPlayer()){ + tile.build.lastAccessed = builder.getPlayer().name; + } } //last builder was this local client player, call placed() @@ -142,6 +146,9 @@ public class ConstructBlock extends Block{ public Block previous; public Object lastConfig; + @Nullable + public Unit lastBuilder; + private float[] accumulator; private float[] totalAccumulator; @@ -180,7 +187,7 @@ public class ConstructBlock extends Block{ public void onDestroyed(){ Fx.blockExplosionSmoke.at(tile); - if(!tile.floor().solid && !tile.floor().isLiquid){ + if(!tile.floor().solid && tile.floor().hasSurface()){ Effect.rubble(x, y, size); } } @@ -214,6 +221,10 @@ public class ConstructBlock extends Block{ return; } + if(builder.isPlayer()){ + lastBuilder = builder; + } + lastConfig = config; if(cblock.requirements.length != accumulator.length || totalAccumulator.length != cblock.requirements.length){ @@ -233,13 +244,18 @@ public class ConstructBlock extends Block{ progress = Mathf.clamp(progress + maxProgress); if(progress >= 1f || state.rules.infiniteResources){ - constructed(tile, cblock, builder, (byte)rotation, builder.team, config); + if(lastBuilder == null) lastBuilder = builder; + constructed(tile, cblock, lastBuilder, (byte)rotation, builder.team, config); } } public void deconstruct(Unit builder, @Nullable Building core, float amount){ float deconstructMultiplier = state.rules.deconstructRefundMultiplier; + if(builder.isPlayer()){ + lastBuilder = builder; + } + if(cblock != null){ ItemStack[] requirements = cblock.requirements; if(requirements.length != accumulator.length || totalAccumulator.length != requirements.length){ @@ -271,7 +287,8 @@ public class ConstructBlock extends Block{ progress = Mathf.clamp(progress - amount); if(progress <= 0 || state.rules.infiniteResources){ - Call.deconstructFinish(tile, this.cblock == null ? previous : this.cblock, builder); + if(lastBuilder == null) lastBuilder = builder; + Call.deconstructFinish(tile, this.cblock == null ? previous : this.cblock, lastBuilder); } } diff --git a/core/src/mindustry/world/blocks/defense/Wall.java b/core/src/mindustry/world/blocks/defense/Wall.java index 873cbaea78..abb941b899 100644 --- a/core/src/mindustry/world/blocks/defense/Wall.java +++ b/core/src/mindustry/world/blocks/defense/Wall.java @@ -34,7 +34,7 @@ public class Wall extends Block{ solid = true; destructible = true; group = BlockGroup.walls; - buildCostMultiplier = 5f; + buildCostMultiplier = 6f; canOverdrive = false; } diff --git a/core/src/mindustry/world/blocks/defense/turrets/ChargeTurret.java b/core/src/mindustry/world/blocks/defense/turrets/ChargeTurret.java index 3680cce446..15feaf0379 100644 --- a/core/src/mindustry/world/blocks/defense/turrets/ChargeTurret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/ChargeTurret.java @@ -1,10 +1,13 @@ package mindustry.world.blocks.defense.turrets; +import arc.audio.*; import arc.math.*; import arc.util.*; import mindustry.content.*; import mindustry.entities.*; import mindustry.entities.bullet.*; +import mindustry.type.*; +import mindustry.gen.*; import static mindustry.Vars.*; @@ -14,6 +17,7 @@ public class ChargeTurret extends PowerTurret{ public float chargeMaxDelay = 10f; public Effect chargeEffect = Fx.none; public Effect chargeBeginEffect = Fx.none; + public Sound chargeSound = Sounds.none; public ChargeTurret(String name){ super(name); @@ -28,7 +32,8 @@ public class ChargeTurret extends PowerTurret{ tr.trns(rotation, size * tilesize / 2f); chargeBeginEffect.at(x + tr.x, y + tr.y, rotation); - + chargeSound.at(x + tr.x, y + tr.y, 1); + for(int i = 0; i < chargeEffects; i++){ Time.run(Mathf.random(chargeMaxDelay), () -> { if(!isValid()) return; diff --git a/core/src/mindustry/world/blocks/defense/turrets/Turret.java b/core/src/mindustry/world/blocks/defense/turrets/Turret.java index 9d925af2f3..411ee782ec 100644 --- a/core/src/mindustry/world/blocks/defense/turrets/Turret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/Turret.java @@ -214,6 +214,7 @@ public abstract class Turret extends Block{ } public void targetPosition(Posc pos){ + if(!hasAmmo()) return; BulletType bullet = peekAmmo(); float speed = bullet.speed; //slow bullets never intersect @@ -350,8 +351,9 @@ public abstract class Turret extends Block{ AmmoEntry entry = ammo.peek(); entry.amount -= ammoPerShot; - if(entry.amount == 0) ammo.pop(); + if(entry.amount <= 0) ammo.pop(); totalAmmo -= ammoPerShot; + totalAmmo = Math.max(totalAmmo, 0); Time.run(reloadTime / 2f, this::ejectEffects); return entry.type(); } @@ -363,7 +365,7 @@ public abstract class Turret extends Block{ /** @return whether the turret has ammo. */ public boolean hasAmmo(){ - return ammo.size > 0 && ammo.peek().amount >= ammoPerShot; + return ammo.size > 0 && ammo.peek().amount >= 1; } protected void updateShooting(){ @@ -432,7 +434,7 @@ public abstract class Turret extends Block{ fshootEffect.at(x + tr.x, y + tr.y, rotation); fsmokeEffect.at(x + tr.x, y + tr.y, rotation); - shootSound.at(tile, Mathf.random(0.9f, 1.1f)); + shootSound.at(x + tr.x, y + tr.y, Mathf.random(0.9f, 1.1f)); if(shootShake > 0){ Effect.shake(shootShake, shootShake, this); diff --git a/core/src/mindustry/world/blocks/distribution/Conveyor.java b/core/src/mindustry/world/blocks/distribution/Conveyor.java index 033f1eb8d5..457e7e65e7 100644 --- a/core/src/mindustry/world/blocks/distribution/Conveyor.java +++ b/core/src/mindustry/world/blocks/distribution/Conveyor.java @@ -156,6 +156,7 @@ public class Conveyor extends Block implements Autotiler{ lastInserted = build.lastInserted; mid = build.mid; minitem = build.minitem; + items.addAll(build.items); } } diff --git a/core/src/mindustry/world/blocks/environment/Cliff.java b/core/src/mindustry/world/blocks/environment/Cliff.java index d4347a7c97..49dba95d7c 100644 --- a/core/src/mindustry/world/blocks/environment/Cliff.java +++ b/core/src/mindustry/world/blocks/environment/Cliff.java @@ -2,11 +2,13 @@ package mindustry.world.blocks.environment; import arc.graphics.g2d.*; import arc.util.*; +import mindustry.annotations.Annotations.*; import mindustry.graphics.*; import mindustry.world.*; public class Cliff extends Block{ public float size = 11f; + public @Load(value = "cliffmask#", length = 256) TextureRegion[] cliffs; public Cliff(String name){ super(name); @@ -19,15 +21,8 @@ public class Cliff extends Block{ @Override public void drawBase(Tile tile){ - - int r = tile.data; - for(int i = 0; i < 8; i++){ - if((r & (1 << i)) != 0){ - Draw.color(Tmp.c1.set(tile.floor().mapColor).mul(1.3f + (i >= 4 ? -0.4f : 0.3f))); - Draw.rect(region, tile.worldx(), tile.worldy(), size, size, i * 45f); - } - } - + Draw.color(Tmp.c1.set(tile.floor().mapColor).mul(1.6f)); + Draw.rect(cliffs[tile.data & 0xff], tile.worldx(), tile.worldy()); Draw.color(); } diff --git a/core/src/mindustry/world/blocks/environment/Floor.java b/core/src/mindustry/world/blocks/environment/Floor.java index a62542f5da..a70056717a 100644 --- a/core/src/mindustry/world/blocks/environment/Floor.java +++ b/core/src/mindustry/world/blocks/environment/Floor.java @@ -166,6 +166,11 @@ public class Floor extends Block{ return new TextureRegion[]{Core.atlas.find(Core.atlas.has(name) ? name : name + "1")}; } + /** @return whether this floor has a valid surface on which to place things, e.g. scorch marks. */ + public boolean hasSurface(){ + return !isLiquid && !solid; + } + public boolean isDeep(){ return drownTime > 0; } diff --git a/core/src/mindustry/world/blocks/liquid/ArmoredConduit.java b/core/src/mindustry/world/blocks/liquid/ArmoredConduit.java index a84148af09..c2af911324 100644 --- a/core/src/mindustry/world/blocks/liquid/ArmoredConduit.java +++ b/core/src/mindustry/world/blocks/liquid/ArmoredConduit.java @@ -11,7 +11,7 @@ public class ArmoredConduit extends Conduit{ public ArmoredConduit(String name){ super(name); - leakResistance = 10f; + leaks = false; } @Override diff --git a/core/src/mindustry/world/blocks/liquid/Conduit.java b/core/src/mindustry/world/blocks/liquid/Conduit.java index b2fa75b045..2af6613212 100644 --- a/core/src/mindustry/world/blocks/liquid/Conduit.java +++ b/core/src/mindustry/world/blocks/liquid/Conduit.java @@ -27,7 +27,7 @@ public class Conduit extends LiquidBlock implements Autotiler{ public @Load(value = "@-top-#", length = 5) TextureRegion[] topRegions; public @Load(value = "@-bottom-#", length = 5, fallback = "conduit-bottom-#") TextureRegion[] botRegions; - public float leakResistance = 1.5f; + public boolean leaks = true; public Conduit(String name){ super(name); @@ -131,7 +131,7 @@ public class Conduit extends LiquidBlock implements Autotiler{ smoothLiquid = Mathf.lerpDelta(smoothLiquid, liquids.currentAmount() / liquidCapacity, 0.05f); if(liquids.total() > 0.001f && timer(timerFlow, 1)){ - moveLiquidForward(leakResistance, liquids.current()); + moveLiquidForward(leaks, liquids.current()); noSleep(); }else{ sleep(); diff --git a/core/src/mindustry/world/blocks/logic/LogicBlock.java b/core/src/mindustry/world/blocks/logic/LogicBlock.java index f3962a5448..aecf5d4149 100644 --- a/core/src/mindustry/world/blocks/logic/LogicBlock.java +++ b/core/src/mindustry/world/blocks/logic/LogicBlock.java @@ -1,7 +1,6 @@ package mindustry.world.blocks.logic; import arc.func.*; -import arc.graphics.g2d.*; import arc.math.geom.*; import arc.scene.ui.layout.*; import arc.struct.Bits; @@ -9,7 +8,6 @@ import arc.struct.*; import arc.util.*; import arc.util.io.*; import mindustry.*; -import mindustry.ai.types.*; import mindustry.gen.*; import mindustry.graphics.*; import mindustry.io.*; @@ -425,7 +423,6 @@ public class LogicBlock extends Block{ @Override public void buildConfiguration(Table table){ - table.button(Icon.pencil, Styles.clearTransi, () -> { Vars.ui.logic.show(code, code -> { configure(compress(code, relativeConnections())); @@ -433,19 +430,6 @@ public class LogicBlock extends Block{ }).size(40); } - @Override - public void draw(){ - super.draw(); - - if(ui.hudfrag.blockfrag.hover() instanceof Unit unit && unit.controller() instanceof LogicAI ai && ai.controller == this){ - Draw.z(Layer.overlayUI); - Drawf.square(x, y, size * tilesize/2f + 2f); - if(!unit.within(this, unit.hitSize * 2f)){ - Drawf.arrow(unit.x, unit.y, x, y, unit.hitSize *2f, 4f); - } - } - } - @Override public boolean onConfigureTileTapped(Building other){ if(this == other){ diff --git a/core/src/mindustry/world/blocks/power/PowerNode.java b/core/src/mindustry/world/blocks/power/PowerNode.java index 245c3d4f7e..5d033c99b7 100644 --- a/core/src/mindustry/world/blocks/power/PowerNode.java +++ b/core/src/mindustry/world/blocks/power/PowerNode.java @@ -112,6 +112,12 @@ public class PowerNode extends PowerBlock{ (UI.formatAmount((int)entity.power.graph.getLastPowerStored())), UI.formatAmount((int)entity.power.graph.getLastCapacity())), () -> Pal.powerBar, () -> Mathf.clamp(entity.power.graph.getLastPowerStored() / entity.power.graph.getLastCapacity()))); + + bars.add("connections", entity -> new Bar(() -> + Core.bundle.format("bar.powerlines", entity.power.links.size, maxNodes), + () -> Pal.items, + () -> (float)entity.power.links.size / (float)maxNodes + )); } @Override diff --git a/core/src/mindustry/world/blocks/storage/CoreBlock.java b/core/src/mindustry/world/blocks/storage/CoreBlock.java index 372042b5bc..bdb16eb674 100644 --- a/core/src/mindustry/world/blocks/storage/CoreBlock.java +++ b/core/src/mindustry/world/blocks/storage/CoreBlock.java @@ -14,6 +14,7 @@ import mindustry.game.EventType.*; import mindustry.game.*; import mindustry.gen.*; import mindustry.graphics.*; +import mindustry.logic.*; import mindustry.type.*; import mindustry.ui.*; import mindustry.world.*; @@ -50,6 +51,7 @@ public class CoreBlock extends StorageBlock{ unitCapModifier = 10; activeSound = Sounds.respawning; activeSoundVolume = 1f; + group = BlockGroup.none; } @Remote(called = Loc.server) @@ -156,6 +158,13 @@ public class CoreBlock extends StorageBlock{ public int storageCapacity; //note that this unit is never actually used for control; the possession handler makes the player respawn when this unit is controlled public BlockUnitc unit = Nulls.blockUnit; + public boolean noEffect = false; + + @Override + public double sense(LAccess sensor){ + if(sensor == LAccess.itemCapacity) return storageCapacity; + return super.sense(sensor); + } @Override public void created(){ @@ -194,7 +203,7 @@ public class CoreBlock extends StorageBlock{ @Override public boolean acceptItem(Building source, Item item){ - return items.get(item) < getMaximumAccepted(item); + return items.get(item) < getMaximumAccepted(item) || incinerate(); } @Override @@ -263,6 +272,10 @@ public class CoreBlock extends StorageBlock{ return tile instanceof StorageBuild && (((StorageBuild)tile).linkedCore == core || ((StorageBuild)tile).linkedCore == null); } + public boolean incinerate(){ + return state.isCampaign(); + } + @Override public float handleDamage(float amount){ if(player != null && team == player.team()){ @@ -297,16 +310,51 @@ public class CoreBlock extends StorageBlock{ } } + @Override + public void onDestroyed(){ + super.onDestroyed(); + + if(state.isCampaign() && team == state.rules.waveTeam){ + //do not recache + world.setGenerating(true); + tile.setOverlay(Blocks.spawn); + world.setGenerating(false); + + if(!spawner.getSpawns().contains(tile)){ + spawner.getSpawns().add(tile); + } + spawner.doShockwave(x, y); + } + } + @Override public void placed(){ super.placed(); state.teams.registerCore(this); } + @Override + public void itemTaken(Item item){ + if(state.isCampaign()){ + //update item taken amount + state.secinfo.handleCoreItem(item, -1); + } + } + @Override public void handleItem(Building source, Item item){ if(net.server() || !net.active()){ - super.handleItem(source, item); + + if(items.get(item) >= getMaximumAccepted(item)){ + //create item incineration effect at random intervals + if(!noEffect){ + incinerateEffect(this, source); + } + noEffect = false; + }else{ + super.handleItem(source, item); + } + if(state.rules.tutorial){ Events.fire(new CoreItemDeliverEvent()); } diff --git a/core/src/mindustry/world/blocks/storage/StorageBlock.java b/core/src/mindustry/world/blocks/storage/StorageBlock.java index 6b022bf2f6..50eb65a270 100644 --- a/core/src/mindustry/world/blocks/storage/StorageBlock.java +++ b/core/src/mindustry/world/blocks/storage/StorageBlock.java @@ -1,19 +1,23 @@ package mindustry.world.blocks.storage; +import arc.math.*; import arc.struct.*; import arc.util.*; +import mindustry.content.*; import mindustry.gen.*; import mindustry.type.*; import mindustry.world.*; +import mindustry.world.blocks.storage.CoreBlock.*; +import mindustry.world.meta.*; -public abstract class StorageBlock extends Block{ - +public class StorageBlock extends Block{ public StorageBlock(String name){ super(name); hasItems = true; solid = true; update = false; destructible = true; + group = BlockGroup.storage; } @Override @@ -21,6 +25,16 @@ public abstract class StorageBlock extends Block{ return false; } + public static void incinerateEffect(Building self, Building source){ + if(Mathf.chance(0.1)){ + Tile edge = Edges.getFacingEdge(source, self); + Tile edge2 = Edges.getFacingEdge(self, source); + if(edge != null && edge2 != null){ + Fx.fuelburn.at((edge.worldx() + edge2.worldx())/2f, (edge.worldy() + edge2.worldy())/2f); + } + } + } + public class StorageBuild extends Building{ protected @Nullable Building linkedCore; @@ -29,6 +43,17 @@ public abstract class StorageBlock extends Block{ return linkedCore != null ? linkedCore.acceptItem(source, item) : items.get(item) < getMaximumAccepted(item); } + @Override + public void handleItem(Building source, Item item){ + if(linkedCore != null){ + incinerateEffect(this, source); + ((CoreBuild)linkedCore).noEffect = true; + linkedCore.handleItem(source, item); + }else{ + super.handleItem(source, item); + } + } + @Override public int getMaximumAccepted(Item item){ return itemCapacity; diff --git a/core/src/mindustry/world/blocks/storage/Unloader.java b/core/src/mindustry/world/blocks/storage/Unloader.java index 86ce15956e..524d6eb939 100644 --- a/core/src/mindustry/world/blocks/storage/Unloader.java +++ b/core/src/mindustry/world/blocks/storage/Unloader.java @@ -66,6 +66,7 @@ public class Unloader extends Block{ }else{ other.items.remove(item, 1); } + other.itemTaken(item); } } } diff --git a/gradle.properties b/gradle.properties index aceeeb0433..77aed771ce 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xms256m -Xmx1024m -archash=86e6ad07a2bfc727f8772c3e9c5f9d2761580879 +archash=0605d29e603131326e519775758954e83866096a diff --git a/server/src/mindustry/server/ServerControl.java b/server/src/mindustry/server/ServerControl.java index 1e0aa942ab..48f529b187 100644 --- a/server/src/mindustry/server/ServerControl.java +++ b/server/src/mindustry/server/ServerControl.java @@ -55,6 +55,8 @@ public class ServerControl implements ApplicationListener{ private ServerSocket serverSocket; private PrintWriter socketOutput; + private String yes; + public ServerControl(String[] args){ Core.settings.defaults( "bans", "", @@ -907,6 +909,14 @@ public class ServerControl implements ApplicationListener{ info("&ly@&lg MB collected. Memory usage now at &ly@&lg MB.", pre - post, post); }); + handler.register("yes", "Run the above \"did you mean\" suggestion.", arg -> { + if(yes == null){ + err("There is nothing to say yes to."); + }else{ + handleCommandString(yes); + } + }); + mods.eachClass(p -> p.registerServerCommands(handler)); } @@ -937,6 +947,7 @@ public class ServerControl implements ApplicationListener{ if(closest != null){ err("Command not found. Did you mean \"" + closest.text + "\"?"); + yes = line.replace(response.runCommand, closest.text); }else{ err("Invalid command. Type 'help' for help."); } @@ -944,6 +955,8 @@ public class ServerControl implements ApplicationListener{ err("Too few command arguments. Usage: " + response.command.text + " " + response.command.paramText); }else if(response.type == ResponseType.manyArguments){ err("Too many command arguments. Usage: " + response.command.text + " " + response.command.paramText); + }else if(response.type == ResponseType.valid){ + yes = null; } } diff --git a/servers.json b/servers.json index 6ee33c6d30..5990afd487 100644 --- a/servers.json +++ b/servers.json @@ -35,6 +35,9 @@ { "address": "aamindustry.play.ai:6568" }, + { + "address": "aamindustry.play.ai:6569" + }, { "address": "aamindustry.play.ai:6570" }, @@ -73,5 +76,11 @@ }, { "address": "pandorum.su:9999" + }, + { + "address": "mindustryranked.ddns.net" + }, + { + "address": "attack.pearkin.net" } ] diff --git a/servers_be.json b/servers_be.json index 3e1d51f759..e96fbcaf99 100644 --- a/servers_be.json +++ b/servers_be.json @@ -10,5 +10,11 @@ }, { "address": "routerchain.ddns.net:6568" + }, + { + "address": "mindustry.pl:6660" + }, + { + "address": "be.wayzer.cf" } ] diff --git a/tests/src/test/java/ApplicationTests.java b/tests/src/test/java/ApplicationTests.java index d689dbd5df..01cf659df2 100644 --- a/tests/src/test/java/ApplicationTests.java +++ b/tests/src/test/java/ApplicationTests.java @@ -424,6 +424,15 @@ public class ApplicationTests{ assertEquals(300, world.height()); } + @Test + void load108Save(){ + resetWorld(); + SaveIO.load(Core.files.internal("108.msav")); + + assertEquals(256, world.width()); + assertEquals(256, world.height()); + } + @Test void arrayIterators(){ Seq arr = Seq.with("a", "b" , "c", "d", "e", "f"); diff --git a/tests/src/test/java/power/PowerTestFixture.java b/tests/src/test/java/power/PowerTestFixture.java index 994130a596..7bd7e821b2 100644 --- a/tests/src/test/java/power/PowerTestFixture.java +++ b/tests/src/test/java/power/PowerTestFixture.java @@ -28,14 +28,14 @@ public class PowerTestFixture{ headless = true; Core.graphics = new FakeGraphics(); Core.files = new MockFiles(); - Vars.state = new GameState(); - Vars.tree = new FileTree(); Vars.content = new ContentLoader(){ @Override public void handleMappableContent(MappableContent content){ } }; + Vars.state = new GameState(); + Vars.tree = new FileTree(); content.createBaseContent(); Log.setUseColors(false); Time.setDeltaProvider(() -> 0.5f); diff --git a/tests/src/test/resources/108.msav b/tests/src/test/resources/108.msav new file mode 100644 index 0000000000..9653e63d16 Binary files /dev/null and b/tests/src/test/resources/108.msav differ diff --git a/tools/src/mindustry/tools/Generators.java b/tools/src/mindustry/tools/Generators.java index 401feb9ec5..d8f67eee8c 100644 --- a/tools/src/mindustry/tools/Generators.java +++ b/tools/src/mindustry/tools/Generators.java @@ -78,6 +78,79 @@ public class Generators{ } }); + ImagePacker.generate("cliffs", () -> { + int size = 64; + Color dark = new Color(0.5f, 0.5f, 0.6f, 1f).mul(0.98f); + Color mid = Color.lightGray; + + Image[] images = new Image[8]; + for(int i = 0; i < 8; i++){ + images[i] = ImagePacker.get("cliff" + i); + } + + for(int i = Byte.MIN_VALUE; i <= Byte.MAX_VALUE; i++){ + Image result = new Image(size, size); + byte[][] mask = new byte[size][size]; + + byte val = (byte)i; + //check each bit/direction + for(int j = 0; j < 8; j++){ + if((val & (1 << j)) != 0){ + if(j % 2 == 1 && (((val & (1 << (j + 1))) != 0) != ((val & (1 << (j - 1))) != 0))){ + continue; + } + + Image image = images[j]; + image.each((x, y) -> { + Color color = image.getColor(x, y); + if(color.a > 0.1){ + //white -> bit 1 -> top + //black -> bit 2 -> bottom + mask[x][y] |= (color.r > 0.5f ? 1 : 2); + } + }); + } + } + + result.each((x, y) -> { + byte m = mask[x][y]; + if(m != 0){ + //mid + if(m == 3){ + //find nearest non-mid color + byte best = 0; + float bestDst = 0; + boolean found = false; + //expand search range until found + for(int rad = 9; rad < 64; rad += 7){ + for(int cx = Math.max(x - rad, 0); cx <= Math.min(x + rad, size - 1); cx++){ + for(int cy = Math.max(y - rad, 0); cy <= Math.min(y + rad, size - 1); cy++){ + byte nval = mask[cx][cy]; + if(nval == 1 || nval == 2){ + float dst2 = Mathf.dst2(cx, cy, x, y); + if(dst2 <= rad * rad && (!found || dst2 < bestDst)){ + best = nval; + bestDst = dst2; + found = true; + } + } + } + } + } + + if(found){ + m = best; + } + } + + result.draw(x, y, m == 1 ? Color.white : m == 2 ? dark : mid); + } + }); + + result.save("../blocks/environment/cliffmask" + (val & 0xff)); + } + }); + ImagePacker.generate("cracks", () -> { RidgedPerlin r = new RidgedPerlin(1, 3); for(int size = 1; size <= Block.maxCrackSize; size++){