diff --git a/core/assets-raw/sprites/blocks/environment/deepwater.png b/core/assets-raw/sprites/blocks/environment/deepwater.png index bc4f5312d3..e951d87647 100644 Binary files a/core/assets-raw/sprites/blocks/environment/deepwater.png and b/core/assets-raw/sprites/blocks/environment/deepwater.png differ diff --git a/core/assets-raw/sprites/blocks/environment/sand1.png b/core/assets-raw/sprites/blocks/environment/sand1.png index 6ef1e28bc0..8b79ff9086 100644 Binary files a/core/assets-raw/sprites/blocks/environment/sand1.png and b/core/assets-raw/sprites/blocks/environment/sand1.png differ diff --git a/core/assets-raw/sprites/blocks/environment/sand2.png b/core/assets-raw/sprites/blocks/environment/sand2.png index 05bedd0bc3..8c3f7475f8 100644 Binary files a/core/assets-raw/sprites/blocks/environment/sand2.png and b/core/assets-raw/sprites/blocks/environment/sand2.png differ diff --git a/core/assets-raw/sprites/blocks/environment/sand3.png b/core/assets-raw/sprites/blocks/environment/sand3.png index 69b1dd2ec7..d4f149063c 100644 Binary files a/core/assets-raw/sprites/blocks/environment/sand3.png and b/core/assets-raw/sprites/blocks/environment/sand3.png differ diff --git a/core/assets-raw/sprites/blocks/environment/water.png b/core/assets-raw/sprites/blocks/environment/water.png index b923481473..be47b1551c 100644 Binary files a/core/assets-raw/sprites/blocks/environment/water.png and b/core/assets-raw/sprites/blocks/environment/water.png differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/deepwater.png b/core/assets-raw/sprites_replacement/blocks/environment/deepwater.png new file mode 100644 index 0000000000..2389c5985d Binary files /dev/null and b/core/assets-raw/sprites_replacement/blocks/environment/deepwater.png differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/water.png b/core/assets-raw/sprites_replacement/blocks/environment/water.png new file mode 100644 index 0000000000..631f99201a Binary files /dev/null and b/core/assets-raw/sprites_replacement/blocks/environment/water.png differ diff --git a/core/assets/maps/ruinousShores.mmap b/core/assets/maps/ruinousShores.mmap new file mode 100644 index 0000000000..b70b858ed2 Binary files /dev/null and b/core/assets/maps/ruinousShores.mmap differ diff --git a/core/assets/shaders/cache.vertex b/core/assets/shaders/cache.vertex new file mode 100644 index 0000000000..058b8888ef --- /dev/null +++ b/core/assets/shaders/cache.vertex @@ -0,0 +1,14 @@ +attribute vec4 a_position; +attribute vec4 a_color; +attribute vec2 a_texCoord0; +uniform mat4 u_projectionViewMatrix; +varying vec4 v_color; +varying vec2 v_texCoords; + +void main() +{ + v_color = a_color; + v_color.a = v_color.a * (255.0/254.0); + v_texCoords = a_texCoord0; + gl_Position = u_projectionViewMatrix * a_position; +} \ No newline at end of file diff --git a/core/assets/shaders/water.fragment b/core/assets/shaders/water.fragment index d8f26bebb1..172725177b 100644 --- a/core/assets/shaders/water.fragment +++ b/core/assets/shaders/water.fragment @@ -1,90 +1,18 @@ #ifdef GL_ES -precision highp float; -precision mediump int; +precision mediump float; #endif +varying vec4 v_color; +varying vec2 v_texCoords; uniform sampler2D u_texture; +uniform float u_time; -uniform vec2 camerapos; -uniform vec2 screensize; -uniform float time; - -varying vec4 v_color; -varying vec2 v_texCoord; - -float round(float num, float f){ - return float(int(num / f)) * f; +float round(float f, float v){ + return float(int(f / v)) * v; } -vec3 permute(vec3 x) { return mod(((x*34.0)+1.0)*x, 289.0); } - -float snoise(vec2 v){ - const vec4 C = vec4(0.211324865405187, 0.366025403784439, - -0.577350269189626, 0.024390243902439); - vec2 i = floor(v + dot(v, C.yy) ); - vec2 x0 = v - i + dot(i, C.xx); - vec2 i1; - i1 = (x0.x > x0.y) ? vec2(1.0, 0.0) : vec2(0.0, 1.0); - vec4 x12 = x0.xyxy + C.xxzz; - x12.xy -= i1; - i = mod(i, 289.0); - vec3 p = permute( permute( i.y + vec3(0.0, i1.y, 1.0 )) - + i.x + vec3(0.0, i1.x, 1.0 )); - vec3 m = max(0.5 - vec3(dot(x0,x0), dot(x12.xy,x12.xy), - dot(x12.zw,x12.zw)), 0.0); - m = m*m ; - m = m*m ; - vec3 x = 2.0 * fract(p * C.www) - 1.0; - vec3 h = abs(x) - 0.5; - vec3 ox = floor(x + 0.5); - vec3 a0 = x - ox; - m *= 1.79284291400159 - 0.85373472095314 * ( a0*a0 + h*h ); - vec3 g; - g.x = a0.x * x0.x + h.x * x0.y; - g.yz = a0.yz * x12.xz + h.yz * x12.yw; - return 130.0 * dot(m, g); -} - -void main() { - - vec2 c = v_texCoord.xy; - vec4 color = texture2D(u_texture, c) * v_color; - - vec2 v = vec2(1.0/screensize.x, 1.0/screensize.y); - ivec2 icoords = ivec2(int(c.x / v.x + camerapos.x), int(c.y / v.y + camerapos.y)); - vec2 coords = vec2(float(icoords.x), float(icoords.y)); - - float stime = time / 5.0; - - float mscl = 30.0; - float mth = 5.0; - - //if there's something actually there - if(color.r > 0.01){ - vec4 old = color; - color = texture2D(u_texture, c + vec2(sin(stime/3.0 + coords.y/0.75) * v.x, 0.0)) * vec4(0.9, 0.9, 1, 1.0); - color.a = 1.0; - - if(color.r < 0.01){ - color = old; - } - - float n1 = snoise(coords / 40.0 + vec2(time) / 200.0); - float n2 = snoise((coords + vec2(632.0)) / 25.0 + vec2(0.0, -time) / 190.0); - - float r = (n1 + n2) * 3.0; - - if(mod(float(int(coords.x + coords.y*1.1 + sin(stime / 8.0 + coords.x/5.0 - coords.y/100.0)*2.0)) + - sin(stime / 20.0 + coords.y/3.0) * 1.0 + - sin(stime / 10.0 + coords.y/2.0) * 2.0 + - sin(stime / 7.0 + coords.y/1.0) * 0.5 + - sin(coords.x + coords.y) + - sin(stime / 20.0 + coords.x/4.0) * 1.0, mscl) + r < mth){ - - color *= 1.2; - color.a = 1.0; - } - } - - gl_FragColor = color; -} +void main(){ + vec2 r = v_texCoords.xy; + vec4 c = v_color * texture2D(u_texture, v_texCoords.xy); + gl_FragColor = c * vec4(vec3(round(1.0 + sin((r.x + r.y) * 404.0 + u_time / 20.0) / 10.0, 0.05)), 1.0); +} \ No newline at end of file diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index 9d50e511b0..dc88fec6d5 100644 --- a/core/assets/sprites/sprites.atlas +++ b/core/assets/sprites/sprites.atlas @@ -48,7 +48,7 @@ overdrive-projector-top index: -1 shock-mine rotate: false - xy: 1831, 1096 + xy: 1865, 1096 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -216,140 +216,140 @@ conveyor-4-3 index: -1 titanium-conveyor-0-0 rotate: false - xy: 1579, 755 + xy: 1581, 1151 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-1 rotate: false - xy: 1581, 1151 + xy: 1529, 1096 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-2 rotate: false - xy: 1529, 1096 + xy: 1529, 1062 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-3 rotate: false - xy: 1529, 1062 + xy: 1551, 1028 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-0 rotate: false - xy: 1551, 1028 + xy: 1551, 994 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-1 rotate: false - xy: 1551, 994 + xy: 1581, 960 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-2 rotate: false - xy: 1581, 960 + xy: 1581, 926 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-3 rotate: false - xy: 1581, 926 + xy: 1583, 892 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-0 rotate: false - xy: 1583, 892 + xy: 1583, 858 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-1 rotate: false - xy: 1583, 858 + xy: 1583, 824 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-2 rotate: false - xy: 1583, 824 + xy: 1613, 790 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-3 rotate: false - xy: 1613, 790 + xy: 1613, 756 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-0 rotate: false - xy: 1613, 756 + xy: 1613, 722 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-1 rotate: false - xy: 1613, 722 + xy: 1127, 780 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-2 rotate: false - xy: 1127, 780 + xy: 1161, 780 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-3 rotate: false - xy: 1161, 780 + xy: 1195, 762 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-0 rotate: false - xy: 1195, 762 + xy: 1229, 744 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-1 rotate: false - xy: 1229, 744 + xy: 1263, 744 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-2 rotate: false - xy: 1263, 744 + xy: 1297, 726 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-3 rotate: false - xy: 1297, 726 + xy: 1331, 726 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -363,7 +363,7 @@ distributor index: -1 junction rotate: false - xy: 1173, 984 + xy: 1211, 1018 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -384,49 +384,49 @@ mass-driver-turret index: -1 overflow-gate rotate: false - xy: 1495, 1129 + xy: 1495, 1095 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor rotate: false - xy: 1483, 993 + xy: 1517, 1027 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-arrow rotate: false - xy: 1517, 1027 + xy: 1517, 993 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-bridge rotate: false - xy: 1517, 993 + xy: 1445, 959 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-end rotate: false - xy: 1445, 959 + xy: 1479, 959 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 router rotate: false - xy: 1413, 823 + xy: 1447, 823 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sorter rotate: false - xy: 1125, 848 + xy: 1159, 848 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -774,34 +774,27 @@ deepwater orig: 32, 32 offset: 0, 0 index: -1 -deepwater-icon-medium - rotate: false - xy: 923, 326 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 dirt1 - rotate: false - xy: 923, 258 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -dirt2 rotate: false xy: 923, 224 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -dirt3 +dirt2 rotate: false xy: 923, 190 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 +dirt3 + rotate: false + xy: 923, 156 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 edge-stencil-blocky rotate: false xy: 1, 925 @@ -818,42 +811,42 @@ edge-stencil-smooth index: -1 grass1 rotate: false - xy: 957, 462 + xy: 957, 428 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 grass2 rotate: false - xy: 957, 428 + xy: 957, 394 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 grass3 rotate: false - xy: 957, 394 + xy: 957, 360 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 holostone1 rotate: false - xy: 957, 258 + xy: 957, 224 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 holostone2 rotate: false - xy: 957, 224 + xy: 957, 190 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 holostone3 rotate: false - xy: 957, 190 + xy: 957, 156 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -867,42 +860,42 @@ ice-edge index: -1 ice-snow1 rotate: false - xy: 995, 734 + xy: 995, 700 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ice-snow2 rotate: false - xy: 995, 700 + xy: 995, 666 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ice-snow3 rotate: false - xy: 995, 666 + xy: 995, 632 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ice1 rotate: false - xy: 957, 122 + xy: 957, 88 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ice2 rotate: false - xy: 957, 88 + xy: 962, 54 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ice3 rotate: false - xy: 962, 54 + xy: 962, 20 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -916,84 +909,84 @@ icerocks-large index: -1 icerocks1 rotate: false - xy: 995, 598 + xy: 995, 564 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icerocks2 rotate: false - xy: 995, 564 + xy: 991, 530 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 lava rotate: false - xy: 1025, 462 + xy: 1025, 428 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 lead1 rotate: false - xy: 1025, 394 + xy: 1025, 360 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 lead2 rotate: false - xy: 1025, 360 + xy: 1025, 326 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 lead3 rotate: false - xy: 1025, 326 + xy: 1025, 292 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metalfloor1 rotate: false - xy: 1063, 750 + xy: 1063, 716 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metalfloor2 rotate: false - xy: 1063, 716 + xy: 1063, 682 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metalfloor3 rotate: false - xy: 1063, 682 + xy: 1063, 648 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metalfloor4 rotate: false - xy: 1063, 648 + xy: 1063, 614 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metalfloor5 rotate: false - xy: 1063, 614 + xy: 1063, 580 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metalfloor6 rotate: false - xy: 1063, 580 + xy: 1059, 546 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1007,7 +1000,7 @@ mountains-tiles index: -1 pine rotate: false - xy: 1547, 959 + xy: 1547, 925 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1035,84 +1028,84 @@ rocks-large index: -1 rocks1 rotate: false - xy: 1515, 891 + xy: 1515, 857 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rocks2 rotate: false - xy: 1515, 857 + xy: 1549, 891 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand1 rotate: false - xy: 1627, 1195 + xy: 1661, 1198 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand2 rotate: false - xy: 1661, 1198 + xy: 1695, 1198 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand3 rotate: false - xy: 1695, 1198 + xy: 1627, 1161 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap1 rotate: false - xy: 1763, 1148 + xy: 1797, 1122 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap2 rotate: false - xy: 1797, 1122 + xy: 1661, 1130 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap3 rotate: false - xy: 1661, 1130 + xy: 1695, 1130 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snow1 rotate: false - xy: 1933, 1075 + xy: 1967, 1075 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snow2 rotate: false - xy: 1967, 1075 + xy: 1899, 1041 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snow3 rotate: false - xy: 1899, 1041 + xy: 1933, 1041 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 space rotate: false - xy: 1069, 816 + xy: 1103, 814 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1140,77 +1133,77 @@ spore-cluster3 index: -1 stone3 rotate: false - xy: 1239, 812 + xy: 1273, 812 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 tar rotate: false - xy: 1375, 794 + xy: 1409, 789 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 tar-icon-medium rotate: false - xy: 1375, 794 + xy: 1409, 789 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium1 rotate: false - xy: 1511, 789 + xy: 1545, 789 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium2 rotate: false - xy: 1545, 789 + xy: 1307, 760 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium3 rotate: false - xy: 1307, 760 + xy: 1341, 760 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium1 rotate: false - xy: 1511, 755 + xy: 1545, 755 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium2 rotate: false - xy: 1545, 755 + xy: 1579, 789 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium3 rotate: false - xy: 1579, 789 + xy: 1579, 755 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 water rotate: false - xy: 1097, 712 + xy: 1097, 678 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -water-icon-medium +water-sand rotate: false - xy: 1097, 712 + xy: 1131, 678 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1308,7 +1301,7 @@ rubble-3-1 index: -1 spawn rotate: false - xy: 1103, 814 + xy: 1137, 814 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1455,28 +1448,28 @@ conduit-top-6 index: -1 liquid-junction rotate: false - xy: 1025, 258 + xy: 1025, 224 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-bottom rotate: false - xy: 1025, 156 + xy: 1025, 122 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-liquid rotate: false - xy: 1025, 88 + xy: 1030, 54 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-top rotate: false - xy: 1030, 54 + xy: 1030, 20 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1504,84 +1497,84 @@ liquid-tank-top index: -1 mechanical-pump rotate: false - xy: 1029, 750 + xy: 1029, 716 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit rotate: false - xy: 1415, 1027 + xy: 1415, 993 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-arrow rotate: false - xy: 1415, 993 + xy: 1449, 1027 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-bridge rotate: false - xy: 1449, 1027 + xy: 1449, 993 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-end rotate: false - xy: 1449, 993 + xy: 1483, 1027 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-0 rotate: false - xy: 1243, 846 + xy: 1277, 846 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-1 rotate: false - xy: 1277, 846 + xy: 1311, 896 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-2 rotate: false - xy: 1311, 896 + xy: 1311, 862 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-3 rotate: false - xy: 1311, 862 + xy: 1345, 896 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-4 rotate: false - xy: 1345, 896 + xy: 1345, 862 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-5 rotate: false - xy: 1345, 862 + xy: 1379, 896 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-6 rotate: false - xy: 1379, 896 + xy: 1379, 862 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1742,7 +1735,7 @@ fusion-reactor-top index: -1 power-node rotate: false - xy: 1175, 916 + xy: 1141, 882 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1756,28 +1749,28 @@ power-node-large index: -1 power-source rotate: false - xy: 1209, 932 + xy: 1209, 898 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 power-void rotate: false - xy: 1209, 864 + xy: 1243, 914 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 powerinfinite rotate: false - xy: 1277, 914 + xy: 1243, 880 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 powervoid rotate: false - xy: 1243, 880 + xy: 1277, 880 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1791,14 +1784,14 @@ rtg-generator index: -1 rtg-generator-top rotate: false - xy: 1515, 823 + xy: 1549, 823 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 solar-panel rotate: false - xy: 1967, 1041 + xy: 2001, 1057 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2001,49 +1994,49 @@ graphite-press index: -1 incinerator rotate: false - xy: 991, 462 + xy: 991, 428 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-source rotate: false - xy: 1089, 952 + xy: 1073, 918 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-void rotate: false - xy: 1177, 1018 + xy: 1189, 1052 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 lavasmelter rotate: false - xy: 1025, 428 + xy: 1025, 394 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-source rotate: false - xy: 989, 852 + xy: 973, 818 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 melter rotate: false - xy: 1029, 648 + xy: 1029, 614 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 oilrefinery rotate: false - xy: 1059, 512 + xy: 1059, 478 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2085,14 +2078,14 @@ plastanium-compressor-top index: -1 pulverizer rotate: false - xy: 1379, 862 + xy: 1311, 828 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulverizer-rotator rotate: false - xy: 1345, 828 + xy: 1379, 828 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2106,14 +2099,14 @@ pyratite-mixer index: -1 separator rotate: false - xy: 1729, 1114 + xy: 1763, 1114 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 separator-liquid rotate: false - xy: 1797, 1088 + xy: 1831, 1096 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2127,14 +2120,14 @@ silicon-smelter index: -1 smelter rotate: false - xy: 1899, 1075 + xy: 1933, 1075 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 solidifer rotate: false - xy: 1057, 850 + xy: 1091, 850 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2176,14 +2169,14 @@ launch-pad index: -1 sortedunloader rotate: false - xy: 1091, 850 + xy: 1125, 848 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unloader rotate: false - xy: 1569, 721 + xy: 1097, 746 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2274,7 +2267,7 @@ cyclone index: -1 duo rotate: false - xy: 928, 20 + xy: 967, 768 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2288,7 +2281,7 @@ fuse index: -1 hail rotate: false - xy: 957, 326 + xy: 957, 292 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2372,21 +2365,21 @@ salvo-panel-right index: -1 scatter rotate: false - xy: 1661, 1164 + xy: 1695, 1164 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scorch rotate: false - xy: 1695, 1164 + xy: 1729, 1148 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scorch-shoot rotate: false - xy: 1729, 1148 + xy: 1763, 1148 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2554,14 +2547,14 @@ reconstructor-open index: -1 repair-point rotate: false - xy: 1413, 857 + xy: 1447, 891 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 repair-point-turret rotate: false - xy: 1447, 857 + xy: 1481, 891 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2638,7 +2631,7 @@ copper-wall-large index: -1 door rotate: false - xy: 923, 122 + xy: 923, 88 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2659,14 +2652,14 @@ door-large-open index: -1 door-open rotate: false - xy: 928, 54 + xy: 928, 20 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-wall rotate: false - xy: 1513, 959 + xy: 1445, 925 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2680,7 +2673,7 @@ phase-wall-large index: -1 surge-wall rotate: false - xy: 1239, 778 + xy: 1273, 778 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2694,7 +2687,7 @@ surge-wall-large index: -1 thorium-wall rotate: false - xy: 1375, 760 + xy: 1409, 755 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2708,7 +2701,7 @@ thorium-wall-large index: -1 titanium-wall rotate: false - xy: 1365, 726 + xy: 1399, 721 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2799,7 +2792,7 @@ error index: -1 laser rotate: false - xy: 1827, 1420 + xy: 2036, 1869 size: 4, 48 orig: 4, 48 offset: 0, 0 @@ -2820,7 +2813,7 @@ laserfull index: -1 minelaser rotate: false - xy: 2036, 1869 + xy: 2035, 1041 size: 4, 48 orig: 4, 48 offset: 0, 0 @@ -2855,35 +2848,35 @@ scale_marker index: -1 scorch1 rotate: false - xy: 1131, 576 + xy: 1165, 626 size: 28, 100 orig: 28, 100 offset: 0, 0 index: -1 scorch2 rotate: false - xy: 1127, 474 + xy: 1195, 626 size: 28, 100 orig: 28, 100 offset: 0, 0 index: -1 scorch3 rotate: false - xy: 1127, 372 + xy: 1225, 626 size: 28, 100 orig: 28, 100 offset: 0, 0 index: -1 scorch4 rotate: false - xy: 1127, 270 + xy: 1255, 642 size: 28, 100 orig: 28, 100 offset: 0, 0 index: -1 scorch5 rotate: false - xy: 1127, 168 + xy: 1127, 508 size: 28, 100 orig: 28, 100 offset: 0, 0 @@ -2904,21 +2897,21 @@ shell-back index: -1 shot rotate: false - xy: 1831, 1062 + xy: 1865, 1062 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 transfer rotate: false - xy: 2035, 1041 + xy: 2042, 1999 size: 4, 48 orig: 4, 48 offset: 0, 0 index: -1 transfer-arrow rotate: false - xy: 1467, 721 + xy: 1501, 721 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2967,7 +2960,7 @@ alpha-mech-pad-icon-medium index: -1 alpha-mech-pad-icon-small rotate: false - xy: 1127, 104 + xy: 656, 7 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -2995,7 +2988,7 @@ arc-icon-large index: -1 arc-icon-small rotate: false - xy: 656, 7 + xy: 1415, 967 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3016,7 +3009,7 @@ battery-icon-medium index: -1 battery-icon-small rotate: false - xy: 1415, 967 + xy: 551, 1302 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3037,7 +3030,7 @@ battery-large-icon-medium index: -1 battery-large-icon-small rotate: false - xy: 551, 1302 + xy: 1069, 790 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3065,7 +3058,7 @@ biomattercompressor-icon-medium index: -1 biomattercompressor-icon-small rotate: false - xy: 1069, 790 + xy: 1529, 1137 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3093,7 +3086,7 @@ blast-drill-icon-medium index: -1 blast-drill-icon-small rotate: false - xy: 1529, 1137 + xy: 1637, 1237 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3114,7 +3107,7 @@ blast-mixer-icon-medium index: -1 blast-mixer-icon-small rotate: false - xy: 1637, 1237 + xy: 1097, 584 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3135,7 +3128,7 @@ bridge-conduit-icon-medium index: -1 bridge-conduit-icon-small rotate: false - xy: 1097, 584 + xy: 1127, 343 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3156,7 +3149,7 @@ bridge-conveyor-icon-medium index: -1 bridge-conveyor-icon-small rotate: false - xy: 1161, 589 + xy: 682, 7 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3184,7 +3177,7 @@ char-icon-medium index: -1 char-icon-small rotate: false - xy: 682, 7 + xy: 708, 7 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3205,7 +3198,7 @@ cliffs-icon-medium index: -1 cliffs-icon-small rotate: false - xy: 708, 7 + xy: 1127, 291 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3254,7 +3247,7 @@ conduit-icon-large index: -1 conduit-icon-small rotate: false - xy: 760, 7 + xy: 1127, 265 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3275,7 +3268,7 @@ container-icon-medium index: -1 container-icon-small rotate: false - xy: 786, 7 + xy: 760, 7 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3296,7 +3289,7 @@ conveyor-icon-medium index: -1 conveyor-icon-small rotate: false - xy: 812, 7 + xy: 1127, 239 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3317,7 +3310,7 @@ copper-wall-icon-medium index: -1 copper-wall-icon-small rotate: false - xy: 838, 7 + xy: 786, 7 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3338,7 +3331,7 @@ copper-wall-large-icon-medium index: -1 copper-wall-large-icon-small rotate: false - xy: 864, 7 + xy: 1127, 213 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3359,7 +3352,7 @@ core-icon-medium index: -1 core-icon-small rotate: false - xy: 1563, 1062 + xy: 812, 7 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3387,7 +3380,7 @@ craters-icon-medium index: -1 craters-icon-small rotate: false - xy: 1563, 1088 + xy: 1127, 187 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3415,7 +3408,7 @@ cryofluidmixer-icon-medium index: -1 cryofluidmixer-icon-small rotate: false - xy: 1132, 78 + xy: 838, 7 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3443,7 +3436,7 @@ cultivator-icon-medium index: -1 cultivator-icon-small rotate: false - xy: 1132, 52 + xy: 1127, 161 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3471,7 +3464,7 @@ cyclone-icon-medium index: -1 cyclone-icon-small rotate: false - xy: 1132, 26 + xy: 864, 7 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3499,7 +3492,7 @@ dagger-factory-icon-medium index: -1 dagger-factory-icon-small rotate: false - xy: 2021, 1687 + xy: 1127, 135 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3520,7 +3513,7 @@ dart-ship-pad-icon-medium index: -1 dart-ship-pad-icon-small rotate: false - xy: 2021, 1661 + xy: 1127, 109 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3539,9 +3532,16 @@ deepwater-icon-large orig: 48, 48 offset: 0, 0 index: -1 +deepwater-icon-medium + rotate: false + xy: 923, 292 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 deepwater-icon-small rotate: false - xy: 1195, 736 + xy: 1563, 1062 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3555,14 +3555,14 @@ delta-mech-pad-icon-large index: -1 delta-mech-pad-icon-medium rotate: false - xy: 923, 292 + xy: 923, 258 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 delta-mech-pad-icon-small rotate: false - xy: 1194, 710 + xy: 1563, 1088 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3576,14 +3576,14 @@ distributor-icon-large index: -1 distributor-icon-medium rotate: false - xy: 923, 156 + xy: 923, 122 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 distributor-icon-small rotate: false - xy: 1555, 1137 + xy: 2021, 1687 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3597,14 +3597,14 @@ door-icon-large index: -1 door-icon-medium rotate: false - xy: 923, 88 + xy: 939, 802 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 door-icon-small rotate: false - xy: 1581, 1125 + xy: 2021, 1661 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3618,28 +3618,28 @@ door-large-icon-large index: -1 door-large-icon-medium rotate: false - xy: 939, 802 + xy: 928, 54 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 door-large-icon-small rotate: false - xy: 1161, 563 + xy: 1165, 600 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 duo-icon-full rotate: false - xy: 967, 768 + xy: 961, 734 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 duo-icon-medium rotate: false - xy: 967, 768 + xy: 961, 734 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3653,7 +3653,7 @@ duo-icon-large index: -1 duo-icon-small rotate: false - xy: 1157, 537 + xy: 1191, 600 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3667,14 +3667,14 @@ force-projector-icon-large index: -1 force-projector-icon-medium rotate: false - xy: 961, 700 + xy: 961, 666 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 force-projector-icon-small rotate: false - xy: 1157, 511 + xy: 1217, 600 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3695,14 +3695,14 @@ fortress-factory-icon-large index: -1 fortress-factory-icon-medium rotate: false - xy: 961, 666 + xy: 961, 632 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 fortress-factory-icon-small rotate: false - xy: 1157, 485 + xy: 1157, 574 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3723,14 +3723,14 @@ fuse-icon-large index: -1 fuse-icon-medium rotate: false - xy: 961, 632 + xy: 961, 598 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 fuse-icon-small rotate: false - xy: 1157, 459 + xy: 1157, 548 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3751,14 +3751,14 @@ fusion-reactor-icon-large index: -1 fusion-reactor-icon-medium rotate: false - xy: 961, 598 + xy: 961, 564 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 fusion-reactor-icon-small rotate: false - xy: 1157, 433 + xy: 1183, 574 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3779,14 +3779,14 @@ ghoul-factory-icon-large index: -1 ghoul-factory-icon-medium rotate: false - xy: 961, 564 + xy: 957, 530 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ghoul-factory-icon-small rotate: false - xy: 1157, 407 + xy: 1157, 522 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3800,14 +3800,14 @@ glaive-ship-pad-icon-large index: -1 glaive-ship-pad-icon-medium rotate: false - xy: 957, 530 + xy: 957, 496 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 glaive-ship-pad-icon-small rotate: false - xy: 1157, 381 + xy: 1183, 548 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3821,14 +3821,14 @@ graphite-press-icon-large index: -1 graphite-press-icon-medium rotate: false - xy: 957, 496 + xy: 957, 462 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 graphite-press-icon-small rotate: false - xy: 1157, 355 + xy: 1209, 574 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3849,28 +3849,28 @@ grass-icon-large index: -1 grass-icon-medium rotate: false - xy: 957, 360 + xy: 957, 326 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 grass-icon-small rotate: false - xy: 1157, 329 + xy: 1183, 522 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 hail-icon-full rotate: false - xy: 957, 292 + xy: 957, 258 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 hail-icon-medium rotate: false - xy: 957, 292 + xy: 957, 258 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3884,7 +3884,7 @@ hail-icon-large index: -1 hail-icon-small rotate: false - xy: 1157, 303 + xy: 1209, 548 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3905,14 +3905,14 @@ holostone-icon-large index: -1 holostone-icon-medium rotate: false - xy: 957, 156 + xy: 957, 122 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 holostone-icon-small rotate: false - xy: 1157, 277 + xy: 1209, 522 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3926,14 +3926,14 @@ ice-icon-large index: -1 ice-icon-medium rotate: false - xy: 962, 20 + xy: 995, 734 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ice-icon-small rotate: false - xy: 1157, 251 + xy: 1255, 616 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3954,14 +3954,14 @@ ice-snow-icon-large index: -1 ice-snow-icon-medium rotate: false - xy: 995, 632 + xy: 995, 598 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ice-snow-icon-small rotate: false - xy: 1157, 225 + xy: 1132, 83 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3975,14 +3975,14 @@ icerocks-icon-large index: -1 icerocks-icon-medium rotate: false - xy: 991, 530 + xy: 991, 496 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icerocks-icon-small rotate: false - xy: 1157, 199 + xy: 1132, 57 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3996,14 +3996,14 @@ incinerator-icon-large index: -1 incinerator-icon-medium rotate: false - xy: 991, 428 + xy: 991, 394 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 incinerator-icon-small rotate: false - xy: 1158, 78 + xy: 1285, 674 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4017,14 +4017,14 @@ item-source-icon-large index: -1 item-source-icon-medium rotate: false - xy: 1073, 918 + xy: 1073, 884 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-source-icon-small rotate: false - xy: 1158, 10 + xy: 1285, 648 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4038,14 +4038,14 @@ item-void-icon-large index: -1 item-void-icon-medium rotate: false - xy: 1189, 1052 + xy: 1139, 984 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-void-icon-small rotate: false - xy: 1607, 1125 + xy: 1311, 658 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4059,14 +4059,14 @@ javelin-ship-pad-icon-large index: -1 javelin-ship-pad-icon-medium rotate: false - xy: 1139, 984 + xy: 1173, 984 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 javelin-ship-pad-icon-small rotate: false - xy: 1633, 1135 + xy: 1337, 700 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4080,14 +4080,14 @@ junction-icon-large index: -1 junction-icon-medium rotate: false - xy: 1211, 1018 + xy: 1207, 984 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 junction-icon-small rotate: false - xy: 1589, 1099 + xy: 1337, 674 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4108,14 +4108,14 @@ lancer-icon-large index: -1 lancer-icon-medium rotate: false - xy: 1207, 984 + xy: 1025, 530 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 lancer-icon-small rotate: false - xy: 1589, 1073 + xy: 1363, 700 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4136,14 +4136,14 @@ laser-drill-icon-large index: -1 laser-drill-icon-medium rotate: false - xy: 1025, 530 + xy: 1025, 496 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 laser-drill-icon-small rotate: false - xy: 1615, 1099 + xy: 1363, 674 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4157,14 +4157,14 @@ launch-pad-icon-large index: -1 launch-pad-icon-medium rotate: false - xy: 1025, 496 + xy: 1025, 462 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 launch-pad-icon-small rotate: false - xy: 1615, 1073 + xy: 1337, 648 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4178,28 +4178,28 @@ liquid-junction-icon-large index: -1 liquid-junction-icon-medium rotate: false - xy: 1025, 224 + xy: 1025, 190 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-junction-icon-small rotate: false - xy: 1589, 1047 + xy: 1363, 648 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-router-icon-full rotate: false - xy: 1025, 122 + xy: 1025, 88 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-icon-medium rotate: false - xy: 1025, 122 + xy: 1025, 88 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4213,7 +4213,7 @@ liquid-router-icon-large index: -1 liquid-router-icon-small rotate: false - xy: 1615, 1047 + xy: 1311, 632 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4227,14 +4227,14 @@ liquid-source-icon-large index: -1 liquid-source-icon-medium rotate: false - xy: 973, 818 + xy: 1023, 868 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-source-icon-small rotate: false - xy: 1585, 1021 + xy: 1285, 622 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4255,14 +4255,14 @@ liquid-tank-icon-large index: -1 liquid-tank-icon-medium rotate: false - xy: 1023, 868 + xy: 1007, 818 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-tank-icon-small rotate: false - xy: 1585, 995 + xy: 1389, 695 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4283,14 +4283,14 @@ mass-driver-icon-large index: -1 mass-driver-icon-medium rotate: false - xy: 1001, 784 + xy: 1035, 784 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mass-driver-icon-small rotate: false - xy: 1611, 1021 + xy: 1389, 669 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4367,14 +4367,14 @@ mechanical-drill-icon-large index: -1 mechanical-drill-icon-medium rotate: false - xy: 1035, 784 + xy: 1029, 750 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mechanical-drill-icon-small rotate: false - xy: 1611, 995 + xy: 1415, 695 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4388,14 +4388,14 @@ mechanical-pump-icon-large index: -1 mechanical-pump-icon-medium rotate: false - xy: 1029, 716 + xy: 1029, 682 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mechanical-pump-icon-small rotate: false - xy: 1615, 969 + xy: 1415, 669 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4416,14 +4416,14 @@ meltdown-icon-large index: -1 meltdown-icon-medium rotate: false - xy: 1029, 682 + xy: 1029, 648 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 meltdown-icon-small rotate: false - xy: 1615, 943 + xy: 1441, 695 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4437,14 +4437,14 @@ melter-icon-large index: -1 melter-icon-medium rotate: false - xy: 1029, 614 + xy: 1029, 580 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 melter-icon-small rotate: false - xy: 1617, 917 + xy: 1441, 669 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4458,14 +4458,14 @@ mend-projector-icon-large index: -1 mend-projector-icon-medium rotate: false - xy: 1029, 580 + xy: 1063, 750 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mend-projector-icon-small rotate: false - xy: 1617, 891 + xy: 1467, 695 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4486,14 +4486,14 @@ oil-extractor-icon-large index: -1 oil-extractor-icon-medium rotate: false - xy: 1059, 546 + xy: 1059, 512 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 oil-extractor-icon-small rotate: false - xy: 1617, 865 + xy: 1467, 669 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4507,14 +4507,14 @@ omega-mech-pad-icon-large index: -1 omega-mech-pad-icon-medium rotate: false - xy: 1059, 478 + xy: 1059, 444 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 omega-mech-pad-icon-small rotate: false - xy: 1617, 839 + xy: 1493, 695 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4528,42 +4528,42 @@ ore-coal-grass-icon-large index: -1 ore-coal-grass-icon-small rotate: false - xy: 1157, 147 + xy: 1493, 669 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-coal-grass1 rotate: false - xy: 1059, 444 + xy: 1059, 410 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-grass2 rotate: false - xy: 1059, 410 + xy: 1059, 376 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-grass3 rotate: false - xy: 1059, 376 + xy: 1059, 342 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-grass-icon-full rotate: false - xy: 1059, 376 + xy: 1059, 342 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-grass-icon-medium rotate: false - xy: 1059, 376 + xy: 1059, 342 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4577,42 +4577,42 @@ ore-coal-holostone-icon-large index: -1 ore-coal-holostone-icon-small rotate: false - xy: 1183, 537 + xy: 1519, 695 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-coal-holostone1 rotate: false - xy: 1059, 342 + xy: 1059, 308 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-holostone2 rotate: false - xy: 1059, 308 + xy: 1059, 274 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-holostone3 rotate: false - xy: 1059, 274 + xy: 1059, 240 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-holostone-icon-full rotate: false - xy: 1059, 274 + xy: 1059, 240 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-holostone-icon-medium rotate: false - xy: 1059, 274 + xy: 1059, 240 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4626,42 +4626,42 @@ ore-coal-sand-icon-large index: -1 ore-coal-sand-icon-small rotate: false - xy: 1183, 511 + xy: 1519, 669 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-coal-sand1 rotate: false - xy: 1059, 240 + xy: 1059, 206 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-sand2 rotate: false - xy: 1059, 206 + xy: 1059, 172 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-sand3 rotate: false - xy: 1059, 172 + xy: 1059, 138 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-sand-icon-full rotate: false - xy: 1059, 172 + xy: 1059, 138 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-sand-icon-medium rotate: false - xy: 1059, 172 + xy: 1059, 138 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4675,42 +4675,42 @@ ore-coal-stone-icon-large index: -1 ore-coal-stone-icon-small rotate: false - xy: 1183, 485 + xy: 1545, 695 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-coal-stone1 rotate: false - xy: 1059, 138 + xy: 1059, 104 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-stone2 rotate: false - xy: 1059, 104 + xy: 1064, 70 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-stone3 rotate: false - xy: 1064, 70 + xy: 1064, 36 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-stone-icon-full rotate: false - xy: 1064, 70 + xy: 1064, 36 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-stone-icon-medium rotate: false - xy: 1064, 70 + xy: 1064, 36 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4724,42 +4724,42 @@ ore-copper-grass-icon-large index: -1 ore-copper-grass-icon-small rotate: false - xy: 1183, 459 + xy: 1545, 669 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-copper-grass1 rotate: false - xy: 1064, 36 + xy: 1064, 2 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-grass2 rotate: false - xy: 1064, 2 + xy: 1239, 1102 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-grass3 rotate: false - xy: 1239, 1102 + xy: 1223, 1068 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-grass-icon-full rotate: false - xy: 1239, 1102 + xy: 1223, 1068 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-grass-icon-medium rotate: false - xy: 1239, 1102 + xy: 1223, 1068 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4773,42 +4773,42 @@ ore-copper-holostone-icon-large index: -1 ore-copper-holostone-icon-small rotate: false - xy: 1183, 433 + xy: 1571, 695 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-copper-holostone1 rotate: false - xy: 1223, 1068 + xy: 1273, 1118 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-holostone2 rotate: false - xy: 1273, 1118 + xy: 1307, 1118 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-holostone3 rotate: false - xy: 1307, 1118 + xy: 1257, 1068 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-holostone-icon-full rotate: false - xy: 1307, 1118 + xy: 1257, 1068 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-holostone-icon-medium rotate: false - xy: 1307, 1118 + xy: 1257, 1068 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4822,42 +4822,42 @@ ore-copper-sand-icon-large index: -1 ore-copper-sand-icon-small rotate: false - xy: 1183, 407 + xy: 1571, 669 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-copper-sand1 rotate: false - xy: 1257, 1068 + xy: 1245, 1034 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-sand2 rotate: false - xy: 1245, 1034 + xy: 1291, 1084 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-sand3 rotate: false - xy: 1291, 1084 + xy: 1245, 1000 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-sand-icon-full rotate: false - xy: 1291, 1084 + xy: 1245, 1000 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-sand-icon-medium rotate: false - xy: 1291, 1084 + xy: 1245, 1000 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4871,42 +4871,42 @@ ore-copper-stone-icon-large index: -1 ore-copper-stone-icon-small rotate: false - xy: 1183, 381 + xy: 1389, 643 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-copper-stone1 rotate: false - xy: 1245, 1000 + xy: 1291, 1050 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-stone2 rotate: false - xy: 1291, 1050 + xy: 1279, 1016 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-stone3 rotate: false - xy: 1279, 1016 + xy: 1325, 1084 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-stone-icon-full rotate: false - xy: 1279, 1016 + xy: 1325, 1084 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-stone-icon-medium rotate: false - xy: 1279, 1016 + xy: 1325, 1084 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4920,42 +4920,42 @@ ore-lead-grass-icon-large index: -1 ore-lead-grass-icon-small rotate: false - xy: 1183, 355 + xy: 1415, 643 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-lead-grass1 rotate: false - xy: 1325, 1084 + xy: 1325, 1050 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-grass2 rotate: false - xy: 1325, 1050 + xy: 1313, 1016 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-grass3 rotate: false - xy: 1313, 1016 + xy: 1279, 982 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-grass-icon-full rotate: false - xy: 1313, 1016 + xy: 1279, 982 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-grass-icon-medium rotate: false - xy: 1313, 1016 + xy: 1279, 982 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4969,42 +4969,42 @@ ore-lead-holostone-icon-large index: -1 ore-lead-holostone-icon-small rotate: false - xy: 1183, 329 + xy: 1441, 643 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-lead-holostone1 rotate: false - xy: 1279, 982 + xy: 1313, 982 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-holostone2 rotate: false - xy: 1313, 982 + xy: 1359, 1100 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-holostone3 rotate: false - xy: 1359, 1100 + xy: 1359, 1066 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-holostone-icon-full rotate: false - xy: 1359, 1100 + xy: 1359, 1066 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-holostone-icon-medium rotate: false - xy: 1359, 1100 + xy: 1359, 1066 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5018,42 +5018,42 @@ ore-lead-sand-icon-large index: -1 ore-lead-sand-icon-small rotate: false - xy: 1183, 303 + xy: 1467, 643 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-lead-sand1 rotate: false - xy: 1359, 1066 + xy: 1359, 1032 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-sand2 rotate: false - xy: 1359, 1032 + xy: 1347, 998 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-sand3 rotate: false - xy: 1347, 998 + xy: 1347, 964 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-sand-icon-full rotate: false - xy: 1347, 998 + xy: 1347, 964 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-sand-icon-medium rotate: false - xy: 1347, 998 + xy: 1347, 964 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5067,42 +5067,42 @@ ore-lead-stone-icon-large index: -1 ore-lead-stone-icon-small rotate: false - xy: 1183, 277 + xy: 1493, 643 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-lead-stone1 rotate: false - xy: 1347, 964 + xy: 1241, 966 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-stone2 rotate: false - xy: 1241, 966 + xy: 1381, 998 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-stone3 rotate: false - xy: 1381, 998 + xy: 1381, 964 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-stone-icon-full rotate: false - xy: 1381, 998 + xy: 1381, 964 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-stone-icon-medium rotate: false - xy: 1381, 998 + xy: 1381, 964 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5116,42 +5116,42 @@ ore-scrap-grass-icon-large index: -1 ore-scrap-grass-icon-small rotate: false - xy: 1183, 251 + xy: 1519, 643 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-scrap-grass1 rotate: false - xy: 1381, 964 + xy: 1275, 948 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-grass2 rotate: false - xy: 1275, 948 + xy: 1309, 948 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-grass3 rotate: false - xy: 1309, 948 + xy: 1343, 930 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-grass-icon-full rotate: false - xy: 1309, 948 + xy: 1343, 930 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-grass-icon-medium rotate: false - xy: 1309, 948 + xy: 1343, 930 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5165,42 +5165,42 @@ ore-scrap-holostone-icon-large index: -1 ore-scrap-holostone-icon-small rotate: false - xy: 1183, 225 + xy: 1545, 643 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-scrap-holostone1 rotate: false - xy: 1343, 930 + xy: 1377, 930 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-holostone2 rotate: false - xy: 1377, 930 + xy: 1093, 546 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-holostone3 rotate: false - xy: 1093, 546 + xy: 1093, 512 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-holostone-icon-full rotate: false - xy: 1093, 546 + xy: 1093, 512 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-holostone-icon-medium rotate: false - xy: 1093, 546 + xy: 1093, 512 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5214,42 +5214,42 @@ ore-scrap-sand-icon-large index: -1 ore-scrap-sand-icon-small rotate: false - xy: 1183, 199 + xy: 1571, 643 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-scrap-sand1 rotate: false - xy: 1093, 512 + xy: 1093, 478 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-sand2 rotate: false - xy: 1093, 478 + xy: 1093, 444 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-sand3 rotate: false - xy: 1093, 444 + xy: 1093, 410 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-sand-icon-full rotate: false - xy: 1093, 444 + xy: 1093, 410 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-sand-icon-medium rotate: false - xy: 1093, 444 + xy: 1093, 410 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5263,42 +5263,42 @@ ore-scrap-stone-icon-large index: -1 ore-scrap-stone-icon-small rotate: false - xy: 1183, 173 + xy: 1337, 622 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-scrap-stone1 rotate: false - xy: 1093, 410 + xy: 1093, 376 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-stone2 rotate: false - xy: 1093, 376 + xy: 1093, 342 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-stone3 rotate: false - xy: 1093, 342 + xy: 1093, 308 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-stone-icon-full rotate: false - xy: 1093, 342 + xy: 1093, 308 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-stone-icon-medium rotate: false - xy: 1093, 342 + xy: 1093, 308 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5312,42 +5312,42 @@ ore-thorium-grass-icon-large index: -1 ore-thorium-grass-icon-small rotate: false - xy: 1183, 147 + xy: 1363, 622 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-thorium-grass1 rotate: false - xy: 1093, 308 + xy: 1093, 274 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-grass2 rotate: false - xy: 1093, 274 + xy: 1093, 240 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-grass3 rotate: false - xy: 1093, 240 + xy: 1093, 206 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-grass-icon-full rotate: false - xy: 1093, 240 + xy: 1093, 206 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-grass-icon-medium rotate: false - xy: 1093, 240 + xy: 1093, 206 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5361,42 +5361,42 @@ ore-thorium-holostone-icon-large index: -1 ore-thorium-holostone-icon-small rotate: false - xy: 1179, 121 + xy: 1389, 617 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-thorium-holostone1 rotate: false - xy: 1093, 206 + xy: 1093, 172 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-holostone2 rotate: false - xy: 1093, 172 + xy: 1093, 138 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-holostone3 rotate: false - xy: 1093, 138 + xy: 1093, 104 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-holostone-icon-full rotate: false - xy: 1093, 138 + xy: 1093, 104 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-holostone-icon-medium rotate: false - xy: 1093, 138 + xy: 1093, 104 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5410,42 +5410,42 @@ ore-thorium-sand-icon-large index: -1 ore-thorium-sand-icon-small rotate: false - xy: 1637, 1021 + xy: 1415, 617 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-thorium-sand1 rotate: false - xy: 1093, 104 + xy: 1098, 70 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-sand2 rotate: false - xy: 1098, 70 + xy: 1098, 36 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-sand3 rotate: false - xy: 1098, 36 + xy: 1098, 2 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-sand-icon-full rotate: false - xy: 1098, 36 + xy: 1098, 2 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-sand-icon-medium rotate: false - xy: 1098, 36 + xy: 1098, 2 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5459,42 +5459,42 @@ ore-thorium-stone-icon-large index: -1 ore-thorium-stone-icon-small rotate: false - xy: 1637, 995 + xy: 1441, 617 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-thorium-stone1 rotate: false - xy: 1098, 2 + xy: 1411, 930 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-stone2 rotate: false - xy: 1411, 930 + xy: 551, 1267 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-stone3 rotate: false - xy: 551, 1267 + xy: 1391, 1163 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-stone-icon-full rotate: false - xy: 551, 1267 + xy: 1391, 1163 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-stone-icon-medium rotate: false - xy: 551, 1267 + xy: 1391, 1163 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5508,42 +5508,42 @@ ore-titanium-grass-icon-large index: -1 ore-titanium-grass-icon-small rotate: false - xy: 1641, 969 + xy: 1467, 617 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-titanium-grass1 rotate: false - xy: 1391, 1163 + xy: 1425, 1163 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-grass2 rotate: false - xy: 1425, 1163 + xy: 1459, 1163 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-grass3 rotate: false - xy: 1459, 1163 + xy: 1493, 1163 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-grass-icon-full rotate: false - xy: 1459, 1163 + xy: 1493, 1163 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-grass-icon-medium rotate: false - xy: 1459, 1163 + xy: 1493, 1163 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5557,42 +5557,42 @@ ore-titanium-holostone-icon-large index: -1 ore-titanium-holostone-icon-small rotate: false - xy: 1641, 943 + xy: 1493, 617 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-titanium-holostone1 rotate: false - xy: 1493, 1163 + xy: 1393, 1129 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-holostone2 rotate: false - xy: 1393, 1129 + xy: 1393, 1095 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-holostone3 rotate: false - xy: 1393, 1095 + xy: 1427, 1129 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-holostone-icon-full rotate: false - xy: 1393, 1095 + xy: 1427, 1129 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-holostone-icon-medium rotate: false - xy: 1393, 1095 + xy: 1427, 1129 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5606,42 +5606,42 @@ ore-titanium-sand-icon-large index: -1 ore-titanium-sand-icon-small rotate: false - xy: 1643, 917 + xy: 1519, 617 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-titanium-sand1 rotate: false - xy: 1427, 1129 + xy: 1393, 1061 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-sand2 rotate: false - xy: 1393, 1061 + xy: 1461, 1129 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-sand3 rotate: false - xy: 1461, 1129 + xy: 1427, 1095 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-sand-icon-full rotate: false - xy: 1461, 1129 + xy: 1427, 1095 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-sand-icon-medium rotate: false - xy: 1461, 1129 + xy: 1427, 1095 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5655,42 +5655,42 @@ ore-titanium-stone-icon-large index: -1 ore-titanium-stone-icon-small rotate: false - xy: 1643, 891 + xy: 1545, 617 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-titanium-stone1 rotate: false - xy: 1427, 1095 + xy: 1427, 1061 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-stone2 rotate: false - xy: 1427, 1061 + xy: 1461, 1095 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-stone3 rotate: false - xy: 1461, 1095 + xy: 1461, 1061 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-stone-icon-full rotate: false - xy: 1461, 1095 + xy: 1461, 1061 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-stone-icon-medium rotate: false - xy: 1461, 1095 + xy: 1461, 1061 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5704,14 +5704,14 @@ overdrive-projector-icon-large index: -1 overdrive-projector-icon-medium rotate: false - xy: 1461, 1061 + xy: 1495, 1129 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 overdrive-projector-icon-small rotate: false - xy: 1643, 865 + xy: 1571, 617 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5725,14 +5725,14 @@ overflow-gate-icon-large index: -1 overflow-gate-icon-medium rotate: false - xy: 1495, 1095 + xy: 1495, 1061 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 overflow-gate-icon-small rotate: false - xy: 1643, 839 + xy: 1311, 606 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5753,14 +5753,14 @@ phantom-factory-icon-large index: -1 phantom-factory-icon-medium rotate: false - xy: 1495, 1061 + xy: 1415, 1027 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phantom-factory-icon-small rotate: false - xy: 1647, 813 + xy: 1337, 596 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5774,14 +5774,14 @@ phase-conduit-icon-large index: -1 phase-conduit-icon-medium rotate: false - xy: 1483, 1027 + xy: 1483, 993 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-icon-small rotate: false - xy: 1647, 787 + xy: 1363, 596 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5795,14 +5795,14 @@ phase-conveyor-icon-large index: -1 phase-conveyor-icon-medium rotate: false - xy: 1479, 959 + xy: 1513, 959 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-icon-small rotate: false - xy: 1647, 761 + xy: 1389, 591 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5816,14 +5816,14 @@ phase-wall-icon-large index: -1 phase-wall-icon-medium rotate: false - xy: 1445, 925 + xy: 1479, 925 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-wall-icon-small rotate: false - xy: 1647, 735 + xy: 1415, 591 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5837,14 +5837,14 @@ phase-wall-large-icon-large index: -1 phase-wall-large-icon-medium rotate: false - xy: 1479, 925 + xy: 1513, 925 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-wall-large-icon-small rotate: false - xy: 1647, 709 + xy: 1441, 591 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5865,14 +5865,14 @@ phase-weaver-icon-large index: -1 phase-weaver-icon-medium rotate: false - xy: 1513, 925 + xy: 1547, 959 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-weaver-icon-small rotate: false - xy: 1184, 95 + xy: 1467, 591 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5886,14 +5886,14 @@ pine-icon-large index: -1 pine-icon-medium rotate: false - xy: 1547, 925 + xy: 1141, 950 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pine-icon-small rotate: false - xy: 1184, 69 + xy: 1493, 591 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5914,14 +5914,14 @@ plasma-drill-icon-large index: -1 plasma-drill-icon-medium rotate: false - xy: 1141, 950 + xy: 1175, 950 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plasma-drill-icon-small rotate: false - xy: 1184, 43 + xy: 1519, 591 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5935,14 +5935,14 @@ plastanium-compressor-icon-large index: -1 plastanium-compressor-icon-medium rotate: false - xy: 1175, 950 + xy: 1141, 916 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-compressor-icon-small rotate: false - xy: 1184, 17 + xy: 1545, 591 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5963,14 +5963,14 @@ pneumatic-drill-icon-large index: -1 pneumatic-drill-icon-medium rotate: false - xy: 1141, 916 + xy: 1175, 916 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pneumatic-drill-icon-small rotate: false - xy: 1205, 121 + xy: 1571, 591 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5984,14 +5984,14 @@ power-node-icon-large index: -1 power-node-icon-medium rotate: false - xy: 1141, 882 + xy: 1175, 882 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 power-node-icon-small rotate: false - xy: 1210, 95 + xy: 1555, 1137 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6005,14 +6005,14 @@ power-node-large-icon-large index: -1 power-node-large-icon-medium rotate: false - xy: 1175, 882 + xy: 1209, 932 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 power-node-large-icon-small rotate: false - xy: 1210, 69 + xy: 1157, 496 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6026,14 +6026,14 @@ power-source-icon-large index: -1 power-source-icon-medium rotate: false - xy: 1209, 898 + xy: 1209, 864 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 power-source-icon-small rotate: false - xy: 1210, 43 + xy: 1183, 496 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6047,28 +6047,28 @@ power-void-icon-large index: -1 power-void-icon-medium rotate: false - xy: 1243, 914 + xy: 1277, 914 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 power-void-icon-small rotate: false - xy: 1210, 17 + xy: 1209, 496 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 pulse-conduit-icon-full rotate: false - xy: 1277, 880 + xy: 1243, 846 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-icon-medium rotate: false - xy: 1277, 880 + xy: 1243, 846 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6082,21 +6082,21 @@ pulse-conduit-icon-large index: -1 pulse-conduit-icon-small rotate: false - xy: 1187, 589 + xy: 1156, 470 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 pulverizer-icon-full rotate: false - xy: 1311, 828 + xy: 1345, 828 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulverizer-icon-medium rotate: false - xy: 1311, 828 + xy: 1345, 828 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6110,7 +6110,7 @@ pulverizer-icon-large index: -1 pulverizer-icon-small rotate: false - xy: 1187, 563 + xy: 1156, 444 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6124,14 +6124,14 @@ pyratite-mixer-icon-large index: -1 pyratite-mixer-icon-medium rotate: false - xy: 1379, 828 + xy: 1413, 891 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pyratite-mixer-icon-small rotate: false - xy: 1209, 537 + xy: 1182, 470 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6145,14 +6145,14 @@ reconstructor-icon-large index: -1 reconstructor-icon-medium rotate: false - xy: 1413, 891 + xy: 1413, 857 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 reconstructor-icon-small rotate: false - xy: 1209, 511 + xy: 1156, 418 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6166,14 +6166,14 @@ repair-point-icon-large index: -1 repair-point-icon-medium rotate: false - xy: 1447, 891 + xy: 1447, 857 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 repair-point-icon-small rotate: false - xy: 1209, 485 + xy: 1182, 444 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6194,14 +6194,14 @@ revenant-factory-icon-large index: -1 revenant-factory-icon-medium rotate: false - xy: 1481, 891 + xy: 1481, 857 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 revenant-factory-icon-small rotate: false - xy: 1209, 459 + xy: 1208, 470 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6222,14 +6222,14 @@ ripple-icon-large index: -1 ripple-icon-medium rotate: false - xy: 1481, 857 + xy: 1515, 891 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ripple-icon-small rotate: false - xy: 1209, 433 + xy: 1156, 392 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6243,14 +6243,14 @@ rocks-icon-large index: -1 rocks-icon-medium rotate: false - xy: 1549, 891 + xy: 1549, 857 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rocks-icon-small rotate: false - xy: 1209, 407 + xy: 1182, 418 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6264,14 +6264,14 @@ rotary-pump-icon-large index: -1 rotary-pump-icon-medium rotate: false - xy: 1549, 857 + xy: 1413, 823 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rotary-pump-icon-small rotate: false - xy: 1209, 381 + xy: 1208, 444 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6285,14 +6285,14 @@ router-icon-large index: -1 router-icon-medium rotate: false - xy: 1447, 823 + xy: 1481, 823 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 router-icon-small rotate: false - xy: 1209, 355 + xy: 1182, 392 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6306,14 +6306,14 @@ rtg-generator-icon-large index: -1 rtg-generator-icon-medium rotate: false - xy: 1481, 823 + xy: 1515, 823 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rtg-generator-icon-small rotate: false - xy: 1209, 329 + xy: 1208, 418 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6334,14 +6334,14 @@ salvo-icon-large index: -1 salvo-icon-medium rotate: false - xy: 1549, 823 + xy: 1627, 1195 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 salvo-icon-small rotate: false - xy: 1209, 303 + xy: 1208, 392 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6362,14 +6362,14 @@ sand-icon-large index: -1 sand-icon-medium rotate: false - xy: 1627, 1161 + xy: 1661, 1164 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand-icon-small rotate: false - xy: 1209, 277 + xy: 1156, 366 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6383,14 +6383,14 @@ separator-icon-large index: -1 separator-icon-medium rotate: false - xy: 1763, 1114 + xy: 1797, 1088 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 separator-icon-small rotate: false - xy: 1209, 172 + xy: 1182, 366 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6404,14 +6404,14 @@ shock-mine-icon-large index: -1 shock-mine-icon-medium rotate: false - xy: 1865, 1096 + xy: 1831, 1062 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shock-mine-icon-small rotate: false - xy: 1191, 682 + xy: 1179, 340 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6425,14 +6425,14 @@ silicon-smelter-icon-large index: -1 silicon-smelter-icon-medium rotate: false - xy: 1865, 1062 + xy: 1899, 1075 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 silicon-smelter-icon-small rotate: false - xy: 1190, 656 + xy: 1153, 261 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6453,14 +6453,14 @@ snow-icon-large index: -1 snow-icon-medium rotate: false - xy: 1933, 1041 + xy: 1967, 1041 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snow-icon-small rotate: false - xy: 1190, 630 + xy: 1208, 366 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6474,14 +6474,14 @@ solar-panel-icon-large index: -1 solar-panel-icon-medium rotate: false - xy: 2001, 1057 + xy: 2001, 1023 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 solar-panel-icon-small rotate: false - xy: 1801, 1444 + xy: 1179, 314 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6495,14 +6495,14 @@ solar-panel-large-icon-large index: -1 solar-panel-large-icon-medium rotate: false - xy: 2001, 1023 + xy: 1057, 850 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 solar-panel-large-icon-small rotate: false - xy: 1801, 1418 + xy: 1205, 340 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6516,14 +6516,14 @@ sorter-icon-large index: -1 sorter-icon-medium rotate: false - xy: 1159, 848 + xy: 1069, 816 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sorter-icon-small rotate: false - xy: 1641, 1104 + xy: 1153, 235 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6537,14 +6537,14 @@ spawn-icon-large index: -1 spawn-icon-medium rotate: false - xy: 1137, 814 + xy: 1171, 814 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spawn-icon-small rotate: false - xy: 1667, 1104 + xy: 1179, 288 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6565,14 +6565,14 @@ spectre-icon-large index: -1 spectre-icon-medium rotate: false - xy: 1171, 814 + xy: 1205, 830 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spectre-icon-small rotate: false - xy: 1641, 1078 + xy: 1205, 314 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6593,14 +6593,14 @@ spirit-factory-icon-large index: -1 spirit-factory-icon-medium rotate: false - xy: 1205, 830 + xy: 1205, 796 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spirit-factory-icon-small rotate: false - xy: 1667, 1078 + xy: 1153, 209 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6614,14 +6614,14 @@ spore-cluster-icon-large index: -1 spore-cluster-icon-medium rotate: false - xy: 1205, 796 + xy: 1239, 812 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spore-cluster-icon-small rotate: false - xy: 1693, 1104 + xy: 1179, 262 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6642,14 +6642,14 @@ stone-icon-large index: -1 stone-icon-medium rotate: false - xy: 1273, 812 + xy: 1239, 778 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stone-icon-small rotate: false - xy: 1641, 1052 + xy: 1205, 288 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6663,14 +6663,14 @@ surge-wall-icon-large index: -1 surge-wall-icon-medium rotate: false - xy: 1273, 778 + xy: 1307, 794 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 surge-wall-icon-small rotate: false - xy: 1667, 1052 + xy: 1153, 183 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6684,14 +6684,14 @@ surge-wall-large-icon-large index: -1 surge-wall-large-icon-medium rotate: false - xy: 1307, 794 + xy: 1341, 794 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 surge-wall-large-icon-small rotate: false - xy: 1693, 1078 + xy: 1179, 236 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6712,14 +6712,14 @@ swarmer-icon-large index: -1 swarmer-icon-medium rotate: false - xy: 1341, 794 + xy: 1375, 794 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 swarmer-icon-small rotate: false - xy: 1693, 1052 + xy: 1205, 262 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6740,7 +6740,7 @@ tar-icon-large index: -1 tar-icon-small rotate: false - xy: 1663, 1026 + xy: 1153, 157 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6754,14 +6754,14 @@ tau-mech-pad-icon-large index: -1 tau-mech-pad-icon-medium rotate: false - xy: 1409, 789 + xy: 1443, 789 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 tau-mech-pad-icon-small rotate: false - xy: 1663, 1000 + xy: 1179, 210 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6775,14 +6775,14 @@ thermal-generator-icon-large index: -1 thermal-generator-icon-medium rotate: false - xy: 1443, 789 + xy: 1477, 789 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thermal-generator-icon-small rotate: false - xy: 1689, 1026 + xy: 1205, 236 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6796,14 +6796,14 @@ thermal-pump-icon-large index: -1 thermal-pump-icon-medium rotate: false - xy: 1477, 789 + xy: 1511, 789 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thermal-pump-icon-small rotate: false - xy: 1689, 1000 + xy: 1153, 131 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6817,14 +6817,14 @@ thorium-reactor-icon-large index: -1 thorium-reactor-icon-medium rotate: false - xy: 1341, 760 + xy: 1375, 760 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium-reactor-icon-small rotate: false - xy: 1667, 974 + xy: 1179, 184 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6838,14 +6838,14 @@ thorium-wall-icon-large index: -1 thorium-wall-icon-medium rotate: false - xy: 1409, 755 + xy: 1443, 755 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium-wall-icon-small rotate: false - xy: 1667, 948 + xy: 1205, 210 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6859,14 +6859,14 @@ thorium-wall-large-icon-large index: -1 thorium-wall-large-icon-medium rotate: false - xy: 1443, 755 + xy: 1477, 755 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium-wall-large-icon-small rotate: false - xy: 1693, 974 + xy: 1179, 158 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6887,14 +6887,14 @@ titan-factory-icon-large index: -1 titan-factory-icon-medium rotate: false - xy: 1477, 755 + xy: 1511, 755 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titan-factory-icon-small rotate: false - xy: 1693, 948 + xy: 1205, 184 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6908,14 +6908,14 @@ titanium-conveyor-icon-large index: -1 titanium-conveyor-icon-medium rotate: false - xy: 1331, 726 + xy: 1365, 726 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-icon-small rotate: false - xy: 1669, 922 + xy: 1179, 132 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6929,14 +6929,14 @@ titanium-wall-icon-large index: -1 titanium-wall-icon-medium rotate: false - xy: 1399, 721 + xy: 1433, 721 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-wall-icon-small rotate: false - xy: 1669, 896 + xy: 1205, 158 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6950,14 +6950,14 @@ titanium-wall-large-icon-large index: -1 titanium-wall-large-icon-medium rotate: false - xy: 1433, 721 + xy: 1467, 721 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-wall-large-icon-small rotate: false - xy: 1669, 870 + xy: 1205, 132 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6971,14 +6971,14 @@ trident-ship-pad-icon-large index: -1 trident-ship-pad-icon-medium rotate: false - xy: 1501, 721 + xy: 1535, 721 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 trident-ship-pad-icon-small rotate: false - xy: 1669, 844 + xy: 1581, 1125 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6992,14 +6992,14 @@ turbine-generator-icon-large index: -1 turbine-generator-icon-medium rotate: false - xy: 1535, 721 + xy: 1569, 721 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 turbine-generator-icon-small rotate: false - xy: 1695, 922 + xy: 1041, 824 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7076,14 +7076,14 @@ unloader-icon-large index: -1 unloader-icon-medium rotate: false - xy: 1097, 746 + xy: 1131, 746 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unloader-icon-small rotate: false - xy: 1695, 896 + xy: 1235, 574 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7097,14 +7097,14 @@ vault-icon-large index: -1 vault-icon-medium rotate: false - xy: 1131, 746 + xy: 1097, 712 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 vault-icon-small rotate: false - xy: 1695, 870 + xy: 1235, 548 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7132,14 +7132,14 @@ water-extractor-icon-large index: -1 water-extractor-icon-medium rotate: false - xy: 1097, 678 + xy: 1131, 712 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 water-extractor-icon-small rotate: false - xy: 1695, 844 + xy: 1235, 522 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7151,9 +7151,16 @@ water-icon-large orig: 48, 48 offset: 0, 0 index: -1 +water-icon-medium + rotate: false + xy: 1097, 644 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 water-icon-small rotate: false - xy: 1673, 818 + xy: 1235, 496 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7174,14 +7181,14 @@ wave-icon-large index: -1 wave-icon-medium rotate: false - xy: 1131, 712 + xy: 1097, 610 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 wave-icon-small rotate: false - xy: 1673, 792 + xy: 1234, 470 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7195,14 +7202,14 @@ white-tree-dead-icon-large index: -1 white-tree-dead-icon-medium rotate: false - xy: 1097, 644 + xy: 1131, 644 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 white-tree-dead-icon-small rotate: false - xy: 1673, 766 + xy: 1234, 444 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7216,14 +7223,14 @@ white-tree-icon-large index: -1 white-tree-icon-medium rotate: false - xy: 1131, 678 + xy: 1131, 610 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 white-tree-icon-small rotate: false - xy: 1673, 740 + xy: 1234, 418 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7244,161 +7251,161 @@ wraith-factory-icon-large index: -1 wraith-factory-icon-medium rotate: false - xy: 1097, 610 + xy: 1165, 728 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 wraith-factory-icon-small rotate: false - xy: 1673, 714 + xy: 1234, 392 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-biomatter rotate: false - xy: 991, 394 + xy: 991, 360 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-blast-compound rotate: false - xy: 991, 360 + xy: 991, 326 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-coal rotate: false - xy: 991, 326 + xy: 991, 292 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-copper rotate: false - xy: 991, 292 + xy: 991, 258 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-graphite rotate: false - xy: 991, 258 + xy: 991, 224 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-lead rotate: false - xy: 991, 224 + xy: 991, 190 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-metaglass rotate: false - xy: 991, 190 + xy: 991, 156 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-phase-fabric rotate: false - xy: 991, 156 + xy: 991, 122 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-plastanium rotate: false - xy: 991, 122 + xy: 991, 88 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-pyratite rotate: false - xy: 991, 88 + xy: 996, 54 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-sand rotate: false - xy: 996, 54 + xy: 996, 20 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-scrap rotate: false - xy: 996, 20 + xy: 1039, 902 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-silicon rotate: false - xy: 1039, 902 + xy: 1089, 952 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-stone rotate: false - xy: 1073, 884 + xy: 1107, 918 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-surge-alloy rotate: false - xy: 1107, 918 + xy: 1107, 884 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-thorium rotate: false - xy: 1107, 884 + xy: 1143, 1018 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-titanium rotate: false - xy: 1143, 1018 + xy: 1177, 1018 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-cryofluid rotate: false - xy: 1025, 292 + xy: 1025, 258 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-oil rotate: false - xy: 1025, 190 + xy: 1025, 156 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-slag rotate: false - xy: 1030, 20 + xy: 989, 852 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-water rotate: false - xy: 1007, 818 + xy: 1001, 784 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -7531,7 +7538,7 @@ trident-ship index: -1 blank rotate: false - xy: 580, 1818 + xy: 1153, 366 size: 1, 1 orig: 1, 1 offset: 0, 0 @@ -7545,7 +7552,7 @@ circle index: -1 clear rotate: false - xy: 893, 768 + xy: 580, 1818 size: 1, 1 orig: 1, 1 offset: 0, 0 @@ -7559,7 +7566,7 @@ shape-3 index: -1 bar rotate: false - xy: 1127, 130 + xy: 1127, 432 size: 27, 36 split: 9, 9, 9, 9 orig: 27, 36 @@ -7567,7 +7574,7 @@ bar index: -1 bar-top rotate: false - xy: 1165, 708 + xy: 1127, 470 size: 27, 36 split: 9, 10, 9, 10 orig: 27, 36 @@ -7655,7 +7662,7 @@ button-right-over index: -1 button-select rotate: false - xy: 1165, 682 + xy: 1127, 317 size: 24, 24 split: 4, 4, 4, 4 orig: 24, 24 @@ -7670,7 +7677,7 @@ check-off index: -1 check-on rotate: false - xy: 1165, 746 + xy: 1199, 728 size: 28, 32 orig: 28, 32 offset: 0, 0 @@ -7736,77 +7743,77 @@ discord-banner index: -1 empty-sector rotate: false - xy: 961, 734 + xy: 961, 700 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-crafting rotate: false - xy: 2031, 1607 + xy: 2031, 1625 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-defense rotate: false - xy: 2031, 1589 + xy: 2031, 1607 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-distribution rotate: false - xy: 2031, 1571 + xy: 2031, 1589 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-effect rotate: false - xy: 2031, 1553 + xy: 2031, 1571 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-liquid rotate: false - xy: 2031, 1391 + xy: 2031, 1409 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-power rotate: false - xy: 1549, 1337 + xy: 1787, 1452 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-production rotate: false - xy: 1699, 808 + xy: 1547, 1337 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-turret rotate: false - xy: 926, 2 + xy: 962, 2 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-units rotate: false - xy: 962, 2 + xy: 998, 2 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-upgrade rotate: false - xy: 998, 2 + xy: 1034, 2 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -7911,21 +7918,21 @@ icon-ban index: -1 icon-break rotate: false - xy: 1563, 1119 + xy: 1165, 762 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-cancel rotate: false - xy: 1123, 966 + xy: 1563, 1119 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-cancel-2 rotate: false - xy: 1157, 173 + xy: 1132, 31 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7939,28 +7946,28 @@ icon-chat index: -1 icon-check rotate: false - xy: 2031, 1643 + xy: 1123, 966 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-check-2 rotate: false - xy: 1041, 824 + xy: 1132, 5 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 icon-copy rotate: false - xy: 2031, 1625 + xy: 2031, 1643 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-cursor rotate: false - xy: 989, 806 + xy: 1285, 732 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -8009,14 +8016,14 @@ icon-egg index: -1 icon-elevation rotate: false - xy: 2031, 1535 + xy: 2031, 1553 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-eraser rotate: false - xy: 2031, 1517 + xy: 2031, 1535 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -8030,14 +8037,14 @@ icon-exit index: -1 icon-file rotate: false - xy: 2031, 1499 + xy: 2031, 1517 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-file-image rotate: false - xy: 2031, 1481 + xy: 2031, 1499 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -8051,28 +8058,28 @@ icon-file-text index: -1 icon-fill rotate: false - xy: 2031, 1463 + xy: 2031, 1481 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-floppy rotate: false - xy: 1931, 1647 + xy: 1229, 728 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-floppy-16 rotate: false - xy: 2031, 1445 + xy: 2031, 1463 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-folder rotate: false - xy: 1785, 1454 + xy: 1931, 1647 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -8100,63 +8107,63 @@ icon-github index: -1 icon-google-play rotate: false - xy: 1184, 1 + xy: 1043, 936 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-grid rotate: false - xy: 2031, 1427 + xy: 2031, 1445 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-hold rotate: false - xy: 1017, 772 + xy: 1183, 768 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-holdDelete rotate: false - xy: 1043, 953 + xy: 1052, 8 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-home rotate: false - xy: 1200, 1 + xy: 1093, 986 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-host rotate: false - xy: 1216, 1 + xy: 1109, 986 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-info rotate: false - xy: 1043, 936 + xy: 943, 836 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-itch.io rotate: false - xy: 1093, 986 + xy: 993, 886 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-item rotate: false - xy: 1093, 1003 + xy: 989, 806 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -8170,399 +8177,399 @@ icon-items-none index: -1 icon-line rotate: false - xy: 2031, 1409 + xy: 2031, 1427 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-link rotate: false - xy: 1109, 986 + xy: 1193, 1086 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-liquid-small rotate: false - xy: 943, 853 + xy: 1017, 772 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-load rotate: false - xy: 943, 836 + xy: 1243, 1136 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-load-image rotate: false - xy: 1331, 1197 + xy: 2031, 1391 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-load-map rotate: false - xy: 1931, 1663 + xy: 1529, 1337 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-loading rotate: false - xy: 1393, 1043 + xy: 1331, 1197 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-locked rotate: false - xy: 291, 1259 + xy: 1931, 1663 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-logic rotate: false - xy: 993, 903 + xy: 1043, 953 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-map rotate: false - xy: 993, 886 + xy: 1243, 600 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-menu rotate: false - xy: 1193, 1103 + xy: 1093, 1003 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-menu-large rotate: false - xy: 1132, 8 + xy: 1393, 1043 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-missing rotate: false - xy: 1243, 1153 + xy: 943, 853 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-mission-background rotate: false - xy: 1529, 1335 + xy: 1767, 1450 size: 18, 18 orig: 18, 18 offset: 0, 0 index: -1 icon-mission-battle rotate: false - xy: 1811, 1699 + xy: 993, 903 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-mission-defense rotate: false - xy: 279, 19 + xy: 1193, 1103 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-mission-done rotate: false - xy: 1615, 1161 + xy: 1243, 1153 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-none rotate: false - xy: 1811, 1687 + xy: 1811, 1699 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-paste rotate: false - xy: 1209, 154 + xy: 291, 1259 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-pause rotate: false - xy: 1713, 1601 + xy: 279, 19 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-pencil rotate: false - xy: 1767, 1452 + xy: 1153, 113 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-pencil-small rotate: false - xy: 1193, 1086 + xy: 873, 98 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-pick rotate: false - xy: 1699, 826 + xy: 1234, 374 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-play rotate: false - xy: 1193, 854 + xy: 1615, 1161 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-play-2 rotate: false - xy: 1243, 1136 + xy: 873, 82 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-play-custom rotate: false - xy: 1232, 1 + xy: 555, 1251 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-players rotate: false - xy: 279, 7 + xy: 1811, 1687 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-power-small rotate: false - xy: 2037, 1255 + xy: 1713, 1601 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-quit rotate: false - xy: 873, 98 + xy: 571, 1251 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-redo rotate: false - xy: 1699, 790 + xy: 1805, 1452 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-refresh rotate: false - xy: 873, 82 + xy: 1341, 1120 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rename rotate: false - xy: 555, 1251 + xy: 1039, 852 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-resize rotate: false - xy: 1699, 772 + xy: 1557, 1167 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-rotate rotate: false - xy: 571, 1251 + xy: 1259, 600 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-arrow rotate: false - xy: 1341, 1120 + xy: 1158, 79 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-left rotate: false - xy: 1039, 852 + xy: 1158, 63 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-right rotate: false - xy: 1034, 4 + xy: 1158, 47 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save rotate: false - xy: 1156, 131 + xy: 1158, 31 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save-image rotate: false - xy: 1699, 754 + xy: 1801, 1434 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-save-map rotate: false - xy: 1699, 736 + xy: 1801, 1416 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-settings rotate: false - xy: 2037, 1243 + xy: 1193, 854 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-spray rotate: false - xy: 1699, 718 + xy: 890, 2 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-terrain rotate: false - xy: 1557, 1167 + xy: 908, 2 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-tools rotate: false - xy: 2025, 1197 + xy: 1158, 15 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-touch rotate: false - xy: 2037, 1231 + xy: 279, 7 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-touchDelete rotate: false - xy: 2037, 1219 + xy: 2037, 1255 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-trash rotate: false - xy: 2025, 1181 + xy: 1261, 584 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-trash-16 rotate: false - xy: 890, 2 + xy: 926, 2 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-tree rotate: false - xy: 908, 2 + xy: 944, 2 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-tree-locked rotate: false - xy: 991, 496 + xy: 991, 462 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-trello rotate: false - xy: 2025, 1165 + xy: 1261, 568 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-tutorial rotate: false - xy: 1227, 156 + xy: 1261, 552 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-undo rotate: false - xy: 944, 2 + xy: 980, 2 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-unlocked rotate: false - xy: 980, 2 + xy: 1016, 2 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-unlocks rotate: false - xy: 1719, 1098 + xy: 1261, 536 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-wiki rotate: false - xy: 1719, 1082 + xy: 1261, 520 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-zone rotate: false - xy: 1153, 104 + xy: 1285, 700 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -8576,14 +8583,14 @@ icon-zone-locked index: -1 icon-zoom rotate: false - xy: 1016, 2 + xy: 1158, 95 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-zoom-small rotate: false - xy: 1735, 1098 + xy: 1261, 504 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -8597,7 +8604,7 @@ info-banner index: -1 inventory rotate: false - xy: 1158, 36 + xy: 1311, 684 size: 24, 40 split: 10, 10, 10, 14 orig: 24, 40 @@ -8628,7 +8635,7 @@ pane-2 index: -1 scroll rotate: false - xy: 1209, 198 + xy: 1153, 287 size: 24, 35 split: 10, 10, 6, 5 orig: 24, 35 @@ -8652,7 +8659,7 @@ scroll-knob-horizontal-black index: -1 scroll-knob-vertical-black rotate: false - xy: 1209, 235 + xy: 1153, 324 size: 24, 40 split: 10, 10, 6, 10 orig: 24, 40 @@ -8660,14 +8667,14 @@ scroll-knob-vertical-black index: -1 sector-select rotate: false - xy: 1695, 1130 + xy: 1729, 1114 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 selection rotate: false - xy: 896, 768 + xy: 893, 768 size: 1, 1 orig: 1, 1 offset: 0, 0 @@ -8725,14 +8732,14 @@ underline-2 index: -1 white rotate: false - xy: 1865, 1610 + xy: 1127, 104 size: 3, 3 orig: 3, 3 offset: 0, 0 index: -1 window-empty rotate: false - xy: 1161, 615 + xy: 1127, 369 size: 27, 61 split: 8, 8, 44, 11 orig: 27, 61 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index eb7dabb4a7..5cbaaf0ea4 100644 Binary files a/core/assets/sprites/sprites.png and b/core/assets/sprites/sprites.png differ diff --git a/core/src/io/anuke/mindustry/content/Blocks.java b/core/src/io/anuke/mindustry/content/Blocks.java index 80eebf3d49..2131c3bd40 100644 --- a/core/src/io/anuke/mindustry/content/Blocks.java +++ b/core/src/io/anuke/mindustry/content/Blocks.java @@ -107,7 +107,7 @@ public class Blocks implements ContentList{ } deepwater = new Floor("deepwater"){{ - liquidColor = Color.valueOf("546bb3"); + liquidColor = Color.valueOf("4d5ca4"); speedMultiplier = 0.2f; variants = 0; liquidDrop = Liquids.water; @@ -120,7 +120,7 @@ public class Blocks implements ContentList{ }}; water = new Floor("water"){{ - liquidColor = Color.valueOf("546bb3"); + liquidColor = Color.valueOf("596ab8"); speedMultiplier = 0.5f; variants = 0; status = StatusEffects.wet; @@ -165,25 +165,25 @@ public class Blocks implements ContentList{ playerUnmineable = true; }}; + holostone = new Floor("holostone"){{ + hasOres = true; + edgeStyle = "blocky"; + }}; + iceSnow = new Floor("ice-snow"){{ variants = 3; }}; + snow = new Floor("snow"){{ + minimapColor = Color.valueOf("c2d1d2"); + }}; + ice = new Floor("ice"){{ dragMultiplier = 0.2f; speedMultiplier = 0.4f; minimapColor = Color.valueOf("b8eef8"); }}; - holostone = new Floor("holostone"){{ - hasOres = true; - edgeStyle = "blocky"; - }}; - - snow = new Floor("snow"){{ - minimapColor = Color.valueOf("c2d1d2"); - }}; - grass = new Floor("grass"){{ hasOres = true; minimapColor = Color.valueOf("549d5b"); @@ -776,7 +776,7 @@ public class Blocks implements ContentList{ blastDrill = new Drill("blast-drill"){{ requirements(Category.production, ItemStack.with(Items.copper, 130, Items.silicon, 120, Items.titanium, 100, Items.thorium, 60)); - drillTime = 120; + drillTime = 200; size = 3; drawRim = true; hasPower = true; @@ -792,7 +792,7 @@ public class Blocks implements ContentList{ plasmaDrill = new Drill("plasma-drill"){{ heatColor = Color.valueOf("ff461b"); - drillTime = 100; + drillTime = 150; size = 4; hasLiquids = true; hasPower = true; diff --git a/core/src/io/anuke/mindustry/content/Fx.java b/core/src/io/anuke/mindustry/content/Fx.java index 4a84971868..2a5c75f5e0 100644 --- a/core/src/io/anuke/mindustry/content/Fx.java +++ b/core/src/io/anuke/mindustry/content/Fx.java @@ -117,7 +117,7 @@ public class Fx implements ContentList{ }); unitLand = new GroundEffect(30, e -> { - Draw.color(Palette.lightishGray, e.color, e.rotation); + Draw.color(Tmp.c1.set(e.color).mul(1.1f)); Angles.randLenVectors(e.id, 6, 17f * e.finpow(), (x, y) -> { Fill.circle(e.x + x, e.y + y, e.fout() * 4f + 0.3f); }); @@ -1067,7 +1067,7 @@ public class Fx implements ContentList{ Draw.reset(); }); ripple = new GroundEffect(false, 30, e -> { - Draw.color(Tmp.c1.set(e.color).shiftValue(0.1f)); + Draw.color(Tmp.c1.set(e.color).mul(1.2f)); Lines.stroke(e.fout() + 0.4f); Lines.circle(e.x, e.y, 2f + e.fin() * 4f); Draw.reset(); diff --git a/core/src/io/anuke/mindustry/content/Liquids.java b/core/src/io/anuke/mindustry/content/Liquids.java index 4bcbe3f0f6..7c691c6fd2 100644 --- a/core/src/io/anuke/mindustry/content/Liquids.java +++ b/core/src/io/anuke/mindustry/content/Liquids.java @@ -10,7 +10,7 @@ public class Liquids implements ContentList{ @Override public void load(){ - water = new Liquid("water", Color.valueOf("486acd")){{ + water = new Liquid("water", Color.valueOf("596ab8")){{ heatCapacity = 0.4f; tier = 0; effect = StatusEffects.wet; diff --git a/core/src/io/anuke/mindustry/content/Zones.java b/core/src/io/anuke/mindustry/content/Zones.java index 3bd06d8876..8fa004f540 100644 --- a/core/src/io/anuke/mindustry/content/Zones.java +++ b/core/src/io/anuke/mindustry/content/Zones.java @@ -168,7 +168,7 @@ public class Zones implements ContentList{ }}; }}; - ruinousShores = new Zone("ruinousShores", new MapGenerator("groundZero", 1)){{ //TODO implement + ruinousShores = new Zone("ruinousShores", new MapGenerator("ruinousShores")){{ //TODO implement deployCost = ItemStack.with(Items.copper, 300); startingItems = ItemStack.with(Items.copper, 200); conditionWave = 15; diff --git a/core/src/io/anuke/mindustry/entities/Player.java b/core/src/io/anuke/mindustry/entities/Player.java index 1b60d3da77..05db15938a 100644 --- a/core/src/io/anuke/mindustry/entities/Player.java +++ b/core/src/io/anuke/mindustry/entities/Player.java @@ -516,7 +516,7 @@ public class Player extends Unit implements BuilderTrait, ShooterTrait{ if(mech.shake > 1f){ Effects.shake(mech.shake, mech.shake, this); } - Effects.effect(Fx.unitLand, tile.floor().minimapColor, x, y, tile.floor().isLiquid ? 1f : 0.5f); + Effects.effect(Fx.unitLand, tile.floor().liquidColor == null ? tile.floor().minimapColor : tile.floor().minimapColor, x, y, tile.floor().isLiquid ? 1f : 0.5f); } mech.onLand(this); achievedFlight = false; diff --git a/core/src/io/anuke/mindustry/graphics/CacheLayer.java b/core/src/io/anuke/mindustry/graphics/CacheLayer.java index dca1a53df7..ea4f31a20a 100644 --- a/core/src/io/anuke/mindustry/graphics/CacheLayer.java +++ b/core/src/io/anuke/mindustry/graphics/CacheLayer.java @@ -3,6 +3,13 @@ package io.anuke.mindustry.graphics; //TODO implement effects again public enum CacheLayer{ water{ + public void begin(){ + //Draw.shader(Shaders.water); + } + + public void end(){ + //Draw.shader(); + } }, lava{ }, @@ -11,8 +18,7 @@ public enum CacheLayer{ space{ }, normal, - walls{ //TODO implement walls - }; + walls; public void begin(){ diff --git a/core/src/io/anuke/mindustry/graphics/FloorRenderer.java b/core/src/io/anuke/mindustry/graphics/FloorRenderer.java index ecef4996e8..cac217ce05 100644 --- a/core/src/io/anuke/mindustry/graphics/FloorRenderer.java +++ b/core/src/io/anuke/mindustry/graphics/FloorRenderer.java @@ -124,6 +124,8 @@ public class FloorRenderer{ int crangex = (int) (camera.width / (chunksize * tilesize)) + 1; int crangey = (int) (camera.height / (chunksize * tilesize)) + 1; + SpriteBatch batch = Core.batch; + Core.batch = cbatch; layer.begin(); for(int x = -crangex; x <= crangex; x++){ @@ -142,6 +144,7 @@ public class FloorRenderer{ } layer.end(); + Core.batch = batch; } private void cacheChunk(int cx, int cy){ diff --git a/core/src/io/anuke/mindustry/graphics/Shaders.java b/core/src/io/anuke/mindustry/graphics/Shaders.java index 4e3a6e8c26..3bd8b6f32f 100644 --- a/core/src/io/anuke/mindustry/graphics/Shaders.java +++ b/core/src/io/anuke/mindustry/graphics/Shaders.java @@ -207,7 +207,7 @@ public class Shaders{ public static class SurfaceShader extends LoadShader{ public SurfaceShader(String frag){ - super(frag, "default"); + super(frag, "cache"); } @Override @@ -217,7 +217,7 @@ public class Shaders{ Core.camera.position.y - Core.camera.height / 2 ); setUniformf("screensize", Core.camera.width, Core.camera.height ); - setUniformf("time", Time.time()); + setUniformf("u_time", Time.time()); } } diff --git a/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java b/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java index e7aae6cb0c..32a4969f75 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java @@ -155,6 +155,7 @@ public class HudFragment extends Fragment{ }); parent.fill(t -> { + t.touchable(Touchable.disabled); t.visible(() -> !state.is(State.menu)); t.table("flat", c -> c.add("$nearpoint") .update(l -> l.setColor(Tmp.c1.set(Color.WHITE).lerp(Color.SCARLET, Mathf.absin(Time.time(), 10f, 1f)))) diff --git a/core/src/io/anuke/mindustry/world/blocks/Floor.java b/core/src/io/anuke/mindustry/world/blocks/Floor.java index 361b9c4c6f..4b3d72af7c 100644 --- a/core/src/io/anuke/mindustry/world/blocks/Floor.java +++ b/core/src/io/anuke/mindustry/world/blocks/Floor.java @@ -133,7 +133,7 @@ public class Floor extends Block{ } protected boolean doEdge(Floor other){ - return (other.id < id || edges == null) && other.edgeOnto(this); + return (other.id > id || edges == null) && other.edgeOnto(this); } protected boolean edgeOnto(Floor other){