diff --git a/core/assets-raw/sprites/blocks/units/repair-point-turret.png b/core/assets-raw/sprites/blocks/units/repair-point.png similarity index 100% rename from core/assets-raw/sprites/blocks/units/repair-point-turret.png rename to core/assets-raw/sprites/blocks/units/repair-point.png diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index b704a47f15..2f8d868bc8 100644 --- a/core/assets/sprites/sprites.atlas +++ b/core/assets/sprites/sprites.atlas @@ -48,308 +48,308 @@ overdrive-projector-top index: -1 shock-mine rotate: false - xy: 1391, 205 + xy: 1543, 275 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor rotate: false - xy: 1213, 480 + xy: 555, 60 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-bridge rotate: false - xy: 1247, 477 + xy: 555, 26 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-end rotate: false - xy: 1281, 477 + xy: 1829, 507 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-0 rotate: false - xy: 1017, 206 + xy: 1519, 445 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-1 rotate: false - xy: 1017, 172 + xy: 1553, 445 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-2 rotate: false - xy: 1055, 274 + xy: 1587, 445 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-3 rotate: false - xy: 1051, 240 + xy: 1621, 445 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-0 rotate: false - xy: 1051, 206 + xy: 1655, 445 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-1 rotate: false - xy: 1051, 172 + xy: 1689, 445 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-2 rotate: false - xy: 1063, 308 + xy: 745, 143 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-3 rotate: false - xy: 1089, 274 + xy: 779, 143 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-0 rotate: false - xy: 1085, 240 + xy: 813, 143 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-1 rotate: false - xy: 1085, 206 + xy: 847, 143 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-2 rotate: false - xy: 1085, 172 + xy: 881, 143 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-3 rotate: false - xy: 745, 143 + xy: 979, 157 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-0 rotate: false - xy: 779, 143 + xy: 1029, 308 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-1 rotate: false - xy: 813, 143 + xy: 987, 266 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-2 rotate: false - xy: 847, 143 + xy: 983, 232 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-3 rotate: false - xy: 881, 143 + xy: 983, 198 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-0 rotate: false - xy: 1245, 362 + xy: 1025, 274 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-1 rotate: false - xy: 1067, 346 + xy: 1017, 232 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-2 rotate: false - xy: 1101, 333 + xy: 1017, 198 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-3 rotate: false - xy: 1135, 333 + xy: 1013, 164 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-0 rotate: false - xy: 1531, 275 + xy: 691, 3 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-1 rotate: false - xy: 1565, 275 + xy: 725, 109 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-2 rotate: false - xy: 1599, 275 + xy: 759, 109 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-3 rotate: false - xy: 1633, 275 + xy: 725, 75 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-0 rotate: false - xy: 1667, 275 + xy: 793, 109 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-1 rotate: false - xy: 1493, 241 + xy: 725, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-2 rotate: false - xy: 1493, 207 + xy: 759, 75 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-3 rotate: false - xy: 1527, 241 + xy: 827, 109 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-0 rotate: false - xy: 1493, 173 + xy: 725, 7 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-1 rotate: false - xy: 1527, 207 + xy: 759, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-2 rotate: false - xy: 1561, 241 + xy: 793, 75 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-3 rotate: false - xy: 1493, 139 + xy: 861, 109 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-0 rotate: false - xy: 1527, 173 + xy: 759, 7 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-1 rotate: false - xy: 1561, 207 + xy: 793, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-2 rotate: false - xy: 1595, 241 + xy: 827, 75 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-3 rotate: false - xy: 1493, 105 + xy: 793, 7 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-0 rotate: false - xy: 1527, 139 + xy: 827, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-1 rotate: false - xy: 1561, 173 + xy: 861, 75 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-2 rotate: false - xy: 1595, 207 + xy: 827, 7 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-3 rotate: false - xy: 1629, 241 + xy: 861, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -363,7 +363,7 @@ distributor index: -1 junction rotate: false - xy: 1869, 1021 + xy: 1835, 1055 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -377,49 +377,49 @@ mass-driver-base index: -1 overflow-gate rotate: false - xy: 657, 105 + xy: 1339, 341 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor rotate: false - xy: 691, 105 + xy: 1357, 205 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-arrow rotate: false - xy: 691, 71 + xy: 1357, 171 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-bridge rotate: false - xy: 691, 37 + xy: 1391, 239 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-end rotate: false - xy: 589, 3 + xy: 1391, 205 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 router rotate: false - xy: 1283, 409 + xy: 1441, 323 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sorter rotate: false - xy: 1415, 391 + xy: 1781, 271 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -580,133 +580,133 @@ water-extractor-top index: -1 char1 rotate: false - xy: 1315, 477 + xy: 1829, 473 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 char2 rotate: false - xy: 1349, 477 + xy: 1821, 439 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 char3 rotate: false - xy: 1383, 493 + xy: 1213, 480 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cliffs1 rotate: false - xy: 1417, 493 + xy: 1247, 477 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 coal1 rotate: false - xy: 1383, 459 + xy: 1281, 477 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 coal2 rotate: false - xy: 1417, 459 + xy: 1315, 477 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 coal3 rotate: false - xy: 1215, 396 + xy: 1349, 477 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 copper1 rotate: false - xy: 1169, 328 + xy: 1013, 130 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 copper2 rotate: false - xy: 1203, 328 + xy: 1059, 274 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 copper3 rotate: false - xy: 1237, 328 + xy: 1051, 240 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 craters1 rotate: false - xy: 1157, 294 + xy: 1119, 231 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 craters2 rotate: false - xy: 1191, 294 + xy: 1119, 197 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 craters3 rotate: false - xy: 1225, 294 + xy: 1161, 260 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 craters4 rotate: false - xy: 1157, 260 + xy: 1195, 260 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 craters5 rotate: false - xy: 1191, 260 + xy: 1229, 260 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stone1 rotate: false - xy: 1191, 260 + xy: 1229, 260 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 craters6 rotate: false - xy: 1225, 260 + xy: 1263, 260 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stone2 rotate: false - xy: 1225, 260 + xy: 1263, 260 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 deepwater rotate: false - xy: 1221, 226 + xy: 1153, 192 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -734,14 +734,14 @@ dunerocks-large index: -1 dunerocks1 rotate: false - xy: 1255, 226 + xy: 1047, 138 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dunerocks2 rotate: false - xy: 1255, 192 + xy: 1153, 158 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -762,63 +762,63 @@ edge-stencil-smooth index: -1 grass1 rotate: false - xy: 1323, 158 + xy: 1047, 104 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 grass2 rotate: false - xy: 983, 139 + xy: 1081, 100 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 grass3 rotate: false - xy: 1017, 138 + xy: 1115, 95 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 holostone1 rotate: false - xy: 1119, 129 + xy: 1217, 90 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 holostone2 rotate: false - xy: 1153, 124 + xy: 1251, 90 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 holostone3 rotate: false - xy: 1187, 124 + xy: 1297, 260 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 hotrock1 rotate: false - xy: 1221, 124 + xy: 1289, 226 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 hotrock2 rotate: false - xy: 1255, 124 + xy: 1289, 192 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 hotrock3 rotate: false - xy: 1289, 124 + xy: 1289, 158 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -832,42 +832,42 @@ ice-edge index: -1 ice-snow1 rotate: false - xy: 1699, 1063 + xy: 1323, 192 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ice-snow2 rotate: false - xy: 1699, 1029 + xy: 1323, 158 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ice-snow3 rotate: false - xy: 1699, 995 + xy: 1319, 124 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ice1 rotate: false - xy: 1323, 124 + xy: 1285, 124 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ice2 rotate: false - xy: 1699, 1131 + xy: 1285, 90 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ice3 rotate: false - xy: 1699, 1097 + xy: 1323, 226 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -881,168 +881,168 @@ icerocks-large index: -1 icerocks1 rotate: false - xy: 1451, 427 + xy: 1319, 90 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icerocks2 rotate: false - xy: 1485, 427 + xy: 1353, 124 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ignarock1 rotate: false - xy: 1553, 411 + xy: 1699, 1131 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ignarock2 rotate: false - xy: 1587, 411 + xy: 1699, 1097 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ignarock3 rotate: false - xy: 1621, 411 + xy: 1699, 1063 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 lead1 rotate: false - xy: 1971, 1033 + xy: 1937, 1067 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 lead2 rotate: false - xy: 1903, 999 + xy: 1903, 1033 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 lead3 rotate: false - xy: 1937, 999 + xy: 1971, 1067 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 magmarock1 rotate: false - xy: 1809, 953 + xy: 1741, 919 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 magmarock2 rotate: false - xy: 1775, 919 + xy: 1809, 987 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 magmarock3 rotate: false - xy: 1843, 953 + xy: 1775, 953 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor rotate: false - xy: 1911, 931 + xy: 1877, 965 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-damaged5 rotate: false - xy: 1911, 931 + xy: 1877, 965 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-2 rotate: false - xy: 1979, 965 + xy: 1911, 965 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-3 rotate: false - xy: 1945, 931 + xy: 1877, 931 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-5 rotate: false - xy: 1979, 931 + xy: 1945, 965 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-damaged1 rotate: false - xy: 2013, 965 + xy: 1911, 931 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-damaged2 rotate: false - xy: 2013, 931 + xy: 1979, 965 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-damaged3 rotate: false - xy: 1877, 897 + xy: 1945, 931 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-damaged4 rotate: false - xy: 1911, 897 + xy: 1979, 931 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-damaged6 rotate: false - xy: 1945, 897 + xy: 2013, 965 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pine rotate: false - xy: 725, 109 + xy: 1387, 69 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rock1 rotate: false - xy: 1737, 641 + xy: 1737, 591 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 rock2 rotate: false - xy: 1737, 591 + xy: 1775, 791 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -1056,84 +1056,84 @@ rocks-large index: -1 rocks1 rotate: false - xy: 1283, 443 + xy: 1686, 377 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rocks2 rotate: false - xy: 1317, 443 + xy: 1720, 373 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand-water rotate: false - xy: 1327, 307 + xy: 1645, 343 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand1 rotate: false - xy: 1305, 341 + xy: 1543, 343 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand2 rotate: false - xy: 1339, 341 + xy: 1577, 343 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand3 rotate: false - xy: 1347, 375 + xy: 1611, 343 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap1 rotate: false - xy: 1327, 273 + xy: 1679, 343 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap2 rotate: false - xy: 1361, 307 + xy: 1713, 339 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap3 rotate: false - xy: 1361, 273 + xy: 1433, 289 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snow1 rotate: false - xy: 1425, 239 + xy: 1679, 275 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snow2 rotate: false - xy: 1425, 205 + xy: 1713, 271 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snow3 rotate: false - xy: 1425, 171 + xy: 1747, 339 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1147,49 +1147,49 @@ snowrocks-large index: -1 snowrocks1 rotate: false - xy: 1425, 137 + xy: 1747, 305 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snowrocks2 rotate: false - xy: 1425, 103 + xy: 1747, 271 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spore-cluster1 rotate: false - xy: 987, 338 + xy: 945, 296 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 spore-cluster2 rotate: false - xy: 1029, 380 + xy: 987, 338 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 spore-cluster3 rotate: false - xy: 1071, 422 + xy: 1029, 380 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 stained-boulder1 rotate: false - xy: 1551, 377 + xy: 1849, 337 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stained-boulder2 rotate: false - xy: 1585, 377 + xy: 1849, 303 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1210,14 +1210,14 @@ stained-rocks-red-large index: -1 stained-rocks-red1 rotate: false - xy: 1687, 377 + xy: 1883, 353 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stained-rocks-red2 rotate: false - xy: 1721, 355 + xy: 1883, 319 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1231,91 +1231,91 @@ stained-rocks-yellow-large index: -1 stained-rocks-yellow1 rotate: false - xy: 1755, 355 + xy: 1917, 353 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stained-rocks-yellow2 rotate: false - xy: 1789, 355 + xy: 1883, 285 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stained-rocks1 rotate: false - xy: 1619, 377 + xy: 1815, 269 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stained-rocks2 rotate: false - xy: 1653, 377 + xy: 1849, 269 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stained-stone-red1 rotate: false - xy: 1925, 319 + xy: 1951, 319 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stained-stone-red2 rotate: false - xy: 1959, 319 + xy: 1951, 285 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stained-stone-red3 rotate: false - xy: 1993, 319 + xy: 1985, 353 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stained-stone-yellow1 rotate: false - xy: 1441, 357 + xy: 1985, 319 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stained-stone-yellow2 rotate: false - xy: 1475, 359 + xy: 1985, 285 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stained-stone-yellow3 rotate: false - xy: 1429, 323 + xy: 1883, 251 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stained-stone1 rotate: false - xy: 1823, 337 + xy: 1917, 319 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stained-stone2 rotate: false - xy: 1857, 337 + xy: 1951, 353 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stained-stone3 rotate: false - xy: 1891, 319 + xy: 1917, 285 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1329,77 +1329,77 @@ stainedrocks-large index: -1 stainedrocks1 rotate: false - xy: 1429, 289 + xy: 1917, 251 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stainedrocks2 rotate: false - xy: 1463, 323 + xy: 1951, 251 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stone3 rotate: false - xy: 1463, 289 + xy: 1985, 251 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 tar rotate: false - xy: 1459, 119 + xy: 589, 105 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium1 rotate: false - xy: 1577, 343 + xy: 623, 71 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium2 rotate: false - xy: 1611, 343 + xy: 657, 105 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium3 rotate: false - xy: 1645, 343 + xy: 623, 37 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium1 rotate: false - xy: 1633, 309 + xy: 589, 3 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium2 rotate: false - xy: 1667, 309 + xy: 623, 3 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium3 rotate: false - xy: 1497, 275 + xy: 657, 3 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 water rotate: false - xy: 1629, 173 + xy: 929, 89 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1420,35 +1420,35 @@ white-tree-dead index: -1 block-border rotate: false - xy: 1177, 362 + xy: 1169, 328 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-middle rotate: false - xy: 1729, 457 + xy: 945, 157 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pump-liquid rotate: false - xy: 1729, 457 + xy: 945, 157 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-select rotate: false - xy: 1763, 457 + xy: 1067, 312 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-liquid rotate: false - xy: 1689, 445 + xy: 1210, 362 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1518,175 +1518,175 @@ rubble-4-1 index: -1 spawn rotate: false - xy: 1449, 393 + xy: 1815, 371 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit rotate: false - xy: 1797, 457 + xy: 1101, 304 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit-arrow rotate: false - xy: 555, 94 + xy: 1135, 299 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-arrow rotate: false - xy: 555, 94 + xy: 1135, 299 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit-bridge rotate: false - xy: 555, 60 + xy: 1169, 294 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit-end rotate: false - xy: 555, 26 + xy: 555, 94 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom rotate: false - xy: 1831, 473 + xy: 1383, 459 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-0 rotate: false - xy: 1831, 439 + xy: 1417, 459 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-1 rotate: false - xy: 1451, 461 + xy: 1779, 415 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-2 rotate: false - xy: 1485, 461 + xy: 1813, 405 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-3 rotate: false - xy: 1519, 445 + xy: 1855, 439 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-4 rotate: false - xy: 1553, 445 + xy: 1847, 405 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-5 rotate: false - xy: 1587, 445 + xy: 1881, 405 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-6 rotate: false - xy: 1621, 445 + xy: 1203, 328 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-0 rotate: false - xy: 1723, 423 + xy: 1215, 396 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-1 rotate: false - xy: 1757, 423 + xy: 1237, 328 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-2 rotate: false - xy: 1791, 423 + xy: 1237, 294 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-3 rotate: false - xy: 1825, 405 + xy: 1244, 362 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-4 rotate: false - xy: 1859, 405 + xy: 1271, 328 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-5 rotate: false - xy: 1029, 308 + xy: 1271, 294 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-6 rotate: false - xy: 1021, 274 + xy: 1451, 461 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-junction rotate: false - xy: 2005, 1067 + xy: 1971, 1033 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-bottom rotate: false - xy: 2005, 999 + xy: 1937, 999 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-liquid rotate: false - xy: 1741, 953 + xy: 2005, 1067 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-top rotate: false - xy: 1775, 987 + xy: 2005, 1033 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1714,84 +1714,84 @@ liquid-tank-top index: -1 mechanical-pump rotate: false - xy: 1877, 965 + xy: 1775, 919 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit rotate: false - xy: 623, 71 + xy: 1346, 375 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-arrow rotate: false - xy: 623, 37 + xy: 1331, 273 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-bridge rotate: false - xy: 657, 71 + xy: 1365, 273 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-end rotate: false - xy: 657, 37 + xy: 1357, 239 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-0 rotate: false - xy: 861, 109 + xy: 1455, 137 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-1 rotate: false - xy: 759, 7 + xy: 1455, 103 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-2 rotate: false - xy: 793, 41 + xy: 1455, 69 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-3 rotate: false - xy: 827, 75 + xy: 1351, 425 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-4 rotate: false - xy: 793, 7 + xy: 1385, 425 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-5 rotate: false - xy: 827, 41 + xy: 1380, 391 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-6 rotate: false - xy: 861, 75 + xy: 1414, 391 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1861,7 +1861,7 @@ trident-ship-pad index: -1 battery rotate: false - xy: 1113, 401 + xy: 1142, 367 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1875,14 +1875,14 @@ battery-large index: -1 combustion-generator rotate: false - xy: 1211, 362 + xy: 1383, 493 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 combustion-generator-top rotate: false - xy: 1829, 507 + xy: 1417, 493 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1945,7 +1945,7 @@ impact-reactor-top index: -1 power-node rotate: false - xy: 793, 109 + xy: 1399, 273 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1959,28 +1959,28 @@ power-node-large index: -1 power-source rotate: false - xy: 759, 75 + xy: 1425, 205 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 power-void rotate: false - xy: 827, 109 + xy: 1425, 171 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 powerinfinite rotate: false - xy: 725, 7 + xy: 1421, 137 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 powervoid rotate: false - xy: 759, 41 + xy: 1421, 103 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1994,14 +1994,14 @@ rtg-generator index: -1 rtg-generator-top rotate: false - xy: 1279, 375 + xy: 1475, 325 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 solar-panel rotate: false - xy: 1351, 425 + xy: 1754, 373 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2176,21 +2176,21 @@ graphite-press index: -1 incinerator rotate: false - xy: 1689, 411 + xy: 1699, 995 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-source rotate: false - xy: 1767, 1021 + xy: 1767, 1055 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-void rotate: false - xy: 1869, 1055 + xy: 1767, 1021 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2218,21 +2218,21 @@ silicon-smelter-top index: -1 lavasmelter rotate: false - xy: 1971, 1067 + xy: 1903, 1067 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-source rotate: false - xy: 1809, 987 + xy: 1741, 987 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 melter rotate: false - xy: 1877, 931 + xy: 1809, 919 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2246,7 +2246,7 @@ multi-press index: -1 oilrefinery rotate: false - xy: 1783, 885 + xy: 1911, 897 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2288,14 +2288,14 @@ plastanium-compressor-top index: -1 pulverizer rotate: false - xy: 827, 7 + xy: 1448, 393 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulverizer-rotator rotate: false - xy: 861, 7 + xy: 1407, 357 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2330,7 +2330,7 @@ silicon-smelter index: -1 smelter rotate: false - xy: 1391, 103 + xy: 1645, 275 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2379,14 +2379,14 @@ launch-pad index: -1 sortedunloader rotate: false - xy: 1381, 391 + xy: 1781, 305 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unloader rotate: false - xy: 1561, 105 + xy: 929, 123 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2400,14 +2400,14 @@ vault index: -1 arc-heat rotate: false - xy: 983, 207 + xy: 1337, 1197 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-1 rotate: false - xy: 1143, 367 + xy: 1176, 362 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2603,14 +2603,7 @@ phantom-factory-top-open index: -1 repair-point-base rotate: false - xy: 895, 75 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -repair-point-turret - rotate: false - xy: 895, 41 + xy: 1550, 377 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2673,7 +2666,7 @@ wraith-factory-top-open index: -1 copper-wall rotate: false - xy: 1123, 299 + xy: 1051, 206 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2687,7 +2680,7 @@ copper-wall-large index: -1 door rotate: false - xy: 1221, 158 + xy: 1051, 172 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2708,14 +2701,14 @@ door-large-open index: -1 door-open rotate: false - xy: 1259, 260 + xy: 1119, 163 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-wall rotate: false - xy: 623, 3 + xy: 1391, 171 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2785,42 +2778,42 @@ scrap-wall-large4 index: -1 scrap-wall1 rotate: false - xy: 1373, 341 + xy: 1509, 309 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall2 rotate: false - xy: 1357, 239 + xy: 1543, 309 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall3 rotate: false - xy: 1357, 205 + xy: 1577, 309 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall4 rotate: false - xy: 1357, 171 + xy: 1611, 309 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall5 rotate: false - xy: 1357, 171 + xy: 1611, 309 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 surge-wall rotate: false - xy: 1459, 221 + xy: 613, 139 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2834,7 +2827,7 @@ surge-wall-large index: -1 thorium-wall rotate: false - xy: 1497, 309 + xy: 657, 37 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2855,7 +2848,7 @@ thruster index: -1 titanium-wall rotate: false - xy: 1527, 105 + xy: 861, 7 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2897,7 +2890,7 @@ bullet-back index: -1 casing rotate: false - xy: 1449, 85 + xy: 1369, 459 size: 8, 16 orig: 8, 16 offset: 0, 0 @@ -2911,7 +2904,7 @@ error index: -1 laser rotate: false - xy: 2029, 405 + xy: 2035, 71 size: 4, 48 orig: 4, 48 offset: 0, 0 @@ -2932,7 +2925,7 @@ laserfull index: -1 minelaser rotate: false - xy: 2037, 1292 + xy: 2032, 1967 size: 4, 48 orig: 4, 48 offset: 0, 0 @@ -2946,14 +2939,14 @@ minelaser-end index: -1 missile rotate: false - xy: 1029, 342 + xy: 987, 300 size: 36, 36 orig: 36, 36 offset: 0, 0 index: -1 missile-back rotate: false - xy: 1071, 384 + xy: 1029, 342 size: 36, 36 orig: 36, 36 offset: 0, 0 @@ -2967,70 +2960,70 @@ scale_marker index: -1 scorch1 rotate: false - xy: 929, 1 + xy: 2019, 353 size: 28, 100 orig: 28, 100 offset: 0, 0 index: -1 scorch2 rotate: false - xy: 959, 1 + xy: 2019, 251 size: 28, 100 orig: 28, 100 offset: 0, 0 index: -1 scorch3 rotate: false - xy: 989, 1 + xy: 997, 28 size: 28, 100 orig: 28, 100 offset: 0, 0 index: -1 scorch4 rotate: false - xy: 1019, 1 + xy: 1459, 173 size: 28, 100 orig: 28, 100 offset: 0, 0 index: -1 scorch5 rotate: false - xy: 1049, 1 + xy: 1489, 173 size: 28, 100 orig: 28, 100 offset: 0, 0 index: -1 shell rotate: false - xy: 945, 200 + xy: 945, 229 size: 36, 36 orig: 36, 36 offset: 0, 0 index: -1 shell-back rotate: false - xy: 1337, 1227 + xy: 945, 191 size: 36, 36 orig: 36, 36 offset: 0, 0 index: -1 shot rotate: false - xy: 1391, 171 + xy: 1577, 275 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 transfer rotate: false - xy: 2043, 1292 + xy: 2037, 1232 size: 4, 48 orig: 4, 48 offset: 0, 0 index: -1 transfer-arrow rotate: false - xy: 1595, 173 + xy: 895, 75 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3051,7 +3044,7 @@ alloy-smelter-icon-large index: -1 alloy-smelter-icon-medium rotate: false - xy: 1337, 1193 + xy: 1067, 346 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3072,7 +3065,7 @@ alpha-dart-mech-pad-icon-large index: -1 alpha-dart-mech-pad-icon-medium rotate: false - xy: 987, 275 + xy: 1147, 401 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3086,14 +3079,14 @@ alpha-dart-mech-pad-icon-small index: -1 arc rotate: false - xy: 983, 241 + xy: 1337, 1231 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 arc-icon-full rotate: false - xy: 983, 173 + xy: 1108, 372 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3135,14 +3128,14 @@ battery-large-icon-large index: -1 battery-large-icon-medium rotate: false - xy: 1147, 401 + xy: 1101, 338 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 battery-large-icon-small rotate: false - xy: 715, 147 + xy: 1419, 433 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3163,14 +3156,14 @@ biomattercompressor-icon-large index: -1 biomattercompressor-icon-medium rotate: false - xy: 1189, 430 + xy: 1135, 333 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 biomattercompressor-icon-small rotate: false - xy: 1663, 107 + xy: 715, 147 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3191,14 +3184,14 @@ blast-drill-icon-large index: -1 blast-drill-icon-medium rotate: false - xy: 1181, 396 + xy: 1185, 430 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 blast-drill-icon-small rotate: false - xy: 929, 103 + xy: 2016, 1107 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3212,14 +3205,14 @@ blast-mixer-icon-large index: -1 blast-mixer-icon-medium rotate: false - xy: 1109, 367 + xy: 1181, 396 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 blast-mixer-icon-small rotate: false - xy: 955, 103 + xy: 1577, 249 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3233,7 +3226,7 @@ bridge-conduit-icon-large index: -1 bridge-conduit-icon-small rotate: false - xy: 945, 145 + xy: 1548, 211 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3247,7 +3240,7 @@ bridge-conveyor-icon-large index: -1 bridge-conveyor-icon-small rotate: false - xy: 981, 103 + xy: 1603, 249 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3261,7 +3254,7 @@ char-icon-large index: -1 char-icon-small rotate: false - xy: 1033, 103 + xy: 1629, 249 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3275,7 +3268,7 @@ cliffs-icon-large index: -1 cliffs-icon-small rotate: false - xy: 1493, 79 + xy: 1655, 249 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3289,14 +3282,14 @@ combustion-generator-icon-large index: -1 combustion-generator-icon-small rotate: false - xy: 1519, 79 + xy: 1681, 249 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 conduit-icon-full rotate: false - xy: 1655, 445 + xy: 1203, 294 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3310,7 +3303,7 @@ conduit-icon-large index: -1 conduit-icon-small rotate: false - xy: 1545, 79 + xy: 1489, 147 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3324,14 +3317,14 @@ container-icon-large index: -1 container-icon-medium rotate: false - xy: 1017, 240 + xy: 1485, 461 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 container-icon-small rotate: false - xy: 1571, 79 + xy: 1489, 121 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3345,7 +3338,7 @@ conveyor-icon-large index: -1 conveyor-icon-small rotate: false - xy: 1597, 79 + xy: 1489, 95 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3359,7 +3352,7 @@ copper-wall-icon-large index: -1 copper-wall-icon-small rotate: false - xy: 1623, 79 + xy: 1489, 69 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3373,14 +3366,14 @@ copper-wall-large-icon-large index: -1 copper-wall-large-icon-medium rotate: false - xy: 1123, 265 + xy: 1093, 270 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 copper-wall-large-icon-small rotate: false - xy: 1059, 103 + xy: 487, 181 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3394,14 +3387,14 @@ core-foundation-icon-large index: -1 core-foundation-icon-medium rotate: false - xy: 1119, 231 + xy: 1085, 236 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 core-foundation-icon-small rotate: false - xy: 1085, 112 + xy: 1707, 245 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3415,14 +3408,14 @@ core-nucleus-icon-large index: -1 core-nucleus-icon-medium rotate: false - xy: 1119, 197 + xy: 1085, 202 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 core-nucleus-icon-small rotate: false - xy: 1223, 451 + xy: 1733, 245 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3436,14 +3429,14 @@ core-shard-icon-large index: -1 core-shard-icon-medium rotate: false - xy: 1119, 163 + xy: 1127, 265 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 core-shard-icon-small rotate: false - xy: 1127, 1160 + xy: 1759, 245 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3457,7 +3450,7 @@ craters-icon-large index: -1 craters-icon-small rotate: false - xy: 1730, 329 + xy: 1785, 245 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3485,7 +3478,7 @@ cryofluidmixer-icon-medium index: -1 cryofluidmixer-icon-small rotate: false - xy: 1756, 329 + xy: 1811, 243 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3506,14 +3499,14 @@ cultivator-icon-large index: -1 cultivator-icon-medium rotate: false - xy: 1153, 192 + xy: 1187, 226 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cultivator-icon-small rotate: false - xy: 1730, 303 + xy: 1837, 243 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3541,14 +3534,14 @@ cyclone-icon-large index: -1 cyclone-icon-medium rotate: false - xy: 1187, 226 + xy: 1221, 226 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cyclone-icon-small rotate: false - xy: 1782, 329 + xy: 1127, 1160 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3569,14 +3562,14 @@ dagger-factory-icon-large index: -1 dagger-factory-icon-medium rotate: false - xy: 1187, 192 + xy: 1255, 226 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dagger-factory-icon-small rotate: false - xy: 1756, 303 + xy: 1577, 223 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3597,7 +3590,7 @@ deepwater-icon-large index: -1 deepwater-icon-small rotate: false - xy: 1782, 303 + xy: 1603, 223 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3611,14 +3604,14 @@ delta-mech-pad-icon-large index: -1 delta-mech-pad-icon-medium rotate: false - xy: 1221, 192 + xy: 1187, 192 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 delta-mech-pad-icon-small rotate: false - xy: 1730, 277 + xy: 1629, 223 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3632,14 +3625,14 @@ differential-generator-icon-large index: -1 differential-generator-icon-medium rotate: false - xy: 1153, 158 + xy: 1221, 192 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 differential-generator-icon-small rotate: false - xy: 1756, 277 + xy: 1655, 223 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3653,14 +3646,14 @@ distributor-icon-large index: -1 distributor-icon-medium rotate: false - xy: 1187, 158 + xy: 1255, 192 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 distributor-icon-small rotate: false - xy: 1782, 277 + xy: 1681, 223 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3674,7 +3667,7 @@ door-icon-large index: -1 door-icon-small rotate: false - xy: 1649, 79 + xy: 1574, 197 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3688,14 +3681,14 @@ door-large-icon-large index: -1 door-large-icon-medium rotate: false - xy: 1259, 294 + xy: 1085, 168 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 door-large-icon-small rotate: false - xy: 1675, 81 + xy: 1600, 197 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3709,21 +3702,21 @@ dunerocks-icon-large index: -1 dunerocks-icon-small rotate: false - xy: 1689, 107 + xy: 1626, 197 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 duo rotate: false - xy: 1255, 158 + xy: 1187, 158 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 duo-icon-full rotate: false - xy: 1271, 328 + xy: 1221, 158 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3737,7 +3730,7 @@ duo-icon-large index: -1 duo-icon-small rotate: false - xy: 1701, 81 + xy: 1652, 197 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3751,14 +3744,14 @@ force-projector-icon-large index: -1 force-projector-icon-medium rotate: false - xy: 1293, 260 + xy: 1081, 134 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 force-projector-icon-small rotate: false - xy: 1808, 311 + xy: 1678, 197 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3779,14 +3772,14 @@ fortress-factory-icon-large index: -1 fortress-factory-icon-medium rotate: false - xy: 1289, 226 + xy: 1115, 129 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 fortress-factory-icon-small rotate: false - xy: 1834, 311 + xy: 1707, 219 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3814,14 +3807,14 @@ fuse-icon-large index: -1 fuse-icon-medium rotate: false - xy: 1289, 192 + xy: 1149, 124 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 fuse-icon-small rotate: false - xy: 1808, 285 + xy: 1733, 219 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3842,14 +3835,14 @@ ghoul-factory-icon-large index: -1 ghoul-factory-icon-medium rotate: false - xy: 1289, 158 + xy: 1183, 124 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ghoul-factory-icon-small rotate: false - xy: 1860, 311 + xy: 1759, 219 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3863,14 +3856,14 @@ glaive-ship-pad-icon-large index: -1 glaive-ship-pad-icon-medium rotate: false - xy: 1323, 226 + xy: 1217, 124 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 glaive-ship-pad-icon-small rotate: false - xy: 1834, 285 + xy: 1785, 219 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3884,28 +3877,28 @@ graphite-press-icon-large index: -1 graphite-press-icon-medium rotate: false - xy: 1323, 192 + xy: 1251, 124 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 graphite-press-icon-small rotate: false - xy: 1860, 285 + xy: 1811, 217 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 hail rotate: false - xy: 1051, 138 + xy: 1149, 90 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 hail-icon-full rotate: false - xy: 1085, 138 + xy: 1183, 90 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3919,7 +3912,7 @@ hail-icon-large index: -1 hail-icon-small rotate: false - xy: 1886, 293 + xy: 1837, 217 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3940,7 +3933,7 @@ holostone-icon-large index: -1 holostone-icon-small rotate: false - xy: 1912, 293 + xy: 1704, 193 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3954,7 +3947,7 @@ hotrock-icon-large index: -1 hotrock-icon-small rotate: false - xy: 1938, 293 + xy: 1730, 193 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3968,7 +3961,7 @@ ice-icon-large index: -1 ice-icon-small rotate: false - xy: 1964, 293 + xy: 1756, 193 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3989,7 +3982,7 @@ ice-snow-icon-large index: -1 ice-snow-icon-small rotate: false - xy: 1990, 293 + xy: 1782, 193 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4003,7 +3996,7 @@ icerocks-icon-large index: -1 icerocks-icon-small rotate: false - xy: 2016, 293 + xy: 1808, 191 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4017,7 +4010,7 @@ ignarock-icon-large index: -1 ignarock-icon-small rotate: false - xy: 1079, 34 + xy: 1626, 171 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4038,14 +4031,14 @@ impact-reactor-icon-large index: -1 impact-reactor-icon-medium rotate: false - xy: 1655, 411 + xy: 1699, 1029 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 impact-reactor-icon-small rotate: false - xy: 1079, 8 + xy: 1652, 171 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4059,21 +4052,21 @@ incinerator-icon-large index: -1 incinerator-icon-small rotate: false - xy: 1111, 77 + xy: 1678, 171 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-biomatter-medium rotate: false - xy: 1105, 9 + xy: 1574, 145 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-biomatter-small rotate: false - xy: 1131, 2 + xy: 947, 3 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -4087,14 +4080,14 @@ item-biomatter-xlarge index: -1 item-blast-compound-medium rotate: false - xy: 1137, 98 + xy: 1600, 145 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-blast-compound-small rotate: false - xy: 1149, 2 + xy: 965, 3 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -4108,14 +4101,14 @@ item-blast-compound-xlarge index: -1 item-coal-medium rotate: false - xy: 1163, 98 + xy: 1626, 145 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-coal-small rotate: false - xy: 1167, 2 + xy: 1023, 8 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -4129,210 +4122,210 @@ item-coal-xlarge index: -1 item-copper-medium rotate: false - xy: 1189, 98 + xy: 1652, 145 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-copper-small rotate: false - xy: 1185, 2 + xy: 1041, 8 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-copper-xlarge rotate: false - xy: 955, 464 + xy: 1779, 449 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-graphite-medium rotate: false - xy: 1215, 98 + xy: 1678, 145 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-graphite-small rotate: false - xy: 1203, 2 + xy: 1059, 8 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-graphite-xlarge rotate: false - xy: 997, 464 + xy: 955, 464 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-lead-medium rotate: false - xy: 1241, 98 + xy: 1704, 167 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-lead-small rotate: false - xy: 1221, 2 + xy: 1383, 51 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-lead-xlarge rotate: false - xy: 1039, 464 + xy: 997, 464 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-metaglass-medium rotate: false - xy: 1267, 98 + xy: 1730, 167 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-metaglass-small rotate: false - xy: 1239, 2 + xy: 1383, 33 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-metaglass-xlarge rotate: false - xy: 1081, 464 + xy: 1039, 464 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-phase-fabric-medium rotate: false - xy: 1293, 98 + xy: 1756, 167 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-phase-fabric-small rotate: false - xy: 1257, 2 + xy: 1401, 51 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-phase-fabric-xlarge rotate: false - xy: 1123, 464 + xy: 1081, 464 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-plastanium-medium rotate: false - xy: 1319, 98 + xy: 1782, 167 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-plastanium-small rotate: false - xy: 1275, 2 + xy: 1401, 33 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-plastanium-xlarge rotate: false - xy: 1165, 464 + xy: 1123, 464 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-pyratite-medium rotate: false - xy: 1137, 72 + xy: 1808, 165 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-pyratite-small rotate: false - xy: 1293, 2 + xy: 1419, 51 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-pyratite-xlarge rotate: false - xy: 945, 422 + xy: 1165, 464 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-sand-medium rotate: false - xy: 1163, 72 + xy: 1834, 165 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-sand-small rotate: false - xy: 1311, 2 + xy: 1419, 33 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-sand-xlarge rotate: false - xy: 945, 380 + xy: 945, 422 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-scrap-medium rotate: false - xy: 1189, 72 + xy: 1704, 141 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-scrap-small rotate: false - xy: 1329, 2 + xy: 1437, 51 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-scrap-xlarge rotate: false - xy: 987, 422 + xy: 945, 380 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-silicon-medium rotate: false - xy: 1215, 72 + xy: 1730, 141 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-silicon-small rotate: false - xy: 1347, 2 + xy: 1437, 33 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-silicon-xlarge rotate: false - xy: 945, 338 + xy: 987, 422 size: 40, 40 orig: 40, 40 offset: 0, 0 @@ -4346,70 +4339,70 @@ item-source-icon-large index: -1 item-source-icon-small rotate: false - xy: 1241, 72 + xy: 1756, 141 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-surge-alloy-medium rotate: false - xy: 1267, 72 + xy: 1782, 141 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-surge-alloy-small rotate: false - xy: 1365, 7 + xy: 1455, 51 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-surge-alloy-xlarge rotate: false - xy: 987, 380 + xy: 945, 338 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-thorium-medium rotate: false - xy: 1293, 72 + xy: 1808, 139 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-thorium-small rotate: false - xy: 1383, 7 + xy: 1455, 33 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-thorium-xlarge rotate: false - xy: 1029, 422 + xy: 987, 380 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-titanium-medium rotate: false - xy: 1319, 72 + xy: 1834, 139 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-titanium-small rotate: false - xy: 1401, 7 + xy: 1473, 51 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-titanium-xlarge rotate: false - xy: 945, 296 + xy: 1029, 422 size: 40, 40 orig: 40, 40 offset: 0, 0 @@ -4423,7 +4416,7 @@ item-void-icon-large index: -1 item-void-icon-small rotate: false - xy: 1131, 46 + xy: 2022, 1703 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4437,14 +4430,14 @@ javelin-ship-pad-icon-large index: -1 javelin-ship-pad-icon-medium rotate: false - xy: 1835, 1021 + xy: 1869, 1089 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 javelin-ship-pad-icon-small rotate: false - xy: 1131, 20 + xy: 2022, 1677 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4458,7 +4451,7 @@ junction-icon-large index: -1 junction-icon-small rotate: false - xy: 1157, 46 + xy: 997, 2 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4472,14 +4465,14 @@ kiln-icon-large index: -1 kiln-icon-medium rotate: false - xy: 1903, 1067 + xy: 1801, 1021 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 kiln-icon-small rotate: false - xy: 1157, 20 + xy: 1027, 78 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4507,14 +4500,14 @@ lancer-icon-large index: -1 lancer-icon-medium rotate: false - xy: 1903, 1033 + xy: 1869, 1055 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 lancer-icon-small rotate: false - xy: 1183, 46 + xy: 1053, 78 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4535,14 +4528,14 @@ laser-drill-icon-large index: -1 laser-drill-icon-medium rotate: false - xy: 1937, 1067 + xy: 1835, 1021 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 laser-drill-icon-small rotate: false - xy: 1183, 20 + xy: 1027, 52 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4556,14 +4549,14 @@ launch-pad-icon-large index: -1 launch-pad-icon-medium rotate: false - xy: 1937, 1033 + xy: 1869, 1021 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 launch-pad-icon-small rotate: false - xy: 1209, 46 + xy: 1053, 52 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4577,14 +4570,14 @@ liquid-junction-icon-large index: -1 liquid-junction-icon-small rotate: false - xy: 1209, 20 + xy: 1079, 74 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-router-icon-full rotate: false - xy: 1741, 987 + xy: 1971, 999 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4598,7 +4591,7 @@ liquid-router-icon-large index: -1 liquid-router-icon-small rotate: false - xy: 1235, 46 + xy: 1027, 26 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4612,7 +4605,7 @@ liquid-source-icon-large index: -1 liquid-source-icon-small rotate: false - xy: 1235, 20 + xy: 1053, 26 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4633,14 +4626,14 @@ liquid-tank-icon-large index: -1 liquid-tank-icon-medium rotate: false - xy: 1775, 953 + xy: 1741, 953 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-tank-icon-small rotate: false - xy: 1261, 46 + xy: 1079, 48 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4654,7 +4647,7 @@ magmarock-icon-large index: -1 magmarock-icon-small rotate: false - xy: 1261, 20 + xy: 1079, 22 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4682,14 +4675,14 @@ mass-driver-icon-large index: -1 mass-driver-icon-medium rotate: false - xy: 1809, 919 + xy: 1843, 987 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mass-driver-icon-small rotate: false - xy: 1287, 46 + xy: 1105, 69 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4766,14 +4759,14 @@ mechanical-drill-icon-large index: -1 mechanical-drill-icon-medium rotate: false - xy: 1843, 919 + xy: 1809, 953 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mechanical-drill-icon-small rotate: false - xy: 1287, 20 + xy: 1105, 43 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4787,7 +4780,7 @@ mechanical-pump-icon-large index: -1 mechanical-pump-icon-small rotate: false - xy: 1313, 46 + xy: 1105, 17 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4815,14 +4808,14 @@ meltdown-icon-large index: -1 meltdown-icon-medium rotate: false - xy: 1911, 965 + xy: 1843, 953 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 meltdown-icon-small rotate: false - xy: 1313, 20 + xy: 1131, 64 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4836,7 +4829,7 @@ melter-icon-large index: -1 melter-icon-small rotate: false - xy: 1345, 77 + xy: 1157, 64 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4850,14 +4843,14 @@ mend-projector-icon-large index: -1 mend-projector-icon-medium rotate: false - xy: 1945, 965 + xy: 1843, 919 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mend-projector-icon-small rotate: false - xy: 1371, 77 + xy: 1131, 38 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4871,7 +4864,7 @@ metal-floor-2-icon-large index: -1 metal-floor-2-icon-small rotate: false - xy: 1397, 77 + xy: 1183, 64 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4885,7 +4878,7 @@ metal-floor-3-icon-large index: -1 metal-floor-3-icon-small rotate: false - xy: 1423, 77 + xy: 1157, 38 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4899,7 +4892,7 @@ metal-floor-5-icon-large index: -1 metal-floor-5-icon-small rotate: false - xy: 2022, 1703 + xy: 1209, 64 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4913,7 +4906,7 @@ metal-floor-damaged-icon-large index: -1 metal-floor-damaged-icon-small rotate: false - xy: 2022, 1677 + xy: 1183, 38 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4934,7 +4927,7 @@ metal-floor-icon-large index: -1 metal-floor-icon-small rotate: false - xy: 1808, 259 + xy: 1235, 64 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4948,14 +4941,14 @@ multi-press-icon-large index: -1 multi-press-icon-medium rotate: false - xy: 1979, 897 + xy: 2013, 931 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 multi-press-icon-small rotate: false - xy: 1834, 259 + xy: 1209, 38 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4976,14 +4969,14 @@ oil-extractor-icon-large index: -1 oil-extractor-icon-medium rotate: false - xy: 2013, 897 + xy: 1877, 897 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 oil-extractor-icon-small rotate: false - xy: 1860, 259 + xy: 1261, 64 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4997,14 +4990,14 @@ omega-mech-pad-icon-large index: -1 omega-mech-pad-icon-medium rotate: false - xy: 1783, 851 + xy: 1945, 897 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 omega-mech-pad-icon-small rotate: false - xy: 1886, 267 + xy: 1235, 38 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5018,42 +5011,42 @@ ore-coal-holostone-icon-large index: -1 ore-coal-holostone-icon-small rotate: false - xy: 1912, 267 + xy: 1287, 64 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-coal-holostone1 rotate: false - xy: 1817, 885 + xy: 1979, 897 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-holostone2 rotate: false - xy: 1817, 851 + xy: 2013, 897 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-holostone3 rotate: false - xy: 1825, 817 + xy: 1783, 885 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-holostone-icon-full rotate: false - xy: 1825, 817 + xy: 1783, 885 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-holostone-icon-medium rotate: false - xy: 1825, 817 + xy: 1783, 885 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5067,42 +5060,42 @@ ore-coal-sand-icon-large index: -1 ore-coal-sand-icon-small rotate: false - xy: 1938, 267 + xy: 1261, 38 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-coal-sand1 rotate: false - xy: 1851, 863 + xy: 1783, 851 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-sand2 rotate: false - xy: 1885, 863 + xy: 1817, 885 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-sand3 rotate: false - xy: 1919, 863 + xy: 1817, 851 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-sand-icon-full rotate: false - xy: 1919, 863 + xy: 1817, 851 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-sand-icon-medium rotate: false - xy: 1919, 863 + xy: 1817, 851 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5116,7 +5109,7 @@ ore-coal-stained-stone-icon-large index: -1 ore-coal-stained-stone-icon-small rotate: false - xy: 1964, 267 + xy: 1313, 64 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5130,77 +5123,77 @@ ore-coal-stained-stone-red-icon-large index: -1 ore-coal-stained-stone-red-icon-small rotate: false - xy: 1990, 267 + xy: 1287, 38 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-coal-stained-stone-red1 rotate: false - xy: 1893, 829 + xy: 1919, 863 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-stained-stone-red2 rotate: false - xy: 1927, 829 + xy: 1953, 863 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-stained-stone-red3 rotate: false - xy: 1961, 829 + xy: 1987, 863 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-stained-stone-red-icon-full rotate: false - xy: 1961, 829 + xy: 1987, 863 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-stained-stone-red-icon-medium rotate: false - xy: 1961, 829 + xy: 1987, 863 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-stained-stone1 rotate: false - xy: 1953, 863 + xy: 1825, 817 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-stained-stone2 rotate: false - xy: 1987, 863 + xy: 1851, 863 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-stained-stone3 rotate: false - xy: 1859, 829 + xy: 1885, 863 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-stained-stone-icon-full rotate: false - xy: 1859, 829 + xy: 1885, 863 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-stained-stone-icon-medium rotate: false - xy: 1859, 829 + xy: 1885, 863 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5214,42 +5207,42 @@ ore-coal-stone-icon-large index: -1 ore-coal-stone-icon-small rotate: false - xy: 2016, 267 + xy: 1339, 64 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-coal-stone1 rotate: false - xy: 1995, 829 + xy: 1859, 829 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-stone2 rotate: false - xy: 1859, 795 + xy: 1893, 829 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-stone3 rotate: false - xy: 1893, 795 + xy: 1927, 829 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-stone-icon-full rotate: false - xy: 1893, 795 + xy: 1927, 829 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-stone-icon-medium rotate: false - xy: 1893, 795 + xy: 1927, 829 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5263,42 +5256,42 @@ ore-copper-holostone-icon-large index: -1 ore-copper-holostone-icon-small rotate: false - xy: 1886, 241 + xy: 1313, 38 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-copper-holostone1 rotate: false - xy: 1927, 795 + xy: 1961, 829 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-holostone2 rotate: false - xy: 1961, 795 + xy: 1995, 829 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-holostone3 rotate: false - xy: 1995, 795 + xy: 1859, 795 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-holostone-icon-full rotate: false - xy: 1995, 795 + xy: 1859, 795 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-holostone-icon-medium rotate: false - xy: 1995, 795 + xy: 1859, 795 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5312,42 +5305,42 @@ ore-copper-sand-icon-large index: -1 ore-copper-sand-icon-small rotate: false - xy: 1912, 241 + xy: 1339, 38 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-copper-sand1 rotate: false - xy: 1837, 761 + xy: 1893, 795 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-sand2 rotate: false - xy: 1837, 727 + xy: 1927, 795 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-sand3 rotate: false - xy: 1871, 761 + xy: 1961, 795 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-sand-icon-full rotate: false - xy: 1871, 761 + xy: 1961, 795 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-sand-icon-medium rotate: false - xy: 1871, 761 + xy: 1961, 795 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5361,7 +5354,7 @@ ore-copper-stained-stone-icon-large index: -1 ore-copper-stained-stone-icon-small rotate: false - xy: 1938, 241 + xy: 1131, 12 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5375,77 +5368,77 @@ ore-copper-stained-stone-red-icon-large index: -1 ore-copper-stained-stone-red-icon-small rotate: false - xy: 1964, 241 + xy: 1157, 12 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-copper-stained-stone-red1 rotate: false - xy: 1837, 659 + xy: 1871, 761 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-stained-stone-red2 rotate: false - xy: 1939, 761 + xy: 1837, 693 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-stained-stone-red3 rotate: false - xy: 1905, 727 + xy: 1905, 761 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-stained-stone-red-icon-full rotate: false - xy: 1905, 727 + xy: 1905, 761 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-stained-stone-red-icon-medium rotate: false - xy: 1905, 727 + xy: 1905, 761 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-stained-stone1 rotate: false - xy: 1837, 693 + xy: 1995, 795 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-stained-stone2 rotate: false - xy: 1905, 761 + xy: 1837, 761 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-stained-stone3 rotate: false - xy: 1871, 727 + xy: 1837, 727 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-stained-stone-icon-full rotate: false - xy: 1871, 727 + xy: 1837, 727 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-stained-stone-icon-medium rotate: false - xy: 1871, 727 + xy: 1837, 727 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5459,42 +5452,42 @@ ore-copper-stone-icon-large index: -1 ore-copper-stone-icon-small rotate: false - xy: 1990, 241 + xy: 1183, 12 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-copper-stone1 rotate: false - xy: 1871, 693 + xy: 1871, 727 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-stone2 rotate: false - xy: 1837, 625 + xy: 1837, 659 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-stone3 rotate: false - xy: 1973, 761 + xy: 1939, 761 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-stone-icon-full rotate: false - xy: 1973, 761 + xy: 1939, 761 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-stone-icon-medium rotate: false - xy: 1973, 761 + xy: 1939, 761 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5508,42 +5501,42 @@ ore-lead-holostone-icon-large index: -1 ore-lead-holostone-icon-small rotate: false - xy: 2016, 241 + xy: 1209, 12 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-lead-holostone1 rotate: false - xy: 1939, 727 + xy: 1905, 727 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-holostone2 rotate: false - xy: 1905, 693 + xy: 1871, 693 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-holostone3 rotate: false - xy: 1871, 659 + xy: 1837, 625 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-holostone-icon-full rotate: false - xy: 1871, 659 + xy: 1837, 625 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-holostone-icon-medium rotate: false - xy: 1871, 659 + xy: 1837, 625 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5557,42 +5550,42 @@ ore-lead-sand-icon-large index: -1 ore-lead-sand-icon-small rotate: false - xy: 1339, 46 + xy: 1235, 12 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-lead-sand1 rotate: false - xy: 1837, 591 + xy: 1973, 761 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-sand2 rotate: false - xy: 1973, 727 + xy: 1939, 727 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-sand3 rotate: false - xy: 1939, 693 + xy: 1905, 693 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-sand-icon-full rotate: false - xy: 1939, 693 + xy: 1905, 693 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-sand-icon-medium rotate: false - xy: 1939, 693 + xy: 1905, 693 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5606,7 +5599,7 @@ ore-lead-stained-stone-icon-large index: -1 ore-lead-stained-stone-icon-small rotate: false - xy: 1339, 20 + xy: 1261, 12 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5620,77 +5613,77 @@ ore-lead-stained-stone-red-icon-large index: -1 ore-lead-stained-stone-red-icon-small rotate: false - xy: 1365, 51 + xy: 1287, 12 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-lead-stained-stone-red1 rotate: false - xy: 1973, 693 + xy: 1939, 693 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-stained-stone-red2 rotate: false - xy: 1939, 659 + xy: 1905, 659 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-stained-stone-red3 rotate: false - xy: 1905, 625 + xy: 1871, 625 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-stained-stone-red-icon-full rotate: false - xy: 1905, 625 + xy: 1871, 625 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-stained-stone-red-icon-medium rotate: false - xy: 1905, 625 + xy: 1871, 625 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-stained-stone1 rotate: false - xy: 1905, 659 + xy: 1871, 659 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-stained-stone2 rotate: false - xy: 1871, 625 + xy: 1837, 591 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-stained-stone3 rotate: false - xy: 1837, 557 + xy: 1973, 727 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-stained-stone-icon-full rotate: false - xy: 1837, 557 + xy: 1973, 727 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-stained-stone-icon-medium rotate: false - xy: 1837, 557 + xy: 1973, 727 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5704,42 +5697,42 @@ ore-lead-stone-icon-large index: -1 ore-lead-stone-icon-small rotate: false - xy: 1365, 25 + xy: 1313, 12 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-lead-stone1 rotate: false - xy: 1871, 591 + xy: 1837, 557 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-stone2 rotate: false - xy: 1973, 659 + xy: 1973, 693 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-stone3 rotate: false - xy: 1939, 625 + xy: 1939, 659 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-stone-icon-full rotate: false - xy: 1939, 625 + xy: 1939, 659 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-stone-icon-medium rotate: false - xy: 1939, 625 + xy: 1939, 659 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5753,42 +5746,42 @@ ore-scrap-holostone-icon-large index: -1 ore-scrap-holostone-icon-small rotate: false - xy: 1391, 51 + xy: 1339, 12 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-scrap-holostone1 rotate: false - xy: 1905, 591 + xy: 1905, 625 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-holostone2 rotate: false - xy: 1871, 557 + xy: 1871, 591 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-holostone3 rotate: false - xy: 1973, 625 + xy: 1973, 659 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-holostone-icon-full rotate: false - xy: 1973, 625 + xy: 1973, 659 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-holostone-icon-medium rotate: false - xy: 1973, 625 + xy: 1973, 659 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5802,42 +5795,42 @@ ore-scrap-sand-icon-large index: -1 ore-scrap-sand-icon-small rotate: false - xy: 1391, 25 + xy: 1863, 225 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-scrap-sand1 rotate: false - xy: 1939, 591 + xy: 1939, 625 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-sand2 rotate: false - xy: 1905, 557 + xy: 1905, 591 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-sand3 rotate: false - xy: 1973, 591 + xy: 1871, 557 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-sand-icon-full rotate: false - xy: 1973, 591 + xy: 1871, 557 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-sand-icon-medium rotate: false - xy: 1973, 591 + xy: 1871, 557 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5851,42 +5844,42 @@ ore-scrap-snow-icon-large index: -1 ore-scrap-snow-icon-small rotate: false - xy: 1417, 51 + xy: 1889, 225 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-scrap-snow1 rotate: false - xy: 1939, 557 + xy: 1973, 625 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-snow2 rotate: false - xy: 1973, 557 + xy: 1939, 591 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-snow3 rotate: false - xy: 2007, 761 + xy: 1905, 557 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-snow-icon-full rotate: false - xy: 2007, 761 + xy: 1905, 557 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-snow-icon-medium rotate: false - xy: 2007, 761 + xy: 1905, 557 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5900,7 +5893,7 @@ ore-scrap-stained-stone-icon-large index: -1 ore-scrap-stained-stone-icon-small rotate: false - xy: 1417, 25 + xy: 1915, 225 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5914,77 +5907,77 @@ ore-scrap-stained-stone-red-icon-large index: -1 ore-scrap-stained-stone-red-icon-small rotate: false - xy: 1443, 51 + xy: 1941, 225 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-scrap-stained-stone-red1 rotate: false - xy: 2007, 625 + xy: 2007, 761 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-stained-stone-red2 rotate: false - xy: 2007, 591 + xy: 2007, 727 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-stained-stone-red3 rotate: false - xy: 2007, 557 + xy: 2007, 693 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-stained-stone-red-icon-full rotate: false - xy: 2007, 557 + xy: 2007, 693 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-stained-stone-red-icon-medium rotate: false - xy: 2007, 557 + xy: 2007, 693 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-stained-stone1 rotate: false - xy: 2007, 727 + xy: 1973, 591 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-stained-stone2 rotate: false - xy: 2007, 693 + xy: 1939, 557 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-stained-stone3 rotate: false - xy: 2007, 659 + xy: 1973, 557 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-stained-stone-icon-full rotate: false - xy: 2007, 659 + xy: 1973, 557 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-stained-stone-icon-medium rotate: false - xy: 2007, 659 + xy: 1973, 557 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5998,42 +5991,42 @@ ore-scrap-stone-icon-large index: -1 ore-scrap-stone-icon-small rotate: false - xy: 1443, 25 + xy: 1967, 225 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-scrap-stone1 rotate: false - xy: 1863, 523 + xy: 2007, 659 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-stone2 rotate: false - xy: 1897, 523 + xy: 2007, 625 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-stone3 rotate: false - xy: 1931, 523 + xy: 2007, 591 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-stone-icon-full rotate: false - xy: 1931, 523 + xy: 2007, 591 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-stone-icon-medium rotate: false - xy: 1931, 523 + xy: 2007, 591 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6047,42 +6040,42 @@ ore-thorium-holostone-icon-large index: -1 ore-thorium-holostone-icon-small rotate: false - xy: 1701, 254 + xy: 1993, 225 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-thorium-holostone1 rotate: false - xy: 1965, 523 + xy: 2007, 557 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-holostone2 rotate: false - xy: 1999, 523 + xy: 1863, 523 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-holostone3 rotate: false - xy: 1865, 489 + xy: 1863, 489 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-holostone-icon-full rotate: false - xy: 1865, 489 + xy: 1863, 489 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-holostone-icon-medium rotate: false - xy: 1865, 489 + xy: 1863, 489 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6096,42 +6089,42 @@ ore-thorium-sand-icon-large index: -1 ore-thorium-sand-icon-small rotate: false - xy: 1697, 228 + xy: 2019, 225 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-thorium-sand1 rotate: false - xy: 1865, 455 + xy: 1897, 523 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-sand2 rotate: false - xy: 1899, 489 + xy: 1931, 523 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-sand3 rotate: false - xy: 1899, 455 + xy: 1897, 489 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-sand-icon-full rotate: false - xy: 1899, 455 + xy: 1897, 489 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-sand-icon-medium rotate: false - xy: 1899, 455 + xy: 1897, 489 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6145,7 +6138,7 @@ ore-thorium-stained-stone-icon-large index: -1 ore-thorium-stained-stone-icon-small rotate: false - xy: 1697, 202 + xy: 1863, 199 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6159,77 +6152,77 @@ ore-thorium-stained-stone-red-icon-large index: -1 ore-thorium-stained-stone-red-icon-small rotate: false - xy: 1697, 176 + xy: 1889, 199 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-thorium-stained-stone-red1 rotate: false - xy: 1967, 455 + xy: 1965, 489 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-stained-stone-red2 rotate: false - xy: 2001, 489 + xy: 1999, 489 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-stained-stone-red3 rotate: false - xy: 2001, 455 + xy: 1889, 455 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-stained-stone-red-icon-full rotate: false - xy: 2001, 455 + xy: 1889, 455 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-stained-stone-red-icon-medium rotate: false - xy: 2001, 455 + xy: 1889, 455 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-stained-stone1 rotate: false - xy: 1933, 489 + xy: 1965, 523 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-stained-stone2 rotate: false - xy: 1933, 455 + xy: 1931, 489 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-stained-stone3 rotate: false - xy: 1967, 489 + xy: 1999, 523 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-stained-stone-icon-full rotate: false - xy: 1967, 489 + xy: 1999, 523 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-stained-stone-icon-medium rotate: false - xy: 1967, 489 + xy: 1999, 523 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6243,42 +6236,42 @@ ore-thorium-stone-icon-large index: -1 ore-thorium-stone-icon-small rotate: false - xy: 1727, 251 + xy: 1915, 199 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-thorium-stone1 rotate: false - xy: 1893, 421 + xy: 1923, 455 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-stone2 rotate: false - xy: 1893, 387 + xy: 1957, 455 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-stone3 rotate: false - xy: 1927, 421 + xy: 1991, 455 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-stone-icon-full rotate: false - xy: 1927, 421 + xy: 1991, 455 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-stone-icon-medium rotate: false - xy: 1927, 421 + xy: 1991, 455 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6292,42 +6285,42 @@ ore-titanium-holostone-icon-large index: -1 ore-titanium-holostone-icon-small rotate: false - xy: 1753, 251 + xy: 1941, 199 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-titanium-holostone1 rotate: false - xy: 1927, 387 + xy: 1915, 421 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-holostone2 rotate: false - xy: 1961, 421 + xy: 1949, 421 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-holostone3 rotate: false - xy: 1961, 387 + xy: 1983, 421 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-holostone-icon-full rotate: false - xy: 1961, 387 + xy: 1983, 421 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-holostone-icon-medium rotate: false - xy: 1961, 387 + xy: 1983, 421 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6341,42 +6334,42 @@ ore-titanium-sand-icon-large index: -1 ore-titanium-sand-icon-small rotate: false - xy: 1779, 251 + xy: 1967, 199 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-titanium-sand1 rotate: false - xy: 1995, 421 + xy: 1915, 387 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-sand2 rotate: false - xy: 1995, 387 + xy: 1949, 387 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-sand3 rotate: false - xy: 1893, 353 + xy: 1983, 387 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-sand-icon-full rotate: false - xy: 1893, 353 + xy: 1983, 387 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-sand-icon-medium rotate: false - xy: 1893, 353 + xy: 1983, 387 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6390,7 +6383,7 @@ ore-titanium-stained-stone-icon-large index: -1 ore-titanium-stained-stone-icon-small rotate: false - xy: 1723, 225 + xy: 1993, 199 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6404,77 +6397,77 @@ ore-titanium-stained-stone-red-icon-large index: -1 ore-titanium-stained-stone-red-icon-small rotate: false - xy: 1723, 199 + xy: 2019, 199 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-titanium-stained-stone-red1 rotate: false - xy: 579, 139 + xy: 1249, 409 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-stained-stone-red2 rotate: false - xy: 613, 139 + xy: 1283, 409 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-stained-stone-red3 rotate: false - xy: 647, 139 + xy: 1317, 409 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-stained-stone-red-icon-full rotate: false - xy: 647, 139 + xy: 1317, 409 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-stained-stone-red-icon-medium rotate: false - xy: 647, 139 + xy: 1317, 409 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-stained-stone1 rotate: false - xy: 1927, 353 + xy: 1249, 443 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-stained-stone2 rotate: false - xy: 1961, 353 + xy: 1283, 443 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-stained-stone3 rotate: false - xy: 1995, 353 + xy: 1317, 443 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-stained-stone-icon-full rotate: false - xy: 1995, 353 + xy: 1317, 443 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-stained-stone-icon-medium rotate: false - xy: 1995, 353 + xy: 1317, 443 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6488,42 +6481,42 @@ ore-titanium-stone-icon-large index: -1 ore-titanium-stone-icon-small rotate: false - xy: 1749, 225 + xy: 1860, 173 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-titanium-stone1 rotate: false - xy: 681, 139 + xy: 1278, 375 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-stone2 rotate: false - xy: 589, 105 + xy: 1312, 375 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-stone3 rotate: false - xy: 623, 105 + xy: 1305, 341 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-stone-icon-full rotate: false - xy: 623, 105 + xy: 1305, 341 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-stone-icon-medium rotate: false - xy: 623, 105 + xy: 1305, 341 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6537,14 +6530,14 @@ overdrive-projector-icon-large index: -1 overdrive-projector-icon-medium rotate: false - xy: 589, 71 + xy: 1305, 307 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 overdrive-projector-icon-small rotate: false - xy: 1749, 199 + xy: 1860, 147 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6558,7 +6551,7 @@ overflow-gate-icon-large index: -1 overflow-gate-icon-small rotate: false - xy: 1775, 225 + xy: 1886, 173 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6579,14 +6572,14 @@ phantom-factory-icon-large index: -1 phantom-factory-icon-medium rotate: false - xy: 589, 37 + xy: 1339, 307 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phantom-factory-icon-small rotate: false - xy: 1775, 199 + xy: 1886, 147 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6600,7 +6593,7 @@ phase-conduit-icon-large index: -1 phase-conduit-icon-small rotate: false - xy: 1723, 173 + xy: 1912, 173 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6614,7 +6607,7 @@ phase-conveyor-icon-large index: -1 phase-conveyor-icon-small rotate: false - xy: 1749, 173 + xy: 1912, 147 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6628,7 +6621,7 @@ phase-wall-icon-large index: -1 phase-wall-icon-small rotate: false - xy: 1775, 173 + xy: 1938, 173 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6642,14 +6635,14 @@ phase-wall-large-icon-large index: -1 phase-wall-large-icon-medium rotate: false - xy: 657, 3 + xy: 1387, 137 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-wall-large-icon-small rotate: false - xy: 1697, 150 + xy: 1938, 147 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6670,14 +6663,14 @@ phase-weaver-icon-large index: -1 phase-weaver-icon-medium rotate: false - xy: 691, 3 + xy: 1387, 103 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-weaver-icon-small rotate: false - xy: 1723, 147 + xy: 1964, 173 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6691,7 +6684,7 @@ pine-icon-large index: -1 pine-icon-small rotate: false - xy: 1749, 147 + xy: 1964, 147 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6705,14 +6698,14 @@ plastanium-compressor-icon-large index: -1 plastanium-compressor-icon-medium rotate: false - xy: 759, 109 + xy: 1373, 341 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-compressor-icon-small rotate: false - xy: 1775, 147 + xy: 1990, 173 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6733,14 +6726,14 @@ pneumatic-drill-icon-large index: -1 pneumatic-drill-icon-medium rotate: false - xy: 725, 75 + xy: 1373, 307 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pneumatic-drill-icon-small rotate: false - xy: 1805, 233 + xy: 1990, 147 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6754,7 +6747,7 @@ power-node-icon-large index: -1 power-node-icon-small rotate: false - xy: 1831, 233 + xy: 2016, 173 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6768,14 +6761,14 @@ power-node-large-icon-large index: -1 power-node-large-icon-medium rotate: false - xy: 725, 41 + xy: 1425, 239 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 power-node-large-icon-small rotate: false - xy: 1857, 233 + xy: 2016, 147 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6789,7 +6782,7 @@ power-source-icon-large index: -1 power-source-icon-small rotate: false - xy: 1801, 207 + xy: 1860, 121 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6803,14 +6796,14 @@ power-void-icon-large index: -1 power-void-icon-small rotate: false - xy: 1801, 181 + xy: 1886, 121 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 pulse-conduit-icon-full rotate: false - xy: 793, 75 + xy: 1421, 69 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6824,14 +6817,14 @@ pulse-conduit-icon-large index: -1 pulse-conduit-icon-small rotate: false - xy: 1827, 207 + xy: 1912, 121 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 pulverizer-icon-full rotate: false - xy: 861, 41 + xy: 1482, 393 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6845,7 +6838,7 @@ pulverizer-icon-large index: -1 pulverizer-icon-small rotate: false - xy: 1801, 155 + xy: 1938, 121 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6859,14 +6852,42 @@ pyratite-mixer-icon-large index: -1 pyratite-mixer-icon-medium rotate: false - xy: 895, 109 + xy: 1407, 323 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pyratite-mixer-icon-small rotate: false - xy: 1827, 181 + xy: 1964, 121 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +repair-point + rotate: false + xy: 1516, 377 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +repair-point-icon-full + rotate: false + xy: 1584, 377 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +repair-point-icon-large + rotate: false + xy: 1725, 791 + size: 48, 48 + orig: 48, 48 + offset: 0, 0 + index: -1 +repair-point-icon-small + rotate: false + xy: 1990, 121 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6880,21 +6901,21 @@ revenant-factory-icon-full index: -1 revenant-factory-icon-large rotate: false - xy: 1725, 791 + xy: 1737, 741 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 revenant-factory-icon-medium rotate: false - xy: 895, 7 + xy: 1618, 377 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 revenant-factory-icon-small rotate: false - xy: 1853, 207 + xy: 2016, 121 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6915,91 +6936,91 @@ ripple-icon-full index: -1 ripple-icon-large rotate: false - xy: 1737, 691 + xy: 1737, 641 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ripple-icon-medium rotate: false - xy: 1249, 443 + xy: 1652, 377 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ripple-icon-small rotate: false - xy: 1827, 155 + xy: 1515, 147 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 rocks-icon-large rotate: false - xy: 1775, 791 + xy: 1787, 741 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 rocks-icon-small rotate: false - xy: 1853, 181 + xy: 1515, 121 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 rotary-pump-icon-large rotate: false - xy: 1787, 741 + xy: 1787, 691 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 rotary-pump-icon-medium rotate: false - xy: 1249, 409 + xy: 1441, 357 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rotary-pump-icon-small rotate: false - xy: 1853, 155 + xy: 1515, 95 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 router-icon-large rotate: false - xy: 1787, 691 + xy: 1787, 641 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 router-icon-small rotate: false - xy: 1801, 129 + xy: 1515, 69 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 rtg-generator-icon-large rotate: false - xy: 1787, 641 + xy: 1787, 591 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 rtg-generator-icon-medium rotate: false - xy: 1317, 409 + xy: 1475, 359 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rtg-generator-icon-small rotate: false - xy: 1827, 129 + xy: 1541, 117 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7020,21 +7041,21 @@ salvo-icon-full index: -1 salvo-icon-large rotate: false - xy: 1787, 591 + xy: 1737, 541 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 salvo-icon-medium rotate: false - xy: 1313, 375 + xy: 1509, 343 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 salvo-icon-small rotate: false - xy: 1853, 129 + xy: 1541, 91 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7048,14 +7069,14 @@ sand-edge index: -1 sand-icon-large rotate: false - xy: 1737, 541 + xy: 1787, 541 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 sand-icon-small rotate: false - xy: 1883, 215 + xy: 1541, 65 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7069,147 +7090,147 @@ sand-water-edge index: -1 sand-water-icon-large rotate: false - xy: 1787, 541 + xy: 1766, 1123 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 sand-water-icon-small rotate: false - xy: 1909, 215 + xy: 1567, 117 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 scrap-wall-gigantic-icon-large rotate: false - xy: 1766, 1123 + xy: 1816, 1123 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 scrap-wall-gigantic-icon-medium rotate: false - xy: 1357, 137 + xy: 1645, 309 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall-gigantic-icon-small rotate: false - xy: 1935, 215 + xy: 1567, 91 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 scrap-wall-huge-icon-large rotate: false - xy: 1816, 1123 + xy: 1866, 1123 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 scrap-wall-huge-icon-medium rotate: false - xy: 1357, 103 + xy: 1679, 309 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall-huge-icon-small rotate: false - xy: 1961, 215 + xy: 1567, 65 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 scrap-wall-icon-large rotate: false - xy: 1866, 1123 + xy: 1916, 1151 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 scrap-wall-icon-small rotate: false - xy: 1987, 215 + xy: 1593, 119 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 scrap-wall-large-icon-large rotate: false - xy: 1916, 1151 + xy: 1966, 1151 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 scrap-wall-large-icon-medium rotate: false - xy: 1395, 307 + xy: 1713, 305 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall-large-icon-small rotate: false - xy: 2013, 215 + xy: 1619, 119 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 separator-icon-large rotate: false - xy: 1966, 1151 + xy: 1916, 1101 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 separator-icon-medium rotate: false - xy: 1391, 239 + xy: 1509, 275 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 separator-icon-small rotate: false - xy: 1905, 189 + xy: 1645, 119 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 shock-mine-icon-large rotate: false - xy: 1916, 1101 + xy: 1966, 1101 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 shock-mine-icon-small rotate: false - xy: 1905, 163 + xy: 1671, 119 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 silicon-smelter-icon-large rotate: false - xy: 879, 671 + xy: 879, 621 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 silicon-smelter-icon-medium rotate: false - xy: 1391, 137 + xy: 1611, 275 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 silicon-smelter-icon-small rotate: false - xy: 1931, 189 + xy: 1645, 93 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7223,91 +7244,91 @@ snow-edge index: -1 snow-icon-large rotate: false - xy: 879, 621 + xy: 929, 671 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 snow-icon-small rotate: false - xy: 1905, 137 + xy: 1671, 93 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 snowrocks-icon-large rotate: false - xy: 929, 671 + xy: 879, 571 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 snowrocks-icon-small rotate: false - xy: 1931, 163 + xy: 1697, 115 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 solar-panel-icon-large rotate: false - xy: 879, 571 + xy: 929, 621 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 solar-panel-icon-small rotate: false - xy: 1957, 189 + xy: 1723, 115 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 solar-panel-large-icon-large rotate: false - xy: 929, 621 + xy: 929, 571 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 solar-panel-large-icon-medium rotate: false - xy: 1385, 425 + xy: 1781, 339 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 solar-panel-large-icon-small rotate: false - xy: 1931, 137 + xy: 1749, 115 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 sorter-icon-large rotate: false - xy: 929, 571 + xy: 979, 656 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 sorter-icon-small rotate: false - xy: 1957, 163 + xy: 1775, 115 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 spawn-icon-large rotate: false - xy: 979, 656 + xy: 1029, 656 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 spawn-icon-small rotate: false - xy: 1983, 189 + xy: 1697, 89 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7328,21 +7349,21 @@ spectre-icon-full index: -1 spectre-icon-large rotate: false - xy: 1029, 656 + xy: 979, 606 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 spectre-icon-medium rotate: false - xy: 1483, 393 + xy: 1815, 337 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spectre-icon-small rotate: false - xy: 1957, 137 + xy: 1723, 89 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7356,98 +7377,98 @@ spirit-factory-icon-full index: -1 spirit-factory-icon-large rotate: false - xy: 1079, 656 + xy: 1029, 606 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 spirit-factory-icon-medium rotate: false - xy: 1407, 357 + xy: 1849, 371 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spirit-factory-icon-small rotate: false - xy: 1983, 163 + xy: 1749, 89 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 spore-cluster-icon-large rotate: false - xy: 1029, 606 + xy: 1129, 656 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 spore-cluster-icon-medium rotate: false - xy: 1517, 377 + xy: 1815, 303 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spore-cluster-icon-small rotate: false - xy: 2009, 189 + xy: 1775, 89 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 stained-boulder-icon-large rotate: false - xy: 1129, 656 + xy: 1079, 606 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 stained-boulder-icon-small rotate: false - xy: 1983, 137 + xy: 1801, 113 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 stained-rocks-icon-large rotate: false - xy: 1079, 606 + xy: 1129, 606 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 stained-rocks-icon-small rotate: false - xy: 2009, 163 + xy: 1827, 113 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 stained-rocks-red-icon-large rotate: false - xy: 1129, 606 + xy: 1179, 614 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 stained-rocks-red-icon-small rotate: false - xy: 2009, 137 + xy: 1801, 87 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 stained-rocks-yellow-icon-large rotate: false - xy: 1179, 614 + xy: 1229, 614 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 stained-rocks-yellow-icon-small rotate: false - xy: 1879, 110 + xy: 1827, 87 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7461,14 +7482,14 @@ stained-stone-edge index: -1 stained-stone-icon-large rotate: false - xy: 1229, 614 + xy: 1279, 611 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 stained-stone-icon-small rotate: false - xy: 1905, 111 + xy: 1853, 95 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7482,14 +7503,14 @@ stained-stone-red-edge index: -1 stained-stone-red-icon-large rotate: false - xy: 1279, 611 + xy: 1329, 611 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 stained-stone-red-icon-small rotate: false - xy: 1931, 111 + xy: 1879, 95 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7503,14 +7524,14 @@ stained-stone-yellow-edge index: -1 stained-stone-yellow-icon-large rotate: false - xy: 1329, 611 + xy: 979, 556 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 stained-stone-yellow-icon-small rotate: false - xy: 1957, 111 + xy: 1905, 95 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7524,70 +7545,70 @@ stone-edge index: -1 stone-icon-large rotate: false - xy: 979, 556 + xy: 1029, 556 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 stone-icon-small rotate: false - xy: 1983, 111 + xy: 1931, 95 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 surge-tower-icon-large rotate: false - xy: 1029, 556 + xy: 1079, 556 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 surge-tower-icon-medium rotate: false - xy: 1459, 255 + xy: 579, 139 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 surge-tower-icon-small rotate: false - xy: 2009, 111 + xy: 1957, 95 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 surge-wall-icon-large rotate: false - xy: 1079, 556 + xy: 1129, 556 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 surge-wall-icon-small rotate: false - xy: 1715, 121 + xy: 1983, 95 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 surge-wall-large-icon-large rotate: false - xy: 1129, 556 + xy: 1179, 564 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 surge-wall-large-icon-medium rotate: false - xy: 1459, 187 + xy: 647, 139 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 surge-wall-large-icon-small rotate: false - xy: 1741, 121 + xy: 2009, 95 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7608,21 +7629,21 @@ swarmer-icon-full index: -1 swarmer-icon-large rotate: false - xy: 1229, 564 + xy: 1279, 561 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 swarmer-icon-medium rotate: false - xy: 1459, 153 + xy: 681, 139 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 swarmer-icon-small rotate: false - xy: 1767, 121 + xy: 1593, 51 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7636,154 +7657,154 @@ tar-edge index: -1 tar-icon-large rotate: false - xy: 1279, 561 + xy: 1329, 561 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 tar-icon-small rotate: false - xy: 1727, 95 + xy: 1619, 56 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 tau-mech-pad-icon-large rotate: false - xy: 1429, 577 + xy: 913, 521 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 tau-mech-pad-icon-medium rotate: false - xy: 1459, 85 + xy: 589, 71 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 tau-mech-pad-icon-small rotate: false - xy: 1753, 95 + xy: 1645, 67 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 thermal-generator-icon-large rotate: false - xy: 913, 521 + xy: 963, 506 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 thermal-generator-icon-medium rotate: false - xy: 1509, 343 + xy: 623, 105 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thermal-generator-icon-small rotate: false - xy: 1727, 69 + xy: 1671, 67 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 thermal-pump-icon-large rotate: false - xy: 963, 506 + xy: 1013, 506 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 thermal-pump-icon-medium rotate: false - xy: 1543, 343 + xy: 589, 37 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thermal-pump-icon-small rotate: false - xy: 1753, 69 + xy: 1697, 63 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 thorium-reactor-icon-large rotate: false - xy: 1013, 506 + xy: 1063, 506 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 thorium-reactor-icon-medium rotate: false - xy: 1679, 343 + xy: 657, 71 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium-reactor-icon-small rotate: false - xy: 1779, 95 + xy: 1723, 63 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 thorium-wall-icon-large rotate: false - xy: 1063, 506 + xy: 1113, 506 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 thorium-wall-icon-small rotate: false - xy: 1779, 69 + xy: 1749, 63 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 thorium-wall-large-icon-large rotate: false - xy: 1113, 506 + xy: 1379, 527 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 thorium-wall-large-icon-medium rotate: false - xy: 1531, 309 + xy: 691, 105 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium-wall-large-icon-small rotate: false - xy: 1805, 103 + xy: 1775, 63 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 thruster-icon-large rotate: false - xy: 1379, 527 + xy: 1429, 527 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 thruster-icon-medium rotate: false - xy: 1565, 309 + xy: 691, 71 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thruster-icon-small rotate: false - xy: 1831, 103 + xy: 1801, 61 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7797,112 +7818,112 @@ titan-factory-icon-full index: -1 titan-factory-icon-large rotate: false - xy: 1429, 527 + xy: 1479, 545 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 titan-factory-icon-medium rotate: false - xy: 1599, 309 + xy: 691, 37 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titan-factory-icon-small rotate: false - xy: 1805, 77 + xy: 1827, 61 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 titanium-conveyor-icon-large rotate: false - xy: 1479, 545 + xy: 1529, 529 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 titanium-conveyor-icon-small rotate: false - xy: 1831, 77 + xy: 1853, 69 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 titanium-wall-icon-large rotate: false - xy: 1529, 529 + xy: 1579, 529 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 titanium-wall-icon-small rotate: false - xy: 1805, 51 + xy: 1879, 69 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 titanium-wall-large-icon-large rotate: false - xy: 1579, 529 + xy: 1629, 529 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 titanium-wall-large-icon-medium rotate: false - xy: 1561, 139 + xy: 895, 109 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-wall-large-icon-small rotate: false - xy: 1831, 51 + xy: 1905, 69 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 trident-ship-pad-icon-large rotate: false - xy: 1629, 529 + xy: 1679, 529 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 trident-ship-pad-icon-medium rotate: false - xy: 1629, 207 + xy: 895, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 trident-ship-pad-icon-small rotate: false - xy: 1857, 84 + xy: 1931, 69 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 turbine-generator-icon-large rotate: false - xy: 1679, 529 + xy: 1479, 495 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 turbine-generator-icon-medium rotate: false - xy: 1663, 241 + xy: 895, 7 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 turbine-generator-icon-small rotate: false - xy: 1857, 58 + xy: 1957, 69 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7916,14 +7937,14 @@ unit-icon-chaos-array index: -1 unit-icon-crawler rotate: false - xy: 1479, 495 + xy: 1529, 479 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-icon-dagger rotate: false - xy: 1529, 479 + xy: 1579, 479 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -7958,35 +7979,35 @@ unit-icon-titan index: -1 unloader-icon-large rotate: false - xy: 1579, 479 + xy: 1629, 479 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unloader-icon-small rotate: false - xy: 1883, 84 + xy: 1983, 69 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 vault-icon-large rotate: false - xy: 1629, 479 + xy: 1679, 479 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 vault-icon-medium rotate: false - xy: 1595, 139 + xy: 963, 123 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 vault-icon-small rotate: false - xy: 1883, 58 + xy: 2009, 69 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -8007,35 +8028,35 @@ water-extractor-icon-full index: -1 water-extractor-icon-large rotate: false - xy: 1679, 479 + xy: 1729, 491 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 water-extractor-icon-medium rotate: false - xy: 1663, 207 + xy: 929, 55 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 water-extractor-icon-small rotate: false - xy: 1909, 85 + xy: 1645, 41 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 water-icon-large rotate: false - xy: 1729, 491 + xy: 1779, 491 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 water-icon-small rotate: false - xy: 1909, 59 + xy: 1671, 41 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -8056,63 +8077,63 @@ wave-icon-full index: -1 wave-icon-large rotate: false - xy: 1779, 491 + xy: 1163, 506 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 wave-icon-medium rotate: false - xy: 1595, 105 + xy: 963, 89 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 wave-icon-small rotate: false - xy: 1935, 85 + xy: 1697, 37 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 white-tree-dead-icon-large rotate: false - xy: 1163, 506 + xy: 1213, 514 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 white-tree-dead-icon-medium rotate: false - xy: 1629, 139 + xy: 929, 21 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 white-tree-dead-icon-small rotate: false - xy: 1935, 59 + xy: 1723, 37 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 white-tree-icon-large rotate: false - xy: 1213, 514 + xy: 1263, 511 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 white-tree-icon-medium rotate: false - xy: 1663, 173 + xy: 963, 55 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 white-tree-icon-small rotate: false - xy: 1961, 85 + xy: 1749, 37 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -8126,161 +8147,161 @@ wraith-factory-icon-full index: -1 wraith-factory-icon-large rotate: false - xy: 1313, 511 + xy: 1729, 441 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 wraith-factory-icon-medium rotate: false - xy: 1629, 105 + xy: 963, 21 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 wraith-factory-icon-small rotate: false - xy: 1961, 59 + xy: 1775, 37 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-biomatter rotate: false - xy: 1723, 389 + xy: 1451, 427 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-blast-compound rotate: false - xy: 1757, 389 + xy: 1485, 427 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-coal rotate: false - xy: 1791, 389 + xy: 1519, 411 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-copper rotate: false - xy: 1825, 371 + xy: 1553, 411 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-graphite rotate: false - xy: 1859, 371 + xy: 1587, 411 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-lead rotate: false - xy: 1733, 1089 + xy: 1621, 411 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-metaglass rotate: false - xy: 1767, 1089 + xy: 1655, 411 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-phase-fabric rotate: false - xy: 1733, 1055 + xy: 1689, 411 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-plastanium rotate: false - xy: 1801, 1089 + xy: 1723, 407 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-pyratite rotate: false - xy: 1767, 1055 + xy: 1733, 1089 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-sand rotate: false - xy: 1733, 1021 + xy: 1767, 1089 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-scrap rotate: false - xy: 1835, 1089 + xy: 1733, 1055 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-silicon rotate: false - xy: 1801, 1055 + xy: 1801, 1089 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-surge-alloy rotate: false - xy: 1869, 1089 + xy: 1733, 1021 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-thorium rotate: false - xy: 1835, 1055 + xy: 1835, 1089 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-titanium rotate: false - xy: 1801, 1021 + xy: 1801, 1055 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-cryofluid rotate: false - xy: 1971, 999 + xy: 1937, 1033 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-oil rotate: false - xy: 2005, 1033 + xy: 1903, 999 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-slag rotate: false - xy: 1741, 919 + xy: 2005, 999 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-water rotate: false - xy: 1843, 987 + xy: 1775, 987 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -8406,14 +8427,14 @@ tau-mech index: -1 tau-mech-base rotate: false - xy: 1329, 561 + xy: 1379, 577 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 tau-mech-leg rotate: false - xy: 1379, 577 + xy: 1429, 577 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -8455,7 +8476,7 @@ trident-ship index: -1 blank rotate: false - xy: 1727, 277 + xy: 1279, 661 size: 1, 1 orig: 1, 1 offset: 0, 0 @@ -8469,7 +8490,7 @@ circle index: -1 clear rotate: false - xy: 1279, 661 + xy: 1487, 795 size: 1, 1 orig: 1, 1 offset: 0, 0 @@ -8483,7 +8504,7 @@ shape-3 index: -1 bar rotate: false - xy: 2016, 1125 + xy: 1548, 237 size: 27, 36 split: 9, 9, 9, 9 orig: 27, 36 @@ -8491,7 +8512,7 @@ bar index: -1 bar-top rotate: false - xy: 2016, 1163 + xy: 1519, 237 size: 27, 36 split: 9, 10, 9, 10 orig: 27, 36 @@ -8587,7 +8608,7 @@ button-right-over index: -1 button-select rotate: false - xy: 1007, 103 + xy: 1548, 185 size: 24, 24 split: 4, 4, 4, 4 orig: 24, 24 @@ -8602,21 +8623,21 @@ check-off index: -1 check-on rotate: false - xy: 1419, 425 + xy: 1219, 443 size: 28, 32 orig: 28, 32 offset: 0, 0 index: -1 check-on-over rotate: false - xy: 915, 143 + xy: 2016, 1167 size: 28, 32 orig: 28, 32 offset: 0, 0 index: -1 check-over rotate: false - xy: 1733, 1132 + xy: 2016, 1133 size: 28, 32 orig: 28, 32 offset: 0, 0 @@ -8630,7 +8651,7 @@ clear index: -1 content-background rotate: false - xy: 987, 309 + xy: 945, 267 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -8646,7 +8667,7 @@ content-background-locked index: -1 content-background-over rotate: false - xy: 945, 267 + xy: 1071, 435 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -8668,77 +8689,77 @@ discord-banner index: -1 empty-sector rotate: false - xy: 1293, 294 + xy: 1255, 158 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-crafting rotate: false - xy: 1371, 1139 + xy: 1335, 1403 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-defense rotate: false - xy: 531, 1543 + xy: 1173, 1102 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-distribution rotate: false - xy: 845, 987 + xy: 1371, 1139 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-effect rotate: false - xy: 1882, 1213 + xy: 531, 1543 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-liquid rotate: false - xy: 1857, 111 + xy: 915, 159 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-power rotate: false - xy: 2005, 93 + xy: 433, 9 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-production rotate: false - xy: 845, 1507 + xy: 495, 1698 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-turret rotate: false - xy: 1987, 57 + xy: 455, 1000 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-units rotate: false - xy: 1097, 315 + xy: 491, 1000 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-upgrade rotate: false - xy: 2023, 75 + xy: 1837, 43 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -8752,28 +8773,28 @@ controller-cursor index: -1 icon-about rotate: false - xy: 1207, 464 + xy: 535, 1100 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-add rotate: false - xy: 535, 1100 + xy: 1537, 779 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-admin rotate: false - xy: 1537, 779 + xy: 553, 457 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-admin-small rotate: false - xy: 1483, 1421 + xy: 1093, 304 size: 6, 6 orig: 6, 6 offset: 0, 0 @@ -8829,189 +8850,189 @@ icon-arrow-up index: -1 icon-back rotate: false - xy: 471, 637 + xy: 1883, 387 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-ban rotate: false - xy: 553, 457 + xy: 623, 923 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-break rotate: false - xy: 489, 637 + xy: 1863, 251 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-cancel rotate: false - xy: 845, 1543 + xy: 471, 637 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-cancel-2 rotate: false - xy: 1111, 103 + xy: 1834, 191 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 icon-chat rotate: false - xy: 1345, 112 + xy: 845, 1071 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-check rotate: false - xy: 1335, 1403 + xy: 489, 637 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-check-2 rotate: false - xy: 1085, 86 + xy: 1574, 171 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 icon-copy rotate: false - xy: 1173, 1102 + xy: 845, 1543 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-cursor rotate: false - xy: 1715, 109 + xy: 933, 165 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-dev-builds rotate: false - xy: 623, 923 + xy: 1363, 545 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-discord rotate: false - xy: 1363, 545 + xy: 1837, 541 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-donate rotate: false - xy: 1837, 541 + xy: 1863, 473 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-dots rotate: false - xy: 1865, 439 + xy: 1889, 439 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-editor rotate: false - xy: 579, 191 + xy: 1351, 409 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-egg rotate: false - xy: 1351, 409 + xy: 1380, 375 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-elevation rotate: false - xy: 433, 27 + xy: 845, 987 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-eraser rotate: false - xy: 477, 1698 + xy: 1882, 1213 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-exit rotate: false - xy: 1381, 375 + xy: 1407, 307 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-file rotate: false - xy: 1877, 1003 + xy: 433, 27 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-file-image rotate: false - xy: 1851, 901 + xy: 477, 1698 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-file-text rotate: false - xy: 1407, 341 + xy: 579, 191 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-fill rotate: false - xy: 1825, 799 + xy: 1877, 1003 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-floppy rotate: false - xy: 1429, 273 + xy: 997, 141 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-floppy-16 rotate: false - xy: 2016, 1107 + xy: 1851, 901 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-folder rotate: false - xy: 1767, 903 + xy: 1433, 273 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-folder-parent rotate: false - xy: 845, 971 + xy: 1767, 903 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -9025,70 +9046,70 @@ icon-generated index: -1 icon-github rotate: false - xy: 1843, 801 + xy: 513, 191 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-google-play rotate: false - xy: 535, 1084 + xy: 513, 175 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-grid rotate: false - xy: 1223, 433 + xy: 1825, 799 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-hold rotate: false - xy: 845, 1071 + xy: 845, 1495 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-holdDelete rotate: false - xy: 845, 1495 + xy: 1225, 1275 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-home rotate: false - xy: 1553, 779 + xy: 845, 971 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-host rotate: false - xy: 569, 457 + xy: 1843, 801 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-info rotate: false - xy: 623, 907 + xy: 1757, 407 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-itch.io rotate: false - xy: 1363, 529 + xy: 535, 1084 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-item rotate: false - xy: 1881, 443 + xy: 1695, 829 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -9102,91 +9123,91 @@ icon-items-none index: -1 icon-line rotate: false - xy: 1153, 1168 + xy: 1757, 423 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-link rotate: false - xy: 579, 175 + xy: 1553, 779 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-liquid-small rotate: false - xy: 971, 159 + xy: 651, 637 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-load rotate: false - xy: 1900, 1185 + xy: 569, 457 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-load-image rotate: false - xy: 1987, 93 + xy: 1153, 1168 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-load-map rotate: false - xy: 845, 1525 + xy: 1027, 112 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-loading rotate: false - xy: 1353, 1403 + xy: 1365, 72 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-locked rotate: false - xy: 531, 1525 + xy: 1801, 43 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-logic rotate: false - xy: 1225, 1275 + xy: 1225, 1263 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-map rotate: false - xy: 2033, 541 + xy: 623, 907 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-menu rotate: false - xy: 1695, 829 + xy: 1707, 829 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-menu-large rotate: false - xy: 1882, 1195 + xy: 845, 1525 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-missing rotate: false - xy: 651, 637 + xy: 663, 637 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -9200,301 +9221,301 @@ icon-mission-background index: -1 icon-mission-battle rotate: false - xy: 971, 147 + xy: 1767, 891 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-mission-defense rotate: false - xy: 1225, 1263 + xy: 2037, 1390 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-mission-done rotate: false - xy: 1707, 829 + xy: 2037, 1378 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-none rotate: false - xy: 663, 637 + xy: 2037, 1366 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-paste rotate: false - xy: 433, 9 + xy: 1353, 1403 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-pause rotate: false - xy: 1497, 347 + xy: 2037, 1354 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-pencil rotate: false - xy: 495, 1698 + xy: 531, 1525 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-pencil-small rotate: false - xy: 2033, 525 + xy: 1363, 529 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-pick rotate: false - xy: 1987, 75 + xy: 1882, 1195 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-play rotate: false - xy: 1767, 891 + xy: 2037, 1342 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-play-2 rotate: false - xy: 451, 1 + xy: 579, 175 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-play-custom rotate: false - xy: 467, 1 + xy: 1900, 1185 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-players rotate: false - xy: 2037, 1390 + xy: 2037, 1330 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-power-small rotate: false - xy: 2037, 1378 + xy: 2037, 1318 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-quit rotate: false - xy: 483, 1 + xy: 2033, 541 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-redo rotate: false - xy: 531, 1507 + xy: 1365, 54 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-refresh rotate: false - xy: 499, 1 + xy: 2033, 525 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rename rotate: false - xy: 945, 129 + xy: 2033, 509 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-resize rotate: false - xy: 1882, 1177 + xy: 1819, 43 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-rotate rotate: false - xy: 961, 129 + xy: 2033, 493 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-arrow rotate: false - xy: 1363, 513 + xy: 451, 1 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-left rotate: false - xy: 2032, 2033 + xy: 467, 1 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-right rotate: false - xy: 1419, 9 + xy: 483, 1 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save rotate: false - xy: 2032, 2017 + xy: 499, 1 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save-image rotate: false - xy: 2005, 75 + xy: 845, 1507 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-save-map rotate: false - xy: 437, 1000 + xy: 531, 1507 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-settings rotate: false - xy: 2037, 1366 + xy: 2037, 1306 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-spray rotate: false - xy: 455, 1000 + xy: 1882, 1177 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-terrain rotate: false - xy: 473, 1000 + xy: 1365, 36 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-tools rotate: false - xy: 1435, 9 + xy: 2033, 477 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-touch rotate: false - xy: 2037, 1354 + xy: 2037, 1294 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-touchDelete rotate: false - xy: 2037, 1342 + xy: 2037, 1282 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-trash rotate: false - xy: 2032, 2001 + xy: 1363, 513 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-trash-16 rotate: false - xy: 491, 1000 + xy: 1365, 18 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-tree rotate: false - xy: 509, 1000 + xy: 437, 1000 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-tree-locked rotate: false - xy: 1519, 411 + xy: 1353, 90 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-trello rotate: false - xy: 1451, 9 + xy: 2032, 2033 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-tutorial rotate: false - xy: 2032, 1985 + xy: 1473, 35 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-undo rotate: false - xy: 2005, 57 + xy: 473, 1000 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-unlocked rotate: false - xy: 2023, 93 + xy: 509, 1000 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-unlocks rotate: false - xy: 2032, 1969 + xy: 1491, 53 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-wiki rotate: false - xy: 2032, 1953 + xy: 2032, 2017 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-zone rotate: false - xy: 1079, 60 + xy: 1600, 171 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -9508,14 +9529,14 @@ icon-zone-locked index: -1 icon-zoom rotate: false - xy: 2023, 57 + xy: 929, 3 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-zoom-small rotate: false - xy: 1694, 134 + xy: 1507, 53 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -9529,7 +9550,7 @@ info-banner index: -1 inventory rotate: false - xy: 1105, 35 + xy: 1548, 143 size: 24, 40 split: 10, 10, 10, 14 orig: 24, 40 @@ -9544,7 +9565,7 @@ logotext index: -1 pane rotate: false - xy: 945, 238 + xy: 1109, 435 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -9552,7 +9573,7 @@ pane index: -1 pane-2 rotate: false - xy: 1113, 435 + xy: 1071, 406 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -9560,7 +9581,7 @@ pane-2 index: -1 scroll rotate: false - xy: 1879, 136 + xy: 1619, 82 size: 24, 35 split: 10, 10, 6, 5 orig: 24, 35 @@ -9568,7 +9589,7 @@ scroll index: -1 scroll-horizontal rotate: false - xy: 487, 181 + xy: 1071, 380 size: 35, 24 split: 6, 5, 10, 10 orig: 35, 24 @@ -9584,7 +9605,7 @@ scroll-knob-horizontal-black index: -1 scroll-knob-vertical-black rotate: false - xy: 1879, 173 + xy: 1593, 77 size: 24, 40 split: 10, 10, 6, 10 orig: 24, 40 @@ -9592,21 +9613,21 @@ scroll-knob-vertical-black index: -1 sector-select rotate: false - xy: 1395, 273 + xy: 1475, 291 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 selection rotate: false - xy: 1487, 795 + xy: 529, 125 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 slider rotate: false - xy: 1763, 1156 + xy: 1516, 417 size: 1, 8 orig: 1, 8 offset: 0, 0 @@ -9620,14 +9641,14 @@ slider-knob index: -1 slider-knob-down rotate: false - xy: 1663, 133 + xy: 1733, 1126 size: 29, 38 orig: 29, 38 offset: 0, 0 index: -1 slider-knob-over rotate: false - xy: 1663, 133 + xy: 1733, 1126 size: 29, 38 orig: 29, 38 offset: 0, 0 @@ -9641,7 +9662,7 @@ slider-vertical index: -1 underline rotate: false - xy: 945, 171 + xy: 1147, 435 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -9649,7 +9670,7 @@ underline index: -1 underline-2 rotate: false - xy: 1151, 435 + xy: 1109, 406 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -9657,14 +9678,14 @@ underline-2 index: -1 white rotate: false - xy: 1271, 1186 + xy: 1142, 401 size: 3, 3 orig: 3, 3 offset: 0, 0 index: -1 window-empty rotate: false - xy: 1701, 280 + xy: 1519, 174 size: 27, 61 split: 8, 8, 44, 11 orig: 27, 61 @@ -9812,7 +9833,7 @@ revenant index: -1 spirit rotate: false - xy: 979, 606 + xy: 1079, 656 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -9833,7 +9854,7 @@ titan-leg index: -1 wraith rotate: false - xy: 1263, 511 + xy: 1313, 511 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -9931,21 +9952,21 @@ reaper-gun-equip index: -1 revenant-missiles-equip rotate: false - xy: 1737, 741 + xy: 1737, 691 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 shockgun-equip rotate: false - xy: 1966, 1101 + xy: 879, 671 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 swarmer-equip rotate: false - xy: 1179, 564 + xy: 1229, 564 size: 48, 48 orig: 48, 48 offset: 0, 0 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index 1e7dd1e515..e38f89e91b 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/entities/type/Player.java b/core/src/io/anuke/mindustry/entities/type/Player.java index b5d8720ad3..febd19032f 100644 --- a/core/src/io/anuke/mindustry/entities/type/Player.java +++ b/core/src/io/anuke/mindustry/entities/type/Player.java @@ -749,6 +749,7 @@ public class Player extends Unit implements BuilderTrait, ShooterTrait{ dead = true; target = null; moveTarget = null; + spawner = lastSpawner = null; health = maxHealth(); boostHeat = drownTime = hitTime = 0f; mech = (isMobile ? Mechs.starterMobile : Mechs.starterDesktop); diff --git a/core/src/io/anuke/mindustry/world/blocks/power/PowerGraph.java b/core/src/io/anuke/mindustry/world/blocks/power/PowerGraph.java index 7f5f0fd1e2..2f81cb86fb 100644 --- a/core/src/io/anuke/mindustry/world/blocks/power/PowerGraph.java +++ b/core/src/io/anuke/mindustry/world/blocks/power/PowerGraph.java @@ -128,17 +128,19 @@ public class PowerGraph{ Consumers consumes = consumer.block().consumes; if(consumes.has(ConsumePower.class)){ ConsumePower consumePower = consumes.get(ConsumePower.class); - if(!otherConsumersAreValid(consumer, consumePower)){ - consumer.entity.power.satisfaction = 0.0f; // Only supply power if the consumer would get valid that way + //if(!otherConsumersAreValid(consumer, consumePower)){ + // consumer.entity.power.satisfaction = 0.0f; // Only supply power if the consumer would get valid that way + //}else{ + + //currently satisfies power even if it's not required yet + if(consumePower.isBuffered){ + // Add an equal percentage of power to all buffers, based on the global power coverage in this graph + float maximumRate = consumePower.requestedPower(consumer.block(), consumer.entity()) * coverage * consumer.entity.delta(); + consumer.entity.power.satisfaction = Mathf.clamp(consumer.entity.power.satisfaction + maximumRate / consumePower.powerCapacity); }else{ - if(consumePower.isBuffered){ - // Add an equal percentage of power to all buffers, based on the global power coverage in this graph - float maximumRate = consumePower.requestedPower(consumer.block(), consumer.entity()) * coverage * consumer.entity.delta(); - consumer.entity.power.satisfaction = Mathf.clamp(consumer.entity.power.satisfaction + maximumRate / consumePower.powerCapacity); - }else{ - consumer.entity.power.satisfaction = coverage; - } + consumer.entity.power.satisfaction = coverage; } + // } } } } @@ -246,14 +248,12 @@ public class PowerGraph{ } } - //currently ignores all other consumers and consumes power anyway. private boolean otherConsumersAreValid(Tile tile, Consume consumePower){ - /* for(Consume cons : tile.block().consumes.all()){ if(cons != consumePower && !cons.isOptional() && !cons.valid(tile.block(), tile.entity())){ return false; } - }*/ + } return true; } diff --git a/tests/src/test/java/IOTests.java b/tests/src/test/java/IOTests.java index 5357bb515e..7a75b81d16 100644 --- a/tests/src/test/java/IOTests.java +++ b/tests/src/test/java/IOTests.java @@ -4,6 +4,7 @@ import org.junit.jupiter.api.Test; import java.nio.ByteBuffer; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; public class IOTests{ @@ -28,7 +29,7 @@ public class IOTests{ ByteBuffer buffer = ByteBuffer.allocate(500); TypeIO.writeString(buffer, null); buffer.position(0); - assertEquals(TypeIO.readString(buffer), null); + assertNull(TypeIO.readString(buffer)); } } diff --git a/tests/src/test/java/power/DirectConsumerTests.java b/tests/src/test/java/power/DirectConsumerTests.java index 5298c27fde..88233734ce 100644 --- a/tests/src/test/java/power/DirectConsumerTests.java +++ b/tests/src/test/java/power/DirectConsumerTests.java @@ -16,13 +16,13 @@ public class DirectConsumerTests extends PowerTestFixture{ @Test void noPowerRequestedWithNoItems(){ - testUnitFactory(0, 0, 0.08f, 0.08f, 1f); + testUnitFactory(0, 0, 0.08f, 0.08f, 0f); } @Test void noPowerRequestedWithInsufficientItems(){ - testUnitFactory(30, 0, 0.08f, 0.08f, 1f); - testUnitFactory(0, 30, 0.08f, 0.08f, 1f); + testUnitFactory(30, 0, 0.08f, 0.08f, 0f); + testUnitFactory(0, 30, 0.08f, 0.08f, 0f); } @Test diff --git a/tests/src/test/java/power/ItemLiquidGeneratorTests.java b/tests/src/test/java/power/ItemLiquidGeneratorTests.java index 87338158a1..07192592a0 100644 --- a/tests/src/test/java/power/ItemLiquidGeneratorTests.java +++ b/tests/src/test/java/power/ItemLiquidGeneratorTests.java @@ -89,7 +89,7 @@ public class ItemLiquidGeneratorTests extends PowerTestFixture{ assertTrue(generator.acceptLiquid(tile, null, liquid, availableLiquidAmount), inputType + " | " + parameterDescription + ": Liquids which will be declined by the generator don't need to be tested - The code won't be called for those cases."); entity.liquids.add(liquid, availableLiquidAmount); - entity.cons.update(tile.entity); + entity.cons.update(); assertTrue(entity.cons.valid()); // Perform an update on the generator once - This should use up any resource up to the maximum liquid usage @@ -134,7 +134,7 @@ public class ItemLiquidGeneratorTests extends PowerTestFixture{ if(amount > 0){ entity.items.add(item, amount); } - entity.cons.update(tile.entity); + entity.cons.update(); assertTrue(entity.cons.valid()); // Perform an update on the generator once - This should use up one or zero items - dependent on if the item is accepted and available or not. @@ -161,7 +161,7 @@ public class ItemLiquidGeneratorTests extends PowerTestFixture{ // Burn a single coal and test for the duration entity.items.add(Items.coal, 1); - entity.cons.update(tile.entity); + entity.cons.update(); generator.update(tile); float expectedEfficiency = entity.productionEfficiency; diff --git a/tests/src/test/java/power/PowerTestFixture.java b/tests/src/test/java/power/PowerTestFixture.java index 66f3058554..e94a52ac55 100644 --- a/tests/src/test/java/power/PowerTestFixture.java +++ b/tests/src/test/java/power/PowerTestFixture.java @@ -85,7 +85,7 @@ public class PowerTestFixture{ // Simulate the "changed" method. Calling it through reflections would require half the game to be initialized. tile.entity = block.newEntity().init(tile, false); - tile.entity.cons = new ConsumeModule(); + tile.entity.cons = new ConsumeModule(tile.entity); if(block.hasItems) tile.entity.items = new ItemModule(); if(block.hasLiquids) tile.entity.liquids = new LiquidModule(); if(block.hasPower){