diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index d2a167e1bd..0f353e46be 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -305,7 +305,7 @@ blocks.blockinfo = Block Info blocks.powercapacity = Power Capacity blocks.powershot = Power/Shot blocks.targetsair = Targets Air -blocks.itemspeed = Units Moved +blocks.itemsmoved = Move Speed blocks.shootrange = Range blocks.size = Size blocks.liquidcapacity = Liquid Capacity @@ -351,7 +351,6 @@ unit.blocks = blocks unit.powersecond = power units/second unit.liquidsecond = liquid units/second unit.itemssecond = items/second -unit.pixelssecond = pixels/second unit.liquidunits = liquid units unit.powerunits = power units unit.degrees = degrees diff --git a/core/assets/sprites/block_colors.png b/core/assets/sprites/block_colors.png index c7535cc20a..94b5e2d2a9 100644 Binary files a/core/assets/sprites/block_colors.png and b/core/assets/sprites/block_colors.png differ diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index 23cf9d6c7a..b704a47f15 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: 1699, 1063 + xy: 1391, 205 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor rotate: false - xy: 979, 298 + xy: 1213, 480 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-bridge rotate: false - xy: 979, 264 + xy: 1247, 477 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-end rotate: false - xy: 979, 230 + xy: 1281, 477 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-0 rotate: false - xy: 1081, 230 + xy: 1017, 206 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-1 rotate: false - xy: 1081, 196 + xy: 1017, 172 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-2 rotate: false - xy: 1115, 434 + xy: 1055, 274 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-3 rotate: false - xy: 1115, 400 + xy: 1051, 240 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-0 rotate: false - xy: 1115, 366 + xy: 1051, 206 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-1 rotate: false - xy: 1115, 332 + xy: 1051, 172 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-2 rotate: false - xy: 1115, 298 + xy: 1063, 308 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-3 rotate: false - xy: 1115, 264 + xy: 1089, 274 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-0 rotate: false - xy: 1115, 230 + xy: 1085, 240 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-1 rotate: false - xy: 1115, 196 + xy: 1085, 206 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-2 rotate: false - xy: 1047, 162 + xy: 1085, 172 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-3 rotate: false - xy: 1081, 162 + xy: 745, 143 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-0 rotate: false - xy: 1115, 162 + xy: 779, 143 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-1 rotate: false - xy: 1149, 443 + xy: 813, 143 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-2 rotate: false - xy: 1183, 446 + xy: 847, 143 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-3 rotate: false - xy: 1149, 409 + xy: 881, 143 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-0 rotate: false - xy: 1217, 446 + xy: 1245, 362 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-1 rotate: false - xy: 1183, 412 + xy: 1067, 346 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-2 rotate: false - xy: 1149, 375 + xy: 1101, 333 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-3 rotate: false - xy: 1217, 412 + xy: 1135, 333 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-0 rotate: false - xy: 2013, 897 + xy: 1531, 275 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-1 rotate: false - xy: 1783, 885 + xy: 1565, 275 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-2 rotate: false - xy: 1783, 851 + xy: 1599, 275 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-3 rotate: false - xy: 1817, 885 + xy: 1633, 275 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-0 rotate: false - xy: 1817, 851 + xy: 1667, 275 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-1 rotate: false - xy: 1825, 817 + xy: 1493, 241 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-2 rotate: false - xy: 1851, 863 + xy: 1493, 207 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-3 rotate: false - xy: 1885, 863 + xy: 1527, 241 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-0 rotate: false - xy: 1919, 863 + xy: 1493, 173 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-1 rotate: false - xy: 1953, 863 + xy: 1527, 207 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-2 rotate: false - xy: 1987, 863 + xy: 1561, 241 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-3 rotate: false - xy: 1859, 829 + xy: 1493, 139 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-0 rotate: false - xy: 1893, 829 + xy: 1527, 173 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-1 rotate: false - xy: 1927, 829 + xy: 1561, 207 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-2 rotate: false - xy: 1961, 829 + xy: 1595, 241 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-3 rotate: false - xy: 1995, 829 + xy: 1493, 105 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-0 rotate: false - xy: 1859, 795 + xy: 1527, 139 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-1 rotate: false - xy: 1893, 795 + xy: 1561, 173 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-2 rotate: false - xy: 1927, 795 + xy: 1595, 207 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-3 rotate: false - xy: 1961, 795 + xy: 1629, 241 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -363,7 +363,7 @@ distributor index: -1 junction rotate: false - xy: 1424, 493 + xy: 1869, 1021 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -377,49 +377,49 @@ mass-driver-base index: -1 overflow-gate rotate: false - xy: 1693, 377 + xy: 657, 105 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor rotate: false - xy: 1693, 173 + xy: 691, 105 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-arrow rotate: false - xy: 1693, 139 + xy: 691, 71 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-bridge rotate: false - xy: 1693, 105 + xy: 691, 37 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-end rotate: false - xy: 1693, 71 + xy: 589, 3 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 router rotate: false - xy: 1795, 185 + xy: 1283, 409 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sorter rotate: false - xy: 1869, 1089 + xy: 1415, 391 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -580,133 +580,133 @@ water-extractor-top index: -1 char1 rotate: false - xy: 979, 196 + xy: 1315, 477 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 char2 rotate: false - xy: 979, 162 + xy: 1349, 477 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 char3 rotate: false - xy: 1013, 443 + xy: 1383, 493 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cliffs1 rotate: false - xy: 1013, 409 + xy: 1417, 493 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 coal1 rotate: false - xy: 1013, 375 + xy: 1383, 459 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 coal2 rotate: false - xy: 1013, 341 + xy: 1417, 459 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 coal3 rotate: false - xy: 1013, 307 + xy: 1215, 396 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 copper1 rotate: false - xy: 1183, 378 + xy: 1169, 328 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 copper2 rotate: false - xy: 1149, 341 + xy: 1203, 328 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 copper3 rotate: false - xy: 1183, 344 + xy: 1237, 328 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 craters1 rotate: false - xy: 1183, 276 + xy: 1157, 294 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 craters2 rotate: false - xy: 1217, 310 + xy: 1191, 294 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 craters3 rotate: false - xy: 1149, 239 + xy: 1225, 294 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 craters4 rotate: false - xy: 1183, 242 + xy: 1157, 260 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 craters5 rotate: false - xy: 1217, 276 + xy: 1191, 260 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stone1 rotate: false - xy: 1217, 276 + xy: 1191, 260 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 craters6 rotate: false - xy: 1149, 205 + xy: 1225, 260 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stone2 rotate: false - xy: 1149, 205 + xy: 1225, 260 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 deepwater rotate: false - xy: 1217, 208 + xy: 1221, 226 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -734,14 +734,14 @@ dunerocks-large index: -1 dunerocks1 rotate: false - xy: 1319, 443 + xy: 1255, 226 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dunerocks2 rotate: false - xy: 1251, 341 + xy: 1255, 192 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -762,63 +762,63 @@ edge-stencil-smooth index: -1 grass1 rotate: false - xy: 1285, 273 + xy: 1323, 158 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 grass2 rotate: false - xy: 1319, 307 + xy: 983, 139 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 grass3 rotate: false - xy: 1251, 205 + xy: 1017, 138 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 holostone1 rotate: false - xy: 1285, 205 + xy: 1119, 129 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 holostone2 rotate: false - xy: 1319, 239 + xy: 1153, 124 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 holostone3 rotate: false - xy: 1319, 205 + xy: 1187, 124 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 hotrock1 rotate: false - xy: 1251, 171 + xy: 1221, 124 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 hotrock2 rotate: false - xy: 1285, 171 + xy: 1255, 124 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 hotrock3 rotate: false - xy: 1319, 171 + xy: 1289, 124 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -832,42 +832,42 @@ ice-edge index: -1 ice-snow1 rotate: false - xy: 1115, 128 + xy: 1699, 1063 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ice-snow2 rotate: false - xy: 1149, 137 + xy: 1699, 1029 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ice-snow3 rotate: false - xy: 1183, 140 + xy: 1699, 995 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ice1 rotate: false - xy: 1013, 137 + xy: 1323, 124 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ice2 rotate: false - xy: 1047, 128 + xy: 1699, 1131 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ice3 rotate: false - xy: 1081, 128 + xy: 1699, 1097 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -881,168 +881,168 @@ icerocks-large index: -1 icerocks1 rotate: false - xy: 1217, 140 + xy: 1451, 427 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icerocks2 rotate: false - xy: 1251, 137 + xy: 1485, 427 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ignarock1 rotate: false - xy: 1319, 137 + xy: 1553, 411 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ignarock2 rotate: false - xy: 555, 94 + xy: 1587, 411 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ignarock3 rotate: false - xy: 555, 60 + xy: 1621, 411 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 lead1 rotate: false - xy: 1387, 357 + xy: 1971, 1033 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 lead2 rotate: false - xy: 1421, 391 + xy: 1903, 999 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 lead3 rotate: false - xy: 1387, 323 + xy: 1937, 999 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 magmarock1 rotate: false - xy: 1387, 119 + xy: 1809, 953 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 magmarock2 rotate: false - xy: 1421, 153 + xy: 1775, 919 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 magmarock3 rotate: false - xy: 1421, 119 + xy: 1843, 953 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor rotate: false - xy: 1594, 445 + xy: 1911, 931 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-damaged5 rotate: false - xy: 1594, 445 + xy: 1911, 931 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-2 rotate: false - xy: 1628, 445 + xy: 1979, 965 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-3 rotate: false - xy: 1662, 445 + xy: 1945, 931 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-5 rotate: false - xy: 745, 143 + xy: 1979, 931 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-damaged1 rotate: false - xy: 779, 143 + xy: 2013, 965 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-damaged2 rotate: false - xy: 813, 143 + xy: 2013, 931 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-damaged3 rotate: false - xy: 847, 143 + xy: 1877, 897 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-damaged4 rotate: false - xy: 881, 143 + xy: 1911, 897 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-damaged6 rotate: false - xy: 1183, 72 + xy: 1945, 897 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pine rotate: false - xy: 1727, 373 + xy: 725, 109 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rock1 rotate: false - xy: 1737, 591 + xy: 1737, 641 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 rock2 rotate: false - xy: 1775, 791 + xy: 1737, 591 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -1056,84 +1056,84 @@ rocks-large index: -1 rocks1 rotate: false - xy: 1795, 287 + xy: 1283, 443 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rocks2 rotate: false - xy: 1795, 253 + xy: 1317, 443 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand-water rotate: false - xy: 1829, 355 + xy: 1327, 307 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand1 rotate: false - xy: 1795, 49 + xy: 1305, 341 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand2 rotate: false - xy: 1795, 15 + xy: 1339, 341 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand3 rotate: false - xy: 1829, 389 + xy: 1347, 375 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap1 rotate: false - xy: 1829, 321 + xy: 1327, 273 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap2 rotate: false - xy: 1829, 287 + xy: 1361, 307 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap3 rotate: false - xy: 1829, 253 + xy: 1361, 273 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snow1 rotate: false - xy: 1767, 1089 + xy: 1425, 239 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snow2 rotate: false - xy: 1733, 1055 + xy: 1425, 205 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snow3 rotate: false - xy: 1801, 1089 + xy: 1425, 171 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1147,49 +1147,49 @@ snowrocks-large index: -1 snowrocks1 rotate: false - xy: 1767, 1055 + xy: 1425, 137 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snowrocks2 rotate: false - xy: 1733, 1021 + xy: 1425, 103 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spore-cluster1 rotate: false - xy: 837, 679 + xy: 987, 338 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 spore-cluster2 rotate: false - xy: 477, 1716 + xy: 1029, 380 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 spore-cluster3 rotate: false - xy: 913, 479 + xy: 1071, 422 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 stained-boulder1 rotate: false - xy: 1869, 1021 + xy: 1551, 377 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stained-boulder2 rotate: false - xy: 1903, 1067 + xy: 1585, 377 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: 1937, 1033 + xy: 1687, 377 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stained-rocks-red2 rotate: false - xy: 1971, 1067 + xy: 1721, 355 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: 1971, 1033 + xy: 1755, 355 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stained-rocks-yellow2 rotate: false - xy: 1903, 999 + xy: 1789, 355 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stained-rocks1 rotate: false - xy: 1903, 1033 + xy: 1619, 377 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stained-rocks2 rotate: false - xy: 1937, 1067 + xy: 1653, 377 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stained-stone-red1 rotate: false - xy: 2005, 1033 + xy: 1925, 319 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stained-stone-red2 rotate: false - xy: 2005, 999 + xy: 1959, 319 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stained-stone-red3 rotate: false - xy: 1741, 987 + xy: 1993, 319 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stained-stone-yellow1 rotate: false - xy: 1741, 953 + xy: 1441, 357 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stained-stone-yellow2 rotate: false - xy: 1775, 987 + xy: 1475, 359 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stained-stone-yellow3 rotate: false - xy: 1741, 919 + xy: 1429, 323 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stained-stone1 rotate: false - xy: 1937, 999 + xy: 1823, 337 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stained-stone2 rotate: false - xy: 1971, 999 + xy: 1857, 337 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stained-stone3 rotate: false - xy: 2005, 1067 + xy: 1891, 319 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1329,77 +1329,77 @@ stainedrocks-large index: -1 stainedrocks1 rotate: false - xy: 1809, 987 + xy: 1429, 289 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stainedrocks2 rotate: false - xy: 1775, 953 + xy: 1463, 323 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stone3 rotate: false - xy: 1843, 987 + xy: 1463, 289 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 tar rotate: false - xy: 1843, 919 + xy: 1459, 119 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium1 rotate: false - xy: 1911, 931 + xy: 1577, 343 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium2 rotate: false - xy: 1945, 965 + xy: 1611, 343 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium3 rotate: false - xy: 1945, 931 + xy: 1645, 343 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium1 rotate: false - xy: 1911, 897 + xy: 1633, 309 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium2 rotate: false - xy: 1945, 897 + xy: 1667, 309 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium3 rotate: false - xy: 1979, 897 + xy: 1497, 275 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 water rotate: false - xy: 1837, 659 + xy: 1629, 173 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1420,35 +1420,35 @@ white-tree-dead index: -1 block-border rotate: false - xy: 1288, 477 + xy: 1177, 362 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-middle rotate: false - xy: 1322, 477 + xy: 1729, 457 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pump-liquid rotate: false - xy: 1322, 477 + xy: 1729, 457 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-select rotate: false - xy: 945, 162 + xy: 1763, 457 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-liquid rotate: false - xy: 1047, 332 + xy: 1689, 445 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1518,175 +1518,175 @@ rubble-4-1 index: -1 spawn rotate: false - xy: 1835, 1055 + xy: 1449, 393 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit rotate: false - xy: 979, 434 + xy: 1797, 457 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit-arrow rotate: false - xy: 979, 400 + xy: 555, 94 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-arrow rotate: false - xy: 979, 400 + xy: 555, 94 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit-bridge rotate: false - xy: 979, 366 + xy: 555, 60 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit-end rotate: false - xy: 979, 332 + xy: 555, 26 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom rotate: false - xy: 1013, 205 + xy: 1831, 473 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-0 rotate: false - xy: 1013, 171 + xy: 1831, 439 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-1 rotate: false - xy: 1817, 457 + xy: 1451, 461 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-2 rotate: false - xy: 1817, 423 + xy: 1485, 461 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-3 rotate: false - xy: 1047, 434 + xy: 1519, 445 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-4 rotate: false - xy: 1081, 434 + xy: 1553, 445 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-5 rotate: false - xy: 1047, 400 + xy: 1587, 445 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-6 rotate: false - xy: 1047, 366 + xy: 1621, 445 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-0 rotate: false - xy: 1081, 366 + xy: 1723, 423 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-1 rotate: false - xy: 1047, 298 + xy: 1757, 423 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-2 rotate: false - xy: 1081, 332 + xy: 1791, 423 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-3 rotate: false - xy: 1047, 264 + xy: 1825, 405 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-4 rotate: false - xy: 1081, 298 + xy: 1859, 405 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-5 rotate: false - xy: 1047, 230 + xy: 1029, 308 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-6 rotate: false - xy: 1081, 264 + xy: 1021, 274 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-junction rotate: false - xy: 1387, 289 + xy: 2005, 1067 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-bottom rotate: false - xy: 1387, 255 + xy: 2005, 999 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-liquid rotate: false - xy: 1387, 221 + xy: 1741, 953 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-top rotate: false - xy: 1421, 255 + xy: 1775, 987 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1714,84 +1714,84 @@ liquid-tank-top index: -1 mechanical-pump rotate: false - xy: 1458, 461 + xy: 1877, 965 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit rotate: false - xy: 1693, 309 + xy: 623, 71 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-arrow rotate: false - xy: 1693, 275 + xy: 623, 37 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-bridge rotate: false - xy: 1693, 241 + xy: 657, 71 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-end rotate: false - xy: 1693, 207 + xy: 657, 37 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-0 rotate: false - xy: 1727, 33 + xy: 861, 109 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-1 rotate: false - xy: 1761, 390 + xy: 759, 7 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-2 rotate: false - xy: 1761, 356 + xy: 793, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-3 rotate: false - xy: 1761, 322 + xy: 827, 75 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-4 rotate: false - xy: 1761, 288 + xy: 793, 7 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-5 rotate: false - xy: 1761, 254 + xy: 827, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-6 rotate: false - xy: 1761, 220 + xy: 861, 75 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1861,7 +1861,7 @@ trident-ship-pad index: -1 battery rotate: false - xy: 945, 332 + xy: 1113, 401 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1875,14 +1875,14 @@ battery-large index: -1 combustion-generator rotate: false - xy: 1013, 273 + xy: 1211, 362 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 combustion-generator-top rotate: false - xy: 1013, 239 + xy: 1829, 507 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1945,7 +1945,7 @@ impact-reactor-top index: -1 power-node rotate: false - xy: 1727, 271 + xy: 793, 109 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1959,28 +1959,28 @@ power-node-large index: -1 power-source rotate: false - xy: 1727, 203 + xy: 759, 75 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 power-void rotate: false - xy: 1727, 169 + xy: 827, 109 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 powerinfinite rotate: false - xy: 1727, 135 + xy: 725, 7 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 powervoid rotate: false - xy: 1727, 101 + xy: 759, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1994,14 +1994,14 @@ rtg-generator index: -1 rtg-generator-top rotate: false - xy: 1795, 117 + xy: 1279, 375 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 solar-panel rotate: false - xy: 1835, 1089 + xy: 1351, 425 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2176,21 +2176,21 @@ graphite-press index: -1 incinerator rotate: false - xy: 1149, 103 + xy: 1689, 411 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-source rotate: false - xy: 1353, 239 + xy: 1767, 1021 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-void rotate: false - xy: 1353, 103 + xy: 1869, 1055 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2218,21 +2218,21 @@ silicon-smelter-top index: -1 lavasmelter rotate: false - xy: 1421, 425 + xy: 1971, 1067 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-source rotate: false - xy: 1421, 221 + xy: 1809, 987 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 melter rotate: false - xy: 1526, 445 + xy: 1877, 931 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2246,7 +2246,7 @@ multi-press index: -1 oilrefinery rotate: false - xy: 1285, 69 + xy: 1783, 885 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2288,14 +2288,14 @@ plastanium-compressor-top index: -1 pulverizer rotate: false - xy: 1761, 186 + xy: 827, 7 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulverizer-rotator rotate: false - xy: 1761, 118 + xy: 861, 7 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2330,7 +2330,7 @@ silicon-smelter index: -1 smelter rotate: false - xy: 1733, 1089 + xy: 1391, 103 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2379,14 +2379,14 @@ launch-pad index: -1 sortedunloader rotate: false - xy: 1767, 1021 + xy: 1381, 391 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unloader rotate: false - xy: 1871, 727 + xy: 1561, 105 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2400,14 +2400,14 @@ vault index: -1 arc-heat rotate: false - xy: 945, 400 + xy: 983, 207 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-1 rotate: false - xy: 1254, 477 + xy: 1143, 367 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2603,7 +2603,14 @@ phantom-factory-top-open index: -1 repair-point-base rotate: false - xy: 1761, 16 + xy: 895, 75 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +repair-point-turret + rotate: false + xy: 895, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2666,7 +2673,7 @@ wraith-factory-top-open index: -1 copper-wall rotate: false - xy: 1217, 378 + xy: 1123, 299 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2680,7 +2687,7 @@ copper-wall-large index: -1 door rotate: false - xy: 1285, 443 + xy: 1221, 158 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2701,14 +2708,14 @@ door-large-open index: -1 door-open rotate: false - xy: 1285, 409 + xy: 1259, 260 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-wall rotate: false - xy: 1693, 37 + xy: 623, 3 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2778,42 +2785,42 @@ scrap-wall-large4 index: -1 scrap-wall1 rotate: false - xy: 1829, 219 + xy: 1373, 341 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall2 rotate: false - xy: 1829, 185 + xy: 1357, 239 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall3 rotate: false - xy: 1829, 151 + xy: 1357, 205 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall4 rotate: false - xy: 1829, 117 + xy: 1357, 171 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall5 rotate: false - xy: 1829, 117 + xy: 1357, 171 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 surge-wall rotate: false - xy: 1775, 919 + xy: 1459, 221 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2827,7 +2834,7 @@ surge-wall-large index: -1 thorium-wall rotate: false - xy: 1979, 931 + xy: 1497, 309 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2848,7 +2855,7 @@ thruster index: -1 titanium-wall rotate: false - xy: 1995, 795 + xy: 1527, 105 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2862,7 +2869,7 @@ titanium-wall-large index: -1 beam rotate: false - xy: 2043, 667 + xy: 1303, 1273 size: 4, 48 orig: 4, 48 offset: 0, 0 @@ -2890,7 +2897,7 @@ bullet-back index: -1 casing rotate: false - xy: 579, 157 + xy: 1449, 85 size: 8, 16 orig: 8, 16 offset: 0, 0 @@ -2904,7 +2911,7 @@ error index: -1 laser rotate: false - xy: 1303, 1273 + xy: 2029, 405 size: 4, 48 orig: 4, 48 offset: 0, 0 @@ -2925,7 +2932,7 @@ laserfull index: -1 minelaser rotate: false - xy: 2027, 615 + xy: 2037, 1292 size: 4, 48 orig: 4, 48 offset: 0, 0 @@ -2939,14 +2946,14 @@ minelaser-end index: -1 missile rotate: false - xy: 1779, 424 + xy: 1029, 342 size: 36, 36 orig: 36, 36 offset: 0, 0 index: -1 missile-back rotate: false - xy: 955, 468 + xy: 1071, 384 size: 36, 36 orig: 36, 36 offset: 0, 0 @@ -2960,70 +2967,70 @@ scale_marker index: -1 scorch1 rotate: false - xy: 589, 1 + xy: 929, 1 size: 28, 100 orig: 28, 100 offset: 0, 0 index: -1 scorch2 rotate: false - xy: 619, 1 + xy: 959, 1 size: 28, 100 orig: 28, 100 offset: 0, 0 index: -1 scorch3 rotate: false - xy: 649, 1 + xy: 989, 1 size: 28, 100 orig: 28, 100 offset: 0, 0 index: -1 scorch4 rotate: false - xy: 679, 1 + xy: 1019, 1 size: 28, 100 orig: 28, 100 offset: 0, 0 index: -1 scorch5 rotate: false - xy: 709, 1 + xy: 1049, 1 size: 28, 100 orig: 28, 100 offset: 0, 0 index: -1 shell rotate: false - xy: 1069, 468 + xy: 945, 200 size: 36, 36 orig: 36, 36 offset: 0, 0 index: -1 shell-back rotate: false - xy: 1107, 468 + xy: 1337, 1227 size: 36, 36 orig: 36, 36 offset: 0, 0 index: -1 shot rotate: false - xy: 1699, 1029 + xy: 1391, 171 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 transfer rotate: false - xy: 739, 19 + xy: 2043, 1292 size: 4, 48 orig: 4, 48 offset: 0, 0 index: -1 transfer-arrow rotate: false - xy: 1837, 727 + xy: 1595, 173 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3044,7 +3051,7 @@ alloy-smelter-icon-large index: -1 alloy-smelter-icon-medium rotate: false - xy: 1337, 1202 + xy: 1337, 1193 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3065,28 +3072,28 @@ alpha-dart-mech-pad-icon-large index: -1 alpha-dart-mech-pad-icon-medium rotate: false - xy: 1220, 480 + xy: 987, 275 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 alpha-dart-mech-pad-icon-small rotate: false - xy: 1727, 7 + xy: 1451, 501 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 arc rotate: false - xy: 945, 434 + xy: 983, 241 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 arc-icon-full rotate: false - xy: 945, 366 + xy: 983, 173 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3128,14 +3135,14 @@ battery-large-icon-large index: -1 battery-large-icon-medium rotate: false - xy: 945, 298 + xy: 1147, 401 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 battery-large-icon-small rotate: false - xy: 1973, 769 + xy: 715, 147 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3156,14 +3163,14 @@ biomattercompressor-icon-large index: -1 biomattercompressor-icon-medium rotate: false - xy: 945, 264 + xy: 1189, 430 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 biomattercompressor-icon-small rotate: false - xy: 1871, 633 + xy: 1663, 107 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3184,14 +3191,14 @@ blast-drill-icon-large index: -1 blast-drill-icon-medium rotate: false - xy: 945, 230 + xy: 1181, 396 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 blast-drill-icon-small rotate: false - xy: 1905, 661 + xy: 929, 103 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3205,14 +3212,14 @@ blast-mixer-icon-large index: -1 blast-mixer-icon-medium rotate: false - xy: 945, 196 + xy: 1109, 367 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 blast-mixer-icon-small rotate: false - xy: 1837, 561 + xy: 955, 103 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3226,7 +3233,7 @@ bridge-conduit-icon-large index: -1 bridge-conduit-icon-small rotate: false - xy: 2016, 1112 + xy: 945, 145 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3240,7 +3247,7 @@ bridge-conveyor-icon-large index: -1 bridge-conveyor-icon-small rotate: false - xy: 1999, 769 + xy: 981, 103 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3254,7 +3261,7 @@ char-icon-large index: -1 char-icon-small rotate: false - xy: 945, 136 + xy: 1033, 103 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3268,7 +3275,7 @@ cliffs-icon-large index: -1 cliffs-icon-small rotate: false - xy: 971, 136 + xy: 1493, 79 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3282,14 +3289,14 @@ combustion-generator-icon-large index: -1 combustion-generator-icon-small rotate: false - xy: 1127, 1160 + xy: 1519, 79 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 conduit-icon-full rotate: false - xy: 1081, 400 + xy: 1655, 445 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3303,7 +3310,7 @@ conduit-icon-large index: -1 conduit-icon-small rotate: false - xy: 567, 131 + xy: 1545, 79 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3317,14 +3324,14 @@ container-icon-large index: -1 container-icon-medium rotate: false - xy: 1047, 196 + xy: 1017, 240 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 container-icon-small rotate: false - xy: 2022, 1703 + xy: 1571, 79 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3338,7 +3345,7 @@ conveyor-icon-large index: -1 conveyor-icon-small rotate: false - xy: 2022, 1677 + xy: 1597, 79 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3352,7 +3359,7 @@ copper-wall-icon-large index: -1 copper-wall-icon-small rotate: false - xy: 1973, 743 + xy: 1623, 79 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3366,14 +3373,14 @@ copper-wall-large-icon-large index: -1 copper-wall-large-icon-medium rotate: false - xy: 1149, 307 + xy: 1123, 265 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 copper-wall-large-icon-small rotate: false - xy: 1999, 743 + xy: 1059, 103 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3387,14 +3394,14 @@ core-foundation-icon-large index: -1 core-foundation-icon-medium rotate: false - xy: 1183, 310 + xy: 1119, 231 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 core-foundation-icon-small rotate: false - xy: 1969, 717 + xy: 1085, 112 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3408,14 +3415,14 @@ core-nucleus-icon-large index: -1 core-nucleus-icon-medium rotate: false - xy: 1217, 344 + xy: 1119, 197 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 core-nucleus-icon-small rotate: false - xy: 1995, 717 + xy: 1223, 451 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3429,14 +3436,14 @@ core-shard-icon-large index: -1 core-shard-icon-medium rotate: false - xy: 1149, 273 + xy: 1119, 163 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 core-shard-icon-small rotate: false - xy: 1965, 691 + xy: 1127, 1160 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3450,7 +3457,7 @@ craters-icon-large index: -1 craters-icon-small rotate: false - xy: 1991, 691 + xy: 1730, 329 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3471,14 +3478,14 @@ cryofluidmixer-icon-large index: -1 cryofluidmixer-icon-medium rotate: false - xy: 1183, 208 + xy: 1153, 226 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cryofluidmixer-icon-small rotate: false - xy: 1871, 607 + xy: 1756, 329 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3499,14 +3506,14 @@ cultivator-icon-large index: -1 cultivator-icon-medium rotate: false - xy: 1217, 242 + xy: 1153, 192 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cultivator-icon-small rotate: false - xy: 1866, 581 + xy: 1730, 303 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3534,14 +3541,14 @@ cyclone-icon-large index: -1 cyclone-icon-medium rotate: false - xy: 1149, 171 + xy: 1187, 226 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cyclone-icon-small rotate: false - xy: 1863, 555 + xy: 1782, 329 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3562,14 +3569,14 @@ dagger-factory-icon-large index: -1 dagger-factory-icon-medium rotate: false - xy: 1183, 174 + xy: 1187, 192 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dagger-factory-icon-small rotate: false - xy: 1863, 529 + xy: 1756, 303 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3590,7 +3597,7 @@ deepwater-icon-large index: -1 deepwater-icon-small rotate: false - xy: 1863, 503 + xy: 1782, 303 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3604,14 +3611,14 @@ delta-mech-pad-icon-large index: -1 delta-mech-pad-icon-medium rotate: false - xy: 1217, 174 + xy: 1221, 192 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 delta-mech-pad-icon-small rotate: false - xy: 1897, 633 + xy: 1730, 277 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3625,14 +3632,14 @@ differential-generator-icon-large index: -1 differential-generator-icon-medium rotate: false - xy: 1251, 443 + xy: 1153, 158 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 differential-generator-icon-small rotate: false - xy: 1897, 607 + xy: 1756, 277 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3646,14 +3653,14 @@ distributor-icon-large index: -1 distributor-icon-medium rotate: false - xy: 1251, 409 + xy: 1187, 158 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 distributor-icon-small rotate: false - xy: 1892, 581 + xy: 1782, 277 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3667,7 +3674,7 @@ door-icon-large index: -1 door-icon-small rotate: false - xy: 1889, 555 + xy: 1649, 79 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3681,14 +3688,14 @@ door-large-icon-large index: -1 door-large-icon-medium rotate: false - xy: 1251, 375 + xy: 1259, 294 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 door-large-icon-small rotate: false - xy: 1889, 529 + xy: 1675, 81 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3702,21 +3709,21 @@ dunerocks-icon-large index: -1 dunerocks-icon-small rotate: false - xy: 1889, 503 + xy: 1689, 107 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 duo rotate: false - xy: 1285, 375 + xy: 1255, 158 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 duo-icon-full rotate: false - xy: 1319, 409 + xy: 1271, 328 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3730,7 +3737,7 @@ duo-icon-large index: -1 duo-icon-small rotate: false - xy: 593, 147 + xy: 1701, 81 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3744,14 +3751,14 @@ force-projector-icon-large index: -1 force-projector-icon-medium rotate: false - xy: 1285, 341 + xy: 1293, 260 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 force-projector-icon-small rotate: false - xy: 619, 147 + xy: 1808, 311 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3772,14 +3779,14 @@ fortress-factory-icon-large index: -1 fortress-factory-icon-medium rotate: false - xy: 1319, 375 + xy: 1289, 226 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 fortress-factory-icon-small rotate: false - xy: 645, 147 + xy: 1834, 311 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3807,14 +3814,14 @@ fuse-icon-large index: -1 fuse-icon-medium rotate: false - xy: 1251, 273 + xy: 1289, 192 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 fuse-icon-small rotate: false - xy: 671, 147 + xy: 1808, 285 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3835,14 +3842,14 @@ ghoul-factory-icon-large index: -1 ghoul-factory-icon-medium rotate: false - xy: 1285, 307 + xy: 1289, 158 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ghoul-factory-icon-small rotate: false - xy: 697, 147 + xy: 1860, 311 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3856,14 +3863,14 @@ glaive-ship-pad-icon-large index: -1 glaive-ship-pad-icon-medium rotate: false - xy: 1319, 341 + xy: 1323, 226 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 glaive-ship-pad-icon-small rotate: false - xy: 593, 121 + xy: 1834, 285 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3877,28 +3884,28 @@ graphite-press-icon-large index: -1 graphite-press-icon-medium rotate: false - xy: 1251, 239 + xy: 1323, 192 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 graphite-press-icon-small rotate: false - xy: 619, 121 + xy: 1860, 285 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 hail rotate: false - xy: 1285, 239 + xy: 1051, 138 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 hail-icon-full rotate: false - xy: 1319, 273 + xy: 1085, 138 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3912,7 +3919,7 @@ hail-icon-large index: -1 hail-icon-small rotate: false - xy: 645, 121 + xy: 1886, 293 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3933,7 +3940,7 @@ holostone-icon-large index: -1 holostone-icon-small rotate: false - xy: 671, 121 + xy: 1912, 293 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3947,7 +3954,7 @@ hotrock-icon-large index: -1 hotrock-icon-small rotate: false - xy: 697, 121 + xy: 1938, 293 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3961,7 +3968,7 @@ ice-icon-large index: -1 ice-icon-small rotate: false - xy: 1923, 635 + xy: 1964, 293 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3982,7 +3989,7 @@ ice-snow-icon-large index: -1 ice-snow-icon-small rotate: false - xy: 1923, 609 + xy: 1990, 293 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3996,7 +4003,7 @@ icerocks-icon-large index: -1 icerocks-icon-small rotate: false - xy: 1931, 661 + xy: 2016, 293 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4010,7 +4017,7 @@ ignarock-icon-large index: -1 ignarock-icon-small rotate: false - xy: 1983, 665 + xy: 1079, 34 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4031,14 +4038,14 @@ impact-reactor-icon-large index: -1 impact-reactor-icon-medium rotate: false - xy: 555, 26 + xy: 1655, 411 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 impact-reactor-icon-small rotate: false - xy: 2009, 665 + xy: 1079, 8 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4052,193 +4059,284 @@ incinerator-icon-large index: -1 incinerator-icon-small rotate: false - xy: 2017, 691 + xy: 1111, 77 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-biomatter-medium rotate: false - xy: 2021, 717 + xy: 1105, 9 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-biomatter-small rotate: false - xy: 883, 1 + xy: 1131, 2 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 +item-biomatter-xlarge + rotate: false + xy: 837, 679 + size: 40, 40 + orig: 40, 40 + offset: 0, 0 + index: -1 item-blast-compound-medium rotate: false - xy: 2001, 639 + xy: 1137, 98 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-blast-compound-small rotate: false - xy: 901, 1 + xy: 1149, 2 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 +item-blast-compound-xlarge + rotate: false + xy: 477, 1716 + size: 40, 40 + orig: 40, 40 + offset: 0, 0 + index: -1 item-coal-medium rotate: false - xy: 2001, 613 + xy: 1163, 98 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-coal-small rotate: false - xy: 919, 1 + xy: 1167, 2 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 +item-coal-xlarge + rotate: false + xy: 913, 479 + size: 40, 40 + orig: 40, 40 + offset: 0, 0 + index: -1 item-copper-medium rotate: false - xy: 1975, 595 + xy: 1189, 98 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-copper-small rotate: false - xy: 937, 1 + xy: 1185, 2 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 +item-copper-xlarge + rotate: false + xy: 955, 464 + size: 40, 40 + orig: 40, 40 + offset: 0, 0 + index: -1 item-graphite-medium rotate: false - xy: 2001, 587 + xy: 1215, 98 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-graphite-small rotate: false - xy: 955, 1 + xy: 1203, 2 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 +item-graphite-xlarge + rotate: false + xy: 997, 464 + size: 40, 40 + orig: 40, 40 + offset: 0, 0 + index: -1 item-lead-medium rotate: false - xy: 1918, 581 + xy: 1241, 98 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-lead-small rotate: false - xy: 973, 1 + xy: 1221, 2 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 +item-lead-xlarge + rotate: false + xy: 1039, 464 + size: 40, 40 + orig: 40, 40 + offset: 0, 0 + index: -1 item-metaglass-medium rotate: false - xy: 1915, 555 + xy: 1267, 98 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-metaglass-small rotate: false - xy: 991, 1 + xy: 1239, 2 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 +item-metaglass-xlarge + rotate: false + xy: 1081, 464 + size: 40, 40 + orig: 40, 40 + offset: 0, 0 + index: -1 item-phase-fabric-medium rotate: false - xy: 1915, 529 + xy: 1293, 98 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-phase-fabric-small rotate: false - xy: 1009, 1 + xy: 1257, 2 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 +item-phase-fabric-xlarge + rotate: false + xy: 1123, 464 + size: 40, 40 + orig: 40, 40 + offset: 0, 0 + index: -1 item-plastanium-medium rotate: false - xy: 1915, 503 + xy: 1319, 98 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-plastanium-small rotate: false - xy: 1027, 1 + xy: 1275, 2 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 +item-plastanium-xlarge + rotate: false + xy: 1165, 464 + size: 40, 40 + orig: 40, 40 + offset: 0, 0 + index: -1 item-pyratite-medium rotate: false - xy: 1944, 583 + xy: 1137, 72 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-pyratite-small rotate: false - xy: 1045, 1 + xy: 1293, 2 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 +item-pyratite-xlarge + rotate: false + xy: 945, 422 + size: 40, 40 + orig: 40, 40 + offset: 0, 0 + index: -1 item-sand-medium rotate: false - xy: 1970, 569 + xy: 1163, 72 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-sand-small rotate: false - xy: 1063, 1 + xy: 1311, 2 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 +item-sand-xlarge + rotate: false + xy: 945, 380 + size: 40, 40 + orig: 40, 40 + offset: 0, 0 + index: -1 item-scrap-medium rotate: false - xy: 1944, 557 + xy: 1189, 72 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-scrap-small rotate: false - xy: 1081, 1 + xy: 1329, 2 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 +item-scrap-xlarge + rotate: false + xy: 987, 422 + size: 40, 40 + orig: 40, 40 + offset: 0, 0 + index: -1 item-silicon-medium rotate: false - xy: 1941, 531 + xy: 1215, 72 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-silicon-small rotate: false - xy: 1099, 1 + xy: 1347, 2 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 +item-silicon-xlarge + rotate: false + xy: 945, 338 + size: 40, 40 + orig: 40, 40 + offset: 0, 0 + index: -1 item-source-icon-large rotate: false xy: 1487, 645 @@ -4248,53 +4346,74 @@ item-source-icon-large index: -1 item-source-icon-small rotate: false - xy: 1941, 505 + xy: 1241, 72 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-surge-alloy-medium rotate: false - xy: 1996, 561 + xy: 1267, 72 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-surge-alloy-small rotate: false - xy: 1117, 1 + xy: 1365, 7 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 +item-surge-alloy-xlarge + rotate: false + xy: 987, 380 + size: 40, 40 + orig: 40, 40 + offset: 0, 0 + index: -1 item-thorium-medium rotate: false - xy: 1970, 543 + xy: 1293, 72 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-thorium-small rotate: false - xy: 1135, 1 + xy: 1383, 7 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 +item-thorium-xlarge + rotate: false + xy: 1029, 422 + size: 40, 40 + orig: 40, 40 + offset: 0, 0 + index: -1 item-titanium-medium rotate: false - xy: 1967, 517 + xy: 1319, 72 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-titanium-small rotate: false - xy: 1153, 1 + xy: 1401, 7 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 +item-titanium-xlarge + rotate: false + xy: 945, 296 + size: 40, 40 + orig: 40, 40 + offset: 0, 0 + index: -1 item-void-icon-large rotate: false xy: 1537, 729 @@ -4304,7 +4423,7 @@ item-void-icon-large index: -1 item-void-icon-small rotate: false - xy: 1996, 535 + xy: 1131, 46 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4318,14 +4437,14 @@ javelin-ship-pad-icon-large index: -1 javelin-ship-pad-icon-medium rotate: false - xy: 1390, 493 + xy: 1835, 1021 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 javelin-ship-pad-icon-small rotate: false - xy: 1993, 509 + xy: 1131, 20 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4339,7 +4458,7 @@ junction-icon-large index: -1 junction-icon-small rotate: false - xy: 1967, 491 + xy: 1157, 46 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4353,14 +4472,14 @@ kiln-icon-large index: -1 kiln-icon-medium rotate: false - xy: 1390, 459 + xy: 1903, 1067 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 kiln-icon-small rotate: false - xy: 1993, 483 + xy: 1157, 20 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4388,14 +4507,14 @@ lancer-icon-large index: -1 lancer-icon-medium rotate: false - xy: 1424, 459 + xy: 1903, 1033 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 lancer-icon-small rotate: false - xy: 1941, 479 + xy: 1183, 46 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4416,14 +4535,14 @@ laser-drill-icon-large index: -1 laser-drill-icon-medium rotate: false - xy: 1387, 425 + xy: 1937, 1067 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 laser-drill-icon-small rotate: false - xy: 1967, 465 + xy: 1183, 20 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4437,14 +4556,14 @@ launch-pad-icon-large index: -1 launch-pad-icon-medium rotate: false - xy: 1387, 391 + xy: 1937, 1033 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 launch-pad-icon-small rotate: false - xy: 1993, 457 + xy: 1209, 46 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4458,14 +4577,14 @@ liquid-junction-icon-large index: -1 liquid-junction-icon-small rotate: false - xy: 2022, 561 + xy: 1209, 20 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-router-icon-full rotate: false - xy: 1421, 289 + xy: 1741, 987 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4479,7 +4598,7 @@ liquid-router-icon-large index: -1 liquid-router-icon-small rotate: false - xy: 2022, 535 + xy: 1235, 46 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4493,7 +4612,7 @@ liquid-source-icon-large index: -1 liquid-source-icon-small rotate: false - xy: 2019, 509 + xy: 1235, 20 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4514,14 +4633,14 @@ liquid-tank-icon-large index: -1 liquid-tank-icon-medium rotate: false - xy: 1387, 153 + xy: 1775, 953 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-tank-icon-small rotate: false - xy: 2019, 483 + xy: 1261, 46 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4535,7 +4654,7 @@ magmarock-icon-large index: -1 magmarock-icon-small rotate: false - xy: 2019, 457 + xy: 1261, 20 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4563,14 +4682,14 @@ mass-driver-icon-large index: -1 mass-driver-icon-medium rotate: false - xy: 1387, 85 + xy: 1809, 919 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mass-driver-icon-small rotate: false - xy: 1882, 1175 + xy: 1287, 46 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4647,14 +4766,14 @@ mechanical-drill-icon-large index: -1 mechanical-drill-icon-medium rotate: false - xy: 1421, 85 + xy: 1843, 919 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mechanical-drill-icon-small rotate: false - xy: 1851, 477 + xy: 1287, 20 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4668,7 +4787,7 @@ mechanical-pump-icon-large index: -1 mechanical-pump-icon-small rotate: false - xy: 1877, 477 + xy: 1313, 46 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4696,14 +4815,14 @@ meltdown-icon-large index: -1 meltdown-icon-medium rotate: false - xy: 1492, 461 + xy: 1911, 965 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 meltdown-icon-small rotate: false - xy: 1851, 451 + xy: 1313, 20 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4717,7 +4836,7 @@ melter-icon-large index: -1 melter-icon-small rotate: false - xy: 1903, 477 + xy: 1345, 77 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4731,14 +4850,14 @@ mend-projector-icon-large index: -1 mend-projector-icon-medium rotate: false - xy: 1560, 445 + xy: 1945, 965 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mend-projector-icon-small rotate: false - xy: 1851, 425 + xy: 1371, 77 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4752,7 +4871,7 @@ metal-floor-2-icon-large index: -1 metal-floor-2-icon-small rotate: false - xy: 1877, 451 + xy: 1397, 77 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4766,7 +4885,7 @@ metal-floor-3-icon-large index: -1 metal-floor-3-icon-small rotate: false - xy: 1877, 425 + xy: 1423, 77 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4780,7 +4899,7 @@ metal-floor-5-icon-large index: -1 metal-floor-5-icon-small rotate: false - xy: 1903, 451 + xy: 2022, 1703 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4794,7 +4913,7 @@ metal-floor-damaged-icon-large index: -1 metal-floor-damaged-icon-small rotate: false - xy: 1903, 425 + xy: 2022, 1677 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4815,7 +4934,7 @@ metal-floor-icon-large index: -1 metal-floor-icon-small rotate: false - xy: 1863, 399 + xy: 1808, 259 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4829,14 +4948,14 @@ multi-press-icon-large index: -1 multi-press-icon-medium rotate: false - xy: 1217, 72 + xy: 1979, 897 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 multi-press-icon-small rotate: false - xy: 1863, 373 + xy: 1834, 259 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4857,14 +4976,14 @@ oil-extractor-icon-large index: -1 oil-extractor-icon-medium rotate: false - xy: 1251, 69 + xy: 2013, 897 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 oil-extractor-icon-small rotate: false - xy: 1889, 399 + xy: 1860, 259 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4878,14 +4997,14 @@ omega-mech-pad-icon-large index: -1 omega-mech-pad-icon-medium rotate: false - xy: 1319, 69 + xy: 1783, 851 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 omega-mech-pad-icon-small rotate: false - xy: 1863, 347 + xy: 1886, 267 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4899,42 +5018,42 @@ ore-coal-holostone-icon-large index: -1 ore-coal-holostone-icon-small rotate: false - xy: 1889, 373 + xy: 1912, 267 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-coal-holostone1 rotate: false - xy: 1353, 69 + xy: 1817, 885 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-holostone2 rotate: false - xy: 1387, 51 + xy: 1817, 851 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-holostone3 rotate: false - xy: 1421, 51 + xy: 1825, 817 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-holostone-icon-full rotate: false - xy: 1421, 51 + xy: 1825, 817 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-holostone-icon-medium rotate: false - xy: 1421, 51 + xy: 1825, 817 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4948,42 +5067,42 @@ ore-coal-sand-icon-large index: -1 ore-coal-sand-icon-small rotate: false - xy: 1863, 321 + xy: 1938, 267 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-coal-sand1 rotate: false - xy: 1455, 425 + xy: 1851, 863 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-sand2 rotate: false - xy: 1455, 391 + xy: 1885, 863 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-sand3 rotate: false - xy: 1455, 357 + xy: 1919, 863 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-sand-icon-full rotate: false - xy: 1455, 357 + xy: 1919, 863 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-sand-icon-medium rotate: false - xy: 1455, 357 + xy: 1919, 863 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4997,7 +5116,7 @@ ore-coal-stained-stone-icon-large index: -1 ore-coal-stained-stone-icon-small rotate: false - xy: 1889, 347 + xy: 1964, 267 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5011,77 +5130,77 @@ ore-coal-stained-stone-red-icon-large index: -1 ore-coal-stained-stone-red-icon-small rotate: false - xy: 1863, 295 + xy: 1990, 267 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-coal-stained-stone-red1 rotate: false - xy: 1455, 221 + xy: 1893, 829 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-stained-stone-red2 rotate: false - xy: 1455, 187 + xy: 1927, 829 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-stained-stone-red3 rotate: false - xy: 1455, 153 + xy: 1961, 829 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-stained-stone-red-icon-full rotate: false - xy: 1455, 153 + xy: 1961, 829 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-stained-stone-red-icon-medium rotate: false - xy: 1455, 153 + xy: 1961, 829 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-stained-stone1 rotate: false - xy: 1455, 323 + xy: 1953, 863 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-stained-stone2 rotate: false - xy: 1455, 289 + xy: 1987, 863 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-stained-stone3 rotate: false - xy: 1455, 255 + xy: 1859, 829 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-stained-stone-icon-full rotate: false - xy: 1455, 255 + xy: 1859, 829 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-stained-stone-icon-medium rotate: false - xy: 1455, 255 + xy: 1859, 829 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5095,42 +5214,42 @@ ore-coal-stone-icon-large index: -1 ore-coal-stone-icon-small rotate: false - xy: 1889, 321 + xy: 2016, 267 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-coal-stone1 rotate: false - xy: 1455, 119 + xy: 1995, 829 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-stone2 rotate: false - xy: 1455, 85 + xy: 1859, 795 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-stone3 rotate: false - xy: 1455, 51 + xy: 1893, 795 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-stone-icon-full rotate: false - xy: 1455, 51 + xy: 1893, 795 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-stone-icon-medium rotate: false - xy: 1455, 51 + xy: 1893, 795 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5144,42 +5263,42 @@ ore-copper-holostone-icon-large index: -1 ore-copper-holostone-icon-small rotate: false - xy: 1863, 269 + xy: 1886, 241 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-copper-holostone1 rotate: false - xy: 1489, 427 + xy: 1927, 795 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-holostone2 rotate: false - xy: 1489, 393 + xy: 1961, 795 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-holostone3 rotate: false - xy: 1489, 359 + xy: 1995, 795 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-holostone-icon-full rotate: false - xy: 1489, 359 + xy: 1995, 795 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-holostone-icon-medium rotate: false - xy: 1489, 359 + xy: 1995, 795 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5193,42 +5312,42 @@ ore-copper-sand-icon-large index: -1 ore-copper-sand-icon-small rotate: false - xy: 1889, 295 + xy: 1912, 241 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-copper-sand1 rotate: false - xy: 1489, 325 + xy: 1837, 761 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-sand2 rotate: false - xy: 1489, 291 + xy: 1837, 727 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-sand3 rotate: false - xy: 1489, 257 + xy: 1871, 761 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-sand-icon-full rotate: false - xy: 1489, 257 + xy: 1871, 761 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-sand-icon-medium rotate: false - xy: 1489, 257 + xy: 1871, 761 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5242,7 +5361,7 @@ ore-copper-stained-stone-icon-large index: -1 ore-copper-stained-stone-icon-small rotate: false - xy: 1863, 243 + xy: 1938, 241 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5256,77 +5375,77 @@ ore-copper-stained-stone-red-icon-large index: -1 ore-copper-stained-stone-red-icon-small rotate: false - xy: 1889, 269 + xy: 1964, 241 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-copper-stained-stone-red1 rotate: false - xy: 1489, 121 + xy: 1837, 659 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-stained-stone-red2 rotate: false - xy: 1489, 87 + xy: 1939, 761 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-stained-stone-red3 rotate: false - xy: 1489, 53 + xy: 1905, 727 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-stained-stone-red-icon-full rotate: false - xy: 1489, 53 + xy: 1905, 727 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-stained-stone-red-icon-medium rotate: false - xy: 1489, 53 + xy: 1905, 727 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-stained-stone1 rotate: false - xy: 1489, 223 + xy: 1837, 693 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-stained-stone2 rotate: false - xy: 1489, 189 + xy: 1905, 761 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-stained-stone3 rotate: false - xy: 1489, 155 + xy: 1871, 727 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-stained-stone-icon-full rotate: false - xy: 1489, 155 + xy: 1871, 727 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-stained-stone-icon-medium rotate: false - xy: 1489, 155 + xy: 1871, 727 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5340,42 +5459,42 @@ ore-copper-stone-icon-large index: -1 ore-copper-stone-icon-small rotate: false - xy: 1863, 217 + xy: 1990, 241 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-copper-stone1 rotate: false - xy: 1523, 411 + xy: 1871, 693 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-stone2 rotate: false - xy: 1557, 411 + xy: 1837, 625 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-stone3 rotate: false - xy: 1523, 377 + xy: 1973, 761 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-stone-icon-full rotate: false - xy: 1523, 377 + xy: 1973, 761 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-stone-icon-medium rotate: false - xy: 1523, 377 + xy: 1973, 761 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5389,42 +5508,42 @@ ore-lead-holostone-icon-large index: -1 ore-lead-holostone-icon-small rotate: false - xy: 1889, 243 + xy: 2016, 241 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-lead-holostone1 rotate: false - xy: 1591, 411 + xy: 1939, 727 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-holostone2 rotate: false - xy: 1523, 343 + xy: 1905, 693 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-holostone3 rotate: false - xy: 1557, 377 + xy: 1871, 659 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-holostone-icon-full rotate: false - xy: 1557, 377 + xy: 1871, 659 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-holostone-icon-medium rotate: false - xy: 1557, 377 + xy: 1871, 659 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5438,42 +5557,42 @@ ore-lead-sand-icon-large index: -1 ore-lead-sand-icon-small rotate: false - xy: 1863, 191 + xy: 1339, 46 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-lead-sand1 rotate: false - xy: 1625, 411 + xy: 1837, 591 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-sand2 rotate: false - xy: 1523, 309 + xy: 1973, 727 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-sand3 rotate: false - xy: 1557, 343 + xy: 1939, 693 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-sand-icon-full rotate: false - xy: 1557, 343 + xy: 1939, 693 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-sand-icon-medium rotate: false - xy: 1557, 343 + xy: 1939, 693 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5487,7 +5606,7 @@ ore-lead-stained-stone-icon-large index: -1 ore-lead-stained-stone-icon-small rotate: false - xy: 1889, 217 + xy: 1339, 20 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5501,77 +5620,77 @@ ore-lead-stained-stone-red-icon-large index: -1 ore-lead-stained-stone-red-icon-small rotate: false - xy: 1863, 165 + xy: 1365, 51 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-lead-stained-stone-red1 rotate: false - xy: 1557, 309 + xy: 1973, 693 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-stained-stone-red2 rotate: false - xy: 1591, 343 + xy: 1939, 659 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-stained-stone-red3 rotate: false - xy: 1625, 377 + xy: 1905, 625 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-stained-stone-red-icon-full rotate: false - xy: 1625, 377 + xy: 1905, 625 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-stained-stone-red-icon-medium rotate: false - xy: 1625, 377 + xy: 1905, 625 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-stained-stone1 rotate: false - xy: 1591, 377 + xy: 1905, 659 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-stained-stone2 rotate: false - xy: 1659, 411 + xy: 1871, 625 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-stained-stone3 rotate: false - xy: 1523, 275 + xy: 1837, 557 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-stained-stone-icon-full rotate: false - xy: 1523, 275 + xy: 1837, 557 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-stained-stone-icon-medium rotate: false - xy: 1523, 275 + xy: 1837, 557 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5585,42 +5704,42 @@ ore-lead-stone-icon-large index: -1 ore-lead-stone-icon-small rotate: false - xy: 1889, 191 + xy: 1365, 25 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-lead-stone1 rotate: false - xy: 1523, 241 + xy: 1871, 591 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-stone2 rotate: false - xy: 1557, 275 + xy: 1973, 659 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-stone3 rotate: false - xy: 1591, 309 + xy: 1939, 625 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-stone-icon-full rotate: false - xy: 1591, 309 + xy: 1939, 625 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-stone-icon-medium rotate: false - xy: 1591, 309 + xy: 1939, 625 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5634,42 +5753,42 @@ ore-scrap-holostone-icon-large index: -1 ore-scrap-holostone-icon-small rotate: false - xy: 1863, 139 + xy: 1391, 51 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-scrap-holostone1 rotate: false - xy: 1625, 343 + xy: 1905, 591 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-holostone2 rotate: false - xy: 1659, 377 + xy: 1871, 557 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-holostone3 rotate: false - xy: 1523, 207 + xy: 1973, 625 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-holostone-icon-full rotate: false - xy: 1523, 207 + xy: 1973, 625 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-holostone-icon-medium rotate: false - xy: 1523, 207 + xy: 1973, 625 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5683,42 +5802,42 @@ ore-scrap-sand-icon-large index: -1 ore-scrap-sand-icon-small rotate: false - xy: 1889, 165 + xy: 1391, 25 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-scrap-sand1 rotate: false - xy: 1557, 241 + xy: 1939, 591 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-sand2 rotate: false - xy: 1591, 275 + xy: 1905, 557 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-sand3 rotate: false - xy: 1625, 309 + xy: 1973, 591 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-sand-icon-full rotate: false - xy: 1625, 309 + xy: 1973, 591 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-sand-icon-medium rotate: false - xy: 1625, 309 + xy: 1973, 591 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5732,42 +5851,42 @@ ore-scrap-snow-icon-large index: -1 ore-scrap-snow-icon-small rotate: false - xy: 1863, 113 + xy: 1417, 51 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-scrap-snow1 rotate: false - xy: 1659, 343 + xy: 1939, 557 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-snow2 rotate: false - xy: 1523, 173 + xy: 1973, 557 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-snow3 rotate: false - xy: 1557, 207 + xy: 2007, 761 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-snow-icon-full rotate: false - xy: 1557, 207 + xy: 2007, 761 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-snow-icon-medium rotate: false - xy: 1557, 207 + xy: 2007, 761 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5781,7 +5900,7 @@ ore-scrap-stained-stone-icon-large index: -1 ore-scrap-stained-stone-icon-small rotate: false - xy: 1889, 139 + xy: 1417, 25 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5795,77 +5914,77 @@ ore-scrap-stained-stone-red-icon-large index: -1 ore-scrap-stained-stone-red-icon-small rotate: false - xy: 1863, 87 + xy: 1443, 51 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-scrap-stained-stone-red1 rotate: false - xy: 1523, 139 + xy: 2007, 625 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-stained-stone-red2 rotate: false - xy: 1557, 173 + xy: 2007, 591 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-stained-stone-red3 rotate: false - xy: 1591, 207 + xy: 2007, 557 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-stained-stone-red-icon-full rotate: false - xy: 1591, 207 + xy: 2007, 557 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-stained-stone-red-icon-medium rotate: false - xy: 1591, 207 + xy: 2007, 557 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-stained-stone1 rotate: false - xy: 1591, 241 + xy: 2007, 727 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-stained-stone2 rotate: false - xy: 1625, 275 + xy: 2007, 693 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-stained-stone3 rotate: false - xy: 1659, 309 + xy: 2007, 659 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-stained-stone-icon-full rotate: false - xy: 1659, 309 + xy: 2007, 659 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-stained-stone-icon-medium rotate: false - xy: 1659, 309 + xy: 2007, 659 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5879,42 +5998,42 @@ ore-scrap-stone-icon-large index: -1 ore-scrap-stone-icon-small rotate: false - xy: 1889, 113 + xy: 1443, 25 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-scrap-stone1 rotate: false - xy: 1625, 241 + xy: 1863, 523 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-stone2 rotate: false - xy: 1659, 275 + xy: 1897, 523 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-stone3 rotate: false - xy: 1523, 105 + xy: 1931, 523 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-stone-icon-full rotate: false - xy: 1523, 105 + xy: 1931, 523 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-stone-icon-medium rotate: false - xy: 1523, 105 + xy: 1931, 523 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5928,42 +6047,42 @@ ore-thorium-holostone-icon-large index: -1 ore-thorium-holostone-icon-small rotate: false - xy: 1863, 61 + xy: 1701, 254 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-thorium-holostone1 rotate: false - xy: 1557, 139 + xy: 1965, 523 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-holostone2 rotate: false - xy: 1591, 173 + xy: 1999, 523 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-holostone3 rotate: false - xy: 1625, 207 + xy: 1865, 489 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-holostone-icon-full rotate: false - xy: 1625, 207 + xy: 1865, 489 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-holostone-icon-medium rotate: false - xy: 1625, 207 + xy: 1865, 489 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5977,42 +6096,42 @@ ore-thorium-sand-icon-large index: -1 ore-thorium-sand-icon-small rotate: false - xy: 1889, 87 + xy: 1697, 228 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-thorium-sand1 rotate: false - xy: 1659, 241 + xy: 1865, 455 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-sand2 rotate: false - xy: 1523, 71 + xy: 1899, 489 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-sand3 rotate: false - xy: 1557, 105 + xy: 1899, 455 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-sand-icon-full rotate: false - xy: 1557, 105 + xy: 1899, 455 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-sand-icon-medium rotate: false - xy: 1557, 105 + xy: 1899, 455 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6026,7 +6145,7 @@ ore-thorium-stained-stone-icon-large index: -1 ore-thorium-stained-stone-icon-small rotate: false - xy: 1863, 35 + xy: 1697, 202 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6040,77 +6159,77 @@ ore-thorium-stained-stone-red-icon-large index: -1 ore-thorium-stained-stone-red-icon-small rotate: false - xy: 1889, 61 + xy: 1697, 176 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-thorium-stained-stone-red1 rotate: false - xy: 1557, 71 + xy: 1967, 455 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-stained-stone-red2 rotate: false - xy: 1591, 105 + xy: 2001, 489 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-stained-stone-red3 rotate: false - xy: 1625, 139 + xy: 2001, 455 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-stained-stone-red-icon-full rotate: false - xy: 1625, 139 + xy: 2001, 455 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-stained-stone-red-icon-medium rotate: false - xy: 1625, 139 + xy: 2001, 455 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-stained-stone1 rotate: false - xy: 1591, 139 + xy: 1933, 489 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-stained-stone2 rotate: false - xy: 1625, 173 + xy: 1933, 455 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-stained-stone3 rotate: false - xy: 1659, 207 + xy: 1967, 489 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-stained-stone-icon-full rotate: false - xy: 1659, 207 + xy: 1967, 489 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-stained-stone-icon-medium rotate: false - xy: 1659, 207 + xy: 1967, 489 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6124,42 +6243,42 @@ ore-thorium-stone-icon-large index: -1 ore-thorium-stone-icon-small rotate: false - xy: 1889, 35 + xy: 1727, 251 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-thorium-stone1 rotate: false - xy: 1659, 173 + xy: 1893, 421 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-stone2 rotate: false - xy: 1591, 71 + xy: 1893, 387 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-stone3 rotate: false - xy: 1625, 105 + xy: 1927, 421 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-stone-icon-full rotate: false - xy: 1625, 105 + xy: 1927, 421 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-stone-icon-medium rotate: false - xy: 1625, 105 + xy: 1927, 421 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6173,42 +6292,42 @@ ore-titanium-holostone-icon-large index: -1 ore-titanium-holostone-icon-small rotate: false - xy: 1863, 9 + xy: 1753, 251 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-titanium-holostone1 rotate: false - xy: 1659, 139 + xy: 1927, 387 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-holostone2 rotate: false - xy: 1625, 71 + xy: 1961, 421 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-holostone3 rotate: false - xy: 1659, 105 + xy: 1961, 387 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-holostone-icon-full rotate: false - xy: 1659, 105 + xy: 1961, 387 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-holostone-icon-medium rotate: false - xy: 1659, 105 + xy: 1961, 387 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6222,42 +6341,42 @@ ore-titanium-sand-icon-large index: -1 ore-titanium-sand-icon-small rotate: false - xy: 1889, 9 + xy: 1779, 251 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-titanium-sand1 rotate: false - xy: 1659, 71 + xy: 1995, 421 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-sand2 rotate: false - xy: 1523, 37 + xy: 1995, 387 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-sand3 rotate: false - xy: 1557, 37 + xy: 1893, 353 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-sand-icon-full rotate: false - xy: 1557, 37 + xy: 1893, 353 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-sand-icon-medium rotate: false - xy: 1557, 37 + xy: 1893, 353 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6271,7 +6390,7 @@ ore-titanium-stained-stone-icon-large index: -1 ore-titanium-stained-stone-icon-small rotate: false - xy: 1929, 453 + xy: 1723, 225 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6285,77 +6404,77 @@ ore-titanium-stained-stone-red-icon-large index: -1 ore-titanium-stained-stone-red-icon-small rotate: false - xy: 1929, 427 + xy: 1723, 199 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-titanium-stained-stone-red1 rotate: false - xy: 1489, 19 + xy: 579, 139 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-stained-stone-red2 rotate: false - xy: 1523, 3 + xy: 613, 139 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-stained-stone-red3 rotate: false - xy: 1557, 3 + xy: 647, 139 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-stained-stone-red-icon-full rotate: false - xy: 1557, 3 + xy: 647, 139 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-stained-stone-red-icon-medium rotate: false - xy: 1557, 3 + xy: 647, 139 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-stained-stone1 rotate: false - xy: 1591, 37 + xy: 1927, 353 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-stained-stone2 rotate: false - xy: 1625, 37 + xy: 1961, 353 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-stained-stone3 rotate: false - xy: 1659, 37 + xy: 1995, 353 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-stained-stone-icon-full rotate: false - xy: 1659, 37 + xy: 1995, 353 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-stained-stone-icon-medium rotate: false - xy: 1659, 37 + xy: 1995, 353 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6369,42 +6488,42 @@ ore-titanium-stone-icon-large index: -1 ore-titanium-stone-icon-small rotate: false - xy: 1915, 399 + xy: 1749, 225 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-titanium-stone1 rotate: false - xy: 1591, 3 + xy: 681, 139 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-stone2 rotate: false - xy: 1625, 3 + xy: 589, 105 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-stone3 rotate: false - xy: 1659, 3 + xy: 623, 105 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-stone-icon-full rotate: false - xy: 1659, 3 + xy: 623, 105 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-stone-icon-medium rotate: false - xy: 1659, 3 + xy: 623, 105 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6418,14 +6537,14 @@ overdrive-projector-icon-large index: -1 overdrive-projector-icon-medium rotate: false - xy: 1693, 411 + xy: 589, 71 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 overdrive-projector-icon-small rotate: false - xy: 1915, 373 + xy: 1749, 199 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6439,7 +6558,7 @@ overflow-gate-icon-large index: -1 overflow-gate-icon-small rotate: false - xy: 1915, 347 + xy: 1775, 225 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6460,14 +6579,14 @@ phantom-factory-icon-large index: -1 phantom-factory-icon-medium rotate: false - xy: 1693, 343 + xy: 589, 37 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phantom-factory-icon-small rotate: false - xy: 1915, 321 + xy: 1775, 199 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6481,7 +6600,7 @@ phase-conduit-icon-large index: -1 phase-conduit-icon-small rotate: false - xy: 1915, 295 + xy: 1723, 173 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6495,7 +6614,7 @@ phase-conveyor-icon-large index: -1 phase-conveyor-icon-small rotate: false - xy: 1915, 269 + xy: 1749, 173 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6509,7 +6628,7 @@ phase-wall-icon-large index: -1 phase-wall-icon-small rotate: false - xy: 1915, 243 + xy: 1775, 173 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6523,14 +6642,14 @@ phase-wall-large-icon-large index: -1 phase-wall-large-icon-medium rotate: false - xy: 1693, 3 + xy: 657, 3 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-wall-large-icon-small rotate: false - xy: 1915, 217 + xy: 1697, 150 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6551,14 +6670,14 @@ phase-weaver-icon-large index: -1 phase-weaver-icon-medium rotate: false - xy: 1727, 407 + xy: 691, 3 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-weaver-icon-small rotate: false - xy: 1915, 191 + xy: 1723, 147 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6572,7 +6691,7 @@ pine-icon-large index: -1 pine-icon-small rotate: false - xy: 1915, 165 + xy: 1749, 147 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6586,14 +6705,14 @@ plastanium-compressor-icon-large index: -1 plastanium-compressor-icon-medium rotate: false - xy: 1727, 339 + xy: 759, 109 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-compressor-icon-small rotate: false - xy: 1915, 139 + xy: 1775, 147 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6614,14 +6733,14 @@ pneumatic-drill-icon-large index: -1 pneumatic-drill-icon-medium rotate: false - xy: 1727, 305 + xy: 725, 75 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pneumatic-drill-icon-small rotate: false - xy: 1915, 113 + xy: 1805, 233 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6635,7 +6754,7 @@ power-node-icon-large index: -1 power-node-icon-small rotate: false - xy: 1915, 87 + xy: 1831, 233 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6649,14 +6768,14 @@ power-node-large-icon-large index: -1 power-node-large-icon-medium rotate: false - xy: 1727, 237 + xy: 725, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 power-node-large-icon-small rotate: false - xy: 1915, 61 + xy: 1857, 233 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6670,7 +6789,7 @@ power-source-icon-large index: -1 power-source-icon-small rotate: false - xy: 1915, 35 + xy: 1801, 207 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6684,14 +6803,14 @@ power-void-icon-large index: -1 power-void-icon-small rotate: false - xy: 1915, 9 + xy: 1801, 181 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 pulse-conduit-icon-full rotate: false - xy: 1727, 67 + xy: 793, 75 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6705,14 +6824,14 @@ pulse-conduit-icon-large index: -1 pulse-conduit-icon-small rotate: false - xy: 1955, 439 + xy: 1827, 207 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 pulverizer-icon-full rotate: false - xy: 1761, 152 + xy: 861, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6726,7 +6845,7 @@ pulverizer-icon-large index: -1 pulverizer-icon-small rotate: false - xy: 1941, 401 + xy: 1801, 155 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6740,42 +6859,14 @@ pyratite-mixer-icon-large index: -1 pyratite-mixer-icon-medium rotate: false - xy: 1761, 84 + xy: 895, 109 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pyratite-mixer-icon-small rotate: false - xy: 1941, 375 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -repair-point - rotate: false - xy: 1761, 50 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -repair-point-icon-full - rotate: false - xy: 1795, 389 - 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: 1941, 349 + xy: 1827, 181 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6789,21 +6880,21 @@ revenant-factory-icon-full index: -1 revenant-factory-icon-large rotate: false - xy: 1737, 741 + xy: 1725, 791 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 revenant-factory-icon-medium rotate: false - xy: 1795, 355 + xy: 895, 7 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 revenant-factory-icon-small rotate: false - xy: 1941, 323 + xy: 1853, 207 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6824,91 +6915,91 @@ ripple-icon-full index: -1 ripple-icon-large rotate: false - xy: 1737, 641 + xy: 1737, 691 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ripple-icon-medium rotate: false - xy: 1795, 321 + xy: 1249, 443 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ripple-icon-small rotate: false - xy: 1941, 297 + xy: 1827, 155 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 rocks-icon-large rotate: false - xy: 1787, 741 + xy: 1775, 791 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 rocks-icon-small rotate: false - xy: 1941, 271 + xy: 1853, 181 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 rotary-pump-icon-large rotate: false - xy: 1787, 691 + xy: 1787, 741 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 rotary-pump-icon-medium rotate: false - xy: 1795, 219 + xy: 1249, 409 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rotary-pump-icon-small rotate: false - xy: 1941, 245 + xy: 1853, 155 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 router-icon-large rotate: false - xy: 1787, 641 + xy: 1787, 691 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 router-icon-small rotate: false - xy: 1941, 219 + xy: 1801, 129 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 rtg-generator-icon-large rotate: false - xy: 1787, 591 + xy: 1787, 641 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 rtg-generator-icon-medium rotate: false - xy: 1795, 151 + xy: 1317, 409 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rtg-generator-icon-small rotate: false - xy: 1941, 193 + xy: 1827, 129 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6929,21 +7020,21 @@ salvo-icon-full index: -1 salvo-icon-large rotate: false - xy: 1737, 541 + xy: 1787, 591 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 salvo-icon-medium rotate: false - xy: 1795, 83 + xy: 1313, 375 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 salvo-icon-small rotate: false - xy: 1941, 167 + xy: 1853, 129 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6957,14 +7048,14 @@ sand-edge index: -1 sand-icon-large rotate: false - xy: 1787, 541 + xy: 1737, 541 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 sand-icon-small rotate: false - xy: 1941, 141 + xy: 1883, 215 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6978,147 +7069,147 @@ sand-water-edge index: -1 sand-water-icon-large rotate: false - xy: 1766, 1123 + xy: 1787, 541 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 sand-water-icon-small rotate: false - xy: 1941, 115 + xy: 1909, 215 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 scrap-wall-gigantic-icon-large rotate: false - xy: 1816, 1123 + xy: 1766, 1123 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 scrap-wall-gigantic-icon-medium rotate: false - xy: 1829, 83 + xy: 1357, 137 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall-gigantic-icon-small rotate: false - xy: 1941, 89 + xy: 1935, 215 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 scrap-wall-huge-icon-large rotate: false - xy: 1866, 1123 + xy: 1816, 1123 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 scrap-wall-huge-icon-medium rotate: false - xy: 1829, 49 + xy: 1357, 103 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall-huge-icon-small rotate: false - xy: 1941, 63 + xy: 1961, 215 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 scrap-wall-icon-large rotate: false - xy: 1916, 1151 + xy: 1866, 1123 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 scrap-wall-icon-small rotate: false - xy: 1941, 37 + xy: 1987, 215 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 scrap-wall-large-icon-large rotate: false - xy: 1966, 1151 + xy: 1916, 1151 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 scrap-wall-large-icon-medium rotate: false - xy: 1829, 15 + xy: 1395, 307 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall-large-icon-small rotate: false - xy: 1941, 11 + xy: 2013, 215 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 separator-icon-large rotate: false - xy: 1916, 1101 + xy: 1966, 1151 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 separator-icon-medium rotate: false - xy: 1699, 1097 + xy: 1391, 239 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 separator-icon-small rotate: false - xy: 1967, 334 + xy: 1905, 189 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 shock-mine-icon-large rotate: false - xy: 1966, 1101 + xy: 1916, 1101 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 shock-mine-icon-small rotate: false - xy: 1967, 308 + xy: 1905, 163 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 silicon-smelter-icon-large rotate: false - xy: 879, 621 + xy: 879, 671 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 silicon-smelter-icon-medium rotate: false - xy: 1699, 995 + xy: 1391, 137 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 silicon-smelter-icon-small rotate: false - xy: 1967, 282 + xy: 1931, 189 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7132,91 +7223,91 @@ snow-edge index: -1 snow-icon-large rotate: false - xy: 929, 671 + xy: 879, 621 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 snow-icon-small rotate: false - xy: 1967, 256 + xy: 1905, 137 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 snowrocks-icon-large rotate: false - xy: 879, 571 + xy: 929, 671 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 snowrocks-icon-small rotate: false - xy: 1967, 230 + xy: 1931, 163 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 solar-panel-icon-large rotate: false - xy: 929, 621 + xy: 879, 571 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 solar-panel-icon-small rotate: false - xy: 1967, 204 + xy: 1957, 189 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 solar-panel-large-icon-large rotate: false - xy: 929, 571 + xy: 929, 621 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 solar-panel-large-icon-medium rotate: false - xy: 1801, 1055 + xy: 1385, 425 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 solar-panel-large-icon-small rotate: false - xy: 1967, 178 + xy: 1931, 137 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 sorter-icon-large rotate: false - xy: 979, 656 + xy: 929, 571 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 sorter-icon-small rotate: false - xy: 1967, 152 + xy: 1957, 163 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 spawn-icon-large rotate: false - xy: 1029, 656 + xy: 979, 656 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 spawn-icon-small rotate: false - xy: 1967, 126 + xy: 1983, 189 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7237,21 +7328,21 @@ spectre-icon-full index: -1 spectre-icon-large rotate: false - xy: 979, 606 + xy: 1029, 656 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 spectre-icon-medium rotate: false - xy: 1801, 1021 + xy: 1483, 393 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spectre-icon-small rotate: false - xy: 1967, 100 + xy: 1957, 137 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7265,98 +7356,98 @@ spirit-factory-icon-full index: -1 spirit-factory-icon-large rotate: false - xy: 1029, 606 + xy: 1079, 656 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 spirit-factory-icon-medium rotate: false - xy: 1869, 1055 + xy: 1407, 357 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spirit-factory-icon-small rotate: false - xy: 1967, 74 + xy: 1983, 163 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 spore-cluster-icon-large rotate: false - xy: 1129, 656 + xy: 1029, 606 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 spore-cluster-icon-medium rotate: false - xy: 1835, 1021 + xy: 1517, 377 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spore-cluster-icon-small rotate: false - xy: 1967, 48 + xy: 2009, 189 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 stained-boulder-icon-large rotate: false - xy: 1079, 606 + xy: 1129, 656 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 stained-boulder-icon-small rotate: false - xy: 1967, 22 + xy: 1983, 137 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 stained-rocks-icon-large rotate: false - xy: 1129, 606 + xy: 1079, 606 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 stained-rocks-icon-small rotate: false - xy: 1993, 431 + xy: 2009, 163 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 stained-rocks-red-icon-large rotate: false - xy: 1179, 614 + xy: 1129, 606 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 stained-rocks-red-icon-small rotate: false - xy: 1993, 405 + xy: 2009, 137 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 stained-rocks-yellow-icon-large rotate: false - xy: 1229, 614 + xy: 1179, 614 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 stained-rocks-yellow-icon-small rotate: false - xy: 2019, 431 + xy: 1879, 110 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7370,14 +7461,14 @@ stained-stone-edge index: -1 stained-stone-icon-large rotate: false - xy: 1279, 611 + xy: 1229, 614 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 stained-stone-icon-small rotate: false - xy: 1993, 379 + xy: 1905, 111 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7391,14 +7482,14 @@ stained-stone-red-edge index: -1 stained-stone-red-icon-large rotate: false - xy: 1329, 611 + xy: 1279, 611 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 stained-stone-red-icon-small rotate: false - xy: 2019, 405 + xy: 1931, 111 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7412,14 +7503,14 @@ stained-stone-yellow-edge index: -1 stained-stone-yellow-icon-large rotate: false - xy: 979, 556 + xy: 1329, 611 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 stained-stone-yellow-icon-small rotate: false - xy: 1993, 353 + xy: 1957, 111 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7433,70 +7524,70 @@ stone-edge index: -1 stone-icon-large rotate: false - xy: 1029, 556 + xy: 979, 556 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 stone-icon-small rotate: false - xy: 2019, 379 + xy: 1983, 111 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 surge-tower-icon-large rotate: false - xy: 1079, 556 + xy: 1029, 556 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 surge-tower-icon-medium rotate: false - xy: 1809, 953 + xy: 1459, 255 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 surge-tower-icon-small rotate: false - xy: 1993, 327 + xy: 2009, 111 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 surge-wall-icon-large rotate: false - xy: 1129, 556 + xy: 1079, 556 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 surge-wall-icon-small rotate: false - xy: 2019, 353 + xy: 1715, 121 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 surge-wall-large-icon-large rotate: false - xy: 1179, 564 + xy: 1129, 556 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 surge-wall-large-icon-medium rotate: false - xy: 1843, 953 + xy: 1459, 187 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 surge-wall-large-icon-small rotate: false - xy: 1993, 301 + xy: 1741, 121 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7517,21 +7608,21 @@ swarmer-icon-full index: -1 swarmer-icon-large rotate: false - xy: 1279, 561 + xy: 1229, 564 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 swarmer-icon-medium rotate: false - xy: 1809, 919 + xy: 1459, 153 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 swarmer-icon-small rotate: false - xy: 2019, 327 + xy: 1767, 121 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7545,154 +7636,154 @@ tar-edge index: -1 tar-icon-large rotate: false - xy: 1329, 561 + xy: 1279, 561 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 tar-icon-small rotate: false - xy: 1993, 275 + xy: 1727, 95 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 tau-mech-pad-icon-large rotate: false - xy: 913, 521 + xy: 1429, 577 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 tau-mech-pad-icon-medium rotate: false - xy: 1877, 965 + xy: 1459, 85 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 tau-mech-pad-icon-small rotate: false - xy: 2019, 301 + xy: 1753, 95 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 thermal-generator-icon-large rotate: false - xy: 963, 506 + xy: 913, 521 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 thermal-generator-icon-medium rotate: false - xy: 1877, 931 + xy: 1509, 343 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thermal-generator-icon-small rotate: false - xy: 1993, 249 + xy: 1727, 69 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 thermal-pump-icon-large rotate: false - xy: 1013, 506 + xy: 963, 506 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 thermal-pump-icon-medium rotate: false - xy: 1911, 965 + xy: 1543, 343 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thermal-pump-icon-small rotate: false - xy: 2019, 275 + xy: 1753, 69 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 thorium-reactor-icon-large rotate: false - xy: 1063, 506 + xy: 1013, 506 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 thorium-reactor-icon-medium rotate: false - xy: 1979, 965 + xy: 1679, 343 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium-reactor-icon-small rotate: false - xy: 1993, 223 + xy: 1779, 95 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 thorium-wall-icon-large rotate: false - xy: 1113, 506 + xy: 1063, 506 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 thorium-wall-icon-small rotate: false - xy: 2019, 249 + xy: 1779, 69 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 thorium-wall-large-icon-large rotate: false - xy: 1379, 527 + xy: 1113, 506 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 thorium-wall-large-icon-medium rotate: false - xy: 2013, 965 + xy: 1531, 309 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium-wall-large-icon-small rotate: false - xy: 1993, 197 + xy: 1805, 103 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 thruster-icon-large rotate: false - xy: 1429, 527 + xy: 1379, 527 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 thruster-icon-medium rotate: false - xy: 2013, 931 + xy: 1565, 309 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thruster-icon-small rotate: false - xy: 2019, 223 + xy: 1831, 103 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7706,112 +7797,112 @@ titan-factory-icon-full index: -1 titan-factory-icon-large rotate: false - xy: 1479, 545 + xy: 1429, 527 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 titan-factory-icon-medium rotate: false - xy: 1877, 897 + xy: 1599, 309 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titan-factory-icon-small rotate: false - xy: 1993, 171 + xy: 1805, 77 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 titanium-conveyor-icon-large rotate: false - xy: 1529, 529 + xy: 1479, 545 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 titanium-conveyor-icon-small rotate: false - xy: 2019, 197 + xy: 1831, 77 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 titanium-wall-icon-large rotate: false - xy: 1579, 529 + xy: 1529, 529 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 titanium-wall-icon-small rotate: false - xy: 1993, 145 + xy: 1805, 51 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 titanium-wall-large-icon-large rotate: false - xy: 1629, 529 + xy: 1579, 529 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 titanium-wall-large-icon-medium rotate: false - xy: 1837, 761 + xy: 1561, 139 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-wall-large-icon-small rotate: false - xy: 2019, 171 + xy: 1831, 51 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 trident-ship-pad-icon-large rotate: false - xy: 1679, 529 + xy: 1629, 529 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 trident-ship-pad-icon-medium rotate: false - xy: 1871, 761 + xy: 1629, 207 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 trident-ship-pad-icon-small rotate: false - xy: 1993, 119 + xy: 1857, 84 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 turbine-generator-icon-large rotate: false - xy: 1479, 495 + xy: 1679, 529 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 turbine-generator-icon-medium rotate: false - xy: 1837, 693 + xy: 1663, 241 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 turbine-generator-icon-small rotate: false - xy: 2019, 145 + xy: 1857, 58 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7825,14 +7916,14 @@ unit-icon-chaos-array index: -1 unit-icon-crawler rotate: false - xy: 1529, 479 + xy: 1479, 495 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-icon-dagger rotate: false - xy: 1579, 479 + xy: 1529, 479 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -7867,35 +7958,35 @@ unit-icon-titan index: -1 unloader-icon-large rotate: false - xy: 1629, 479 + xy: 1579, 479 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unloader-icon-small rotate: false - xy: 1993, 93 + xy: 1883, 84 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 vault-icon-large rotate: false - xy: 1679, 479 + xy: 1629, 479 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 vault-icon-medium rotate: false - xy: 1905, 761 + xy: 1595, 139 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 vault-icon-small rotate: false - xy: 2019, 119 + xy: 1883, 58 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7916,35 +8007,35 @@ water-extractor-icon-full index: -1 water-extractor-icon-large rotate: false - xy: 1729, 491 + xy: 1679, 479 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 water-extractor-icon-medium rotate: false - xy: 1871, 693 + xy: 1663, 207 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 water-extractor-icon-small rotate: false - xy: 1993, 67 + xy: 1909, 85 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 water-icon-large rotate: false - xy: 1779, 491 + xy: 1729, 491 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 water-icon-small rotate: false - xy: 2019, 93 + xy: 1909, 59 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7965,63 +8056,63 @@ wave-icon-full index: -1 wave-icon-large rotate: false - xy: 1163, 506 + xy: 1779, 491 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 wave-icon-medium rotate: false - xy: 1905, 727 + xy: 1595, 105 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 wave-icon-small rotate: false - xy: 1993, 41 + xy: 1935, 85 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 white-tree-dead-icon-large rotate: false - xy: 1213, 514 + xy: 1163, 506 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 white-tree-dead-icon-medium rotate: false - xy: 1939, 761 + xy: 1629, 139 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 white-tree-dead-icon-small rotate: false - xy: 2019, 67 + xy: 1935, 59 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 white-tree-icon-large rotate: false - xy: 1263, 511 + xy: 1213, 514 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 white-tree-icon-medium rotate: false - xy: 1837, 625 + xy: 1663, 173 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 white-tree-icon-small rotate: false - xy: 2019, 41 + xy: 1961, 85 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -8035,161 +8126,161 @@ wraith-factory-icon-full index: -1 wraith-factory-icon-large rotate: false - xy: 1729, 441 + xy: 1313, 511 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 wraith-factory-icon-medium rotate: false - xy: 1871, 659 + xy: 1629, 105 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 wraith-factory-icon-small rotate: false - xy: 1993, 15 + xy: 1961, 59 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-biomatter rotate: false - xy: 1183, 106 + xy: 1723, 389 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-blast-compound rotate: false - xy: 1217, 106 + xy: 1757, 389 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-coal rotate: false - xy: 1251, 103 + xy: 1791, 389 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-copper rotate: false - xy: 1285, 103 + xy: 1825, 371 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-graphite rotate: false - xy: 1319, 103 + xy: 1859, 371 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-lead rotate: false - xy: 1829, 507 + xy: 1733, 1089 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-metaglass rotate: false - xy: 1356, 477 + xy: 1767, 1089 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-phase-fabric rotate: false - xy: 1353, 443 + xy: 1733, 1055 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-plastanium rotate: false - xy: 1353, 409 + xy: 1801, 1089 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-pyratite rotate: false - xy: 1353, 375 + xy: 1767, 1055 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-sand rotate: false - xy: 1353, 341 + xy: 1733, 1021 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-scrap rotate: false - xy: 1353, 307 + xy: 1835, 1089 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-silicon rotate: false - xy: 1353, 273 + xy: 1801, 1055 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-surge-alloy rotate: false - xy: 1353, 205 + xy: 1869, 1089 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-thorium rotate: false - xy: 1353, 171 + xy: 1835, 1055 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-titanium rotate: false - xy: 1353, 137 + xy: 1801, 1021 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-cryofluid rotate: false - xy: 1421, 357 + xy: 1971, 999 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-oil rotate: false - xy: 1421, 323 + xy: 2005, 1033 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-slag rotate: false - xy: 1387, 187 + xy: 1741, 919 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-water rotate: false - xy: 1421, 187 + xy: 1843, 987 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -8315,14 +8406,14 @@ tau-mech index: -1 tau-mech-base rotate: false - xy: 1379, 577 + xy: 1329, 561 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 tau-mech-leg rotate: false - xy: 1429, 577 + xy: 1379, 577 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -8364,7 +8455,7 @@ trident-ship index: -1 blank rotate: false - xy: 1251, 477 + xy: 1727, 277 size: 1, 1 orig: 1, 1 offset: 0, 0 @@ -8392,7 +8483,7 @@ shape-3 index: -1 bar rotate: false - xy: 1936, 689 + xy: 2016, 1125 size: 27, 36 split: 9, 9, 9, 9 orig: 27, 36 @@ -8400,7 +8491,7 @@ bar index: -1 bar-top rotate: false - xy: 1837, 587 + xy: 2016, 1163 size: 27, 36 split: 9, 10, 9, 10 orig: 27, 36 @@ -8496,7 +8587,7 @@ button-right-over index: -1 button-select rotate: false - xy: 1733, 1140 + xy: 1007, 103 size: 24, 24 split: 4, 4, 4, 4 orig: 24, 24 @@ -8511,7 +8602,7 @@ check-off index: -1 check-on rotate: false - xy: 1696, 445 + xy: 1419, 425 size: 28, 32 orig: 28, 32 offset: 0, 0 @@ -8525,7 +8616,7 @@ check-on-over index: -1 check-over rotate: false - xy: 1939, 727 + xy: 1733, 1132 size: 28, 32 orig: 28, 32 offset: 0, 0 @@ -8539,7 +8630,7 @@ clear index: -1 content-background rotate: false - xy: 1337, 1236 + xy: 987, 309 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -8555,7 +8646,7 @@ content-background-locked index: -1 content-background-over rotate: false - xy: 1779, 462 + xy: 945, 267 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -8577,77 +8668,77 @@ discord-banner index: -1 empty-sector rotate: false - xy: 1251, 307 + xy: 1293, 294 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-crafting rotate: false - xy: 661, 103 + xy: 1371, 1139 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-defense rotate: false - xy: 679, 103 + xy: 531, 1543 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-distribution rotate: false - xy: 697, 103 + xy: 845, 987 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-effect rotate: false - xy: 715, 103 + xy: 1882, 1213 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-liquid rotate: false - xy: 1458, 509 + xy: 1857, 111 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-power rotate: false - xy: 723, 155 + xy: 2005, 93 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-production rotate: false - xy: 845, 1525 + xy: 845, 1507 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-turret rotate: false - xy: 775, 1 + xy: 1987, 57 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-units rotate: false - xy: 811, 1 + xy: 1097, 315 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-upgrade rotate: false - xy: 847, 1 + xy: 2023, 75 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -8661,21 +8752,21 @@ controller-cursor index: -1 icon-about rotate: false - xy: 535, 1100 + xy: 1207, 464 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-add rotate: false - xy: 1537, 779 + xy: 535, 1100 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-admin rotate: false - xy: 553, 457 + xy: 1537, 779 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -8689,42 +8780,42 @@ icon-admin-small index: -1 icon-areaDelete rotate: false - xy: 1955, 427 + xy: 1225, 1287 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow rotate: false - xy: 471, 637 + xy: 1351, 459 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-arrow-16 rotate: false - xy: 471, 637 + xy: 1351, 459 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-arrow-down rotate: false - xy: 1225, 1287 + xy: 1683, 829 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-left rotate: false - xy: 1683, 829 + xy: 639, 637 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-right rotate: false - xy: 639, 637 + xy: 567, 145 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -8738,189 +8829,189 @@ icon-arrow-up index: -1 icon-back rotate: false - xy: 489, 637 + xy: 471, 637 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-ban rotate: false - xy: 623, 923 + xy: 553, 457 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-break rotate: false - xy: 589, 103 + xy: 489, 637 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-cancel rotate: false - xy: 607, 103 + xy: 845, 1543 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-cancel-2 rotate: false - xy: 1949, 635 + xy: 1111, 103 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 icon-chat rotate: false - xy: 1929, 491 + xy: 1345, 112 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-check rotate: false - xy: 625, 103 + xy: 1335, 1403 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-check-2 rotate: false - xy: 1949, 609 + xy: 1085, 86 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 icon-copy rotate: false - xy: 643, 103 + xy: 1173, 1102 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-cursor rotate: false - xy: 1929, 479 + xy: 1715, 109 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-dev-builds rotate: false - xy: 1363, 545 + xy: 623, 923 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-discord rotate: false - xy: 1767, 903 + xy: 1363, 545 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-donate rotate: false - xy: 579, 191 + xy: 1837, 541 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-dots rotate: false - xy: 1829, 491 + xy: 1865, 439 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-editor rotate: false - xy: 845, 971 + xy: 579, 191 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-egg rotate: false - xy: 1843, 801 + xy: 1351, 409 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-elevation rotate: false - xy: 845, 1543 + xy: 433, 27 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-eraser rotate: false - xy: 1335, 1403 + xy: 477, 1698 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-exit rotate: false - xy: 997, 146 + xy: 1381, 375 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-file rotate: false - xy: 1173, 1102 + xy: 1877, 1003 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-file-image rotate: false - xy: 1371, 1139 + xy: 1851, 901 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-file-text rotate: false - xy: 535, 1084 + xy: 1407, 341 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-fill rotate: false - xy: 531, 1543 + xy: 1825, 799 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-floppy rotate: false - xy: 1553, 779 + xy: 1429, 273 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-floppy-16 rotate: false - xy: 845, 987 + xy: 2016, 1107 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-folder rotate: false - xy: 569, 457 + xy: 1767, 903 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-folder-parent rotate: false - xy: 623, 907 + xy: 845, 971 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -8934,70 +9025,70 @@ icon-generated index: -1 icon-github rotate: false - xy: 1363, 529 + xy: 1843, 801 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-google-play rotate: false - xy: 579, 175 + xy: 535, 1084 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-grid rotate: false - xy: 433, 27 + xy: 1223, 433 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-hold rotate: false - xy: 1955, 467 + xy: 845, 1071 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-holdDelete rotate: false - xy: 1981, 453 + xy: 845, 1495 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-home rotate: false - xy: 723, 121 + xy: 1553, 779 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-host rotate: false - xy: 451, 1 + xy: 569, 457 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-info rotate: false - xy: 467, 1 + xy: 623, 907 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-itch.io rotate: false - xy: 483, 1 + xy: 1363, 529 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-item rotate: false - xy: 845, 1071 + xy: 1881, 443 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -9011,91 +9102,91 @@ icon-items-none index: -1 icon-line rotate: false - xy: 477, 1698 + xy: 1153, 1168 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-link rotate: false - xy: 499, 1 + xy: 579, 175 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-liquid-small rotate: false - xy: 1882, 1201 + xy: 971, 159 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-load rotate: false - xy: 997, 130 + xy: 1900, 1185 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-load-image rotate: false - xy: 1877, 1003 + xy: 1987, 93 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-load-map rotate: false - xy: 1851, 901 + xy: 845, 1525 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-loading rotate: false - xy: 1825, 799 + xy: 1353, 1403 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-locked rotate: false - xy: 739, 1 + xy: 531, 1525 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-logic rotate: false - xy: 845, 1495 + xy: 1225, 1275 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-map rotate: false - xy: 1363, 513 + xy: 2033, 541 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-menu rotate: false - xy: 1225, 1275 + xy: 1695, 829 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-menu-large rotate: false - xy: 1153, 1168 + xy: 1882, 1195 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-missing rotate: false - xy: 1695, 829 + xy: 651, 637 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -9109,63 +9200,63 @@ icon-mission-background index: -1 icon-mission-battle rotate: false - xy: 651, 637 + xy: 971, 147 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-mission-defense rotate: false - xy: 1981, 441 + xy: 1225, 1263 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-mission-done rotate: false - xy: 1225, 1263 + xy: 1707, 829 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-none rotate: false - xy: 1707, 829 + xy: 663, 637 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-paste rotate: false - xy: 1837, 543 + xy: 433, 9 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-pause rotate: false - xy: 663, 637 + xy: 1497, 347 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-pencil rotate: false - xy: 1882, 1213 + xy: 495, 1698 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-pencil-small rotate: false - xy: 437, 1002 + xy: 2033, 525 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-pick rotate: false - xy: 2019, 23 + xy: 1987, 75 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -9179,14 +9270,14 @@ icon-play index: -1 icon-play-2 rotate: false - xy: 1761, 425 + xy: 451, 1 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-play-custom rotate: false - xy: 1733, 1124 + xy: 467, 1 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -9207,84 +9298,84 @@ icon-power-small index: -1 icon-quit rotate: false - xy: 2032, 2033 + xy: 483, 1 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-redo rotate: false - xy: 1353, 1403 + xy: 531, 1507 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-refresh rotate: false - xy: 453, 1002 + xy: 499, 1 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rename rotate: false - xy: 2032, 2017 + xy: 945, 129 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-resize rotate: false - xy: 531, 1525 + xy: 1882, 1177 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-rotate rotate: false - xy: 469, 1002 + xy: 961, 129 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-arrow rotate: false - xy: 2032, 2001 + xy: 1363, 513 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-left rotate: false - xy: 485, 1002 + xy: 2032, 2033 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-right rotate: false - xy: 2032, 1985 + xy: 1419, 9 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save rotate: false - xy: 501, 1002 + xy: 2032, 2017 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save-image rotate: false - xy: 433, 9 + xy: 2005, 75 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-save-map rotate: false - xy: 495, 1698 + xy: 437, 1000 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -9298,21 +9389,21 @@ icon-settings index: -1 icon-spray rotate: false - xy: 757, 1 + xy: 455, 1000 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-terrain rotate: false - xy: 723, 137 + xy: 473, 1000 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-tools rotate: false - xy: 2032, 1969 + xy: 1435, 9 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -9333,77 +9424,77 @@ icon-touchDelete index: -1 icon-trash rotate: false - xy: 517, 1002 + xy: 2032, 2001 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-trash-16 rotate: false - xy: 845, 1507 + xy: 491, 1000 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-tree rotate: false - xy: 531, 1507 + xy: 509, 1000 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-tree-locked rotate: false - xy: 1285, 137 + xy: 1519, 411 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-trello rotate: false - xy: 2032, 1953 + xy: 1451, 9 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-tutorial rotate: false - xy: 1967, 6 + xy: 2032, 1985 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-undo rotate: false - xy: 793, 1 + xy: 2005, 57 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-unlocked rotate: false - xy: 829, 1 + xy: 2023, 93 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-unlocks rotate: false - xy: 1295, 866 + xy: 2032, 1969 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-wiki rotate: false - xy: 1311, 866 + xy: 2032, 1953 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-zone rotate: false - xy: 1957, 663 + xy: 1079, 60 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -9417,14 +9508,14 @@ icon-zone-locked index: -1 icon-zoom rotate: false - xy: 865, 1 + xy: 2023, 57 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-zoom-small rotate: false - xy: 1749, 1124 + xy: 1694, 134 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -9438,7 +9529,7 @@ info-banner index: -1 inventory rotate: false - xy: 1975, 621 + xy: 1105, 35 size: 24, 40 split: 10, 10, 10, 14 orig: 24, 40 @@ -9453,7 +9544,7 @@ logotext index: -1 pane rotate: false - xy: 1031, 477 + xy: 945, 238 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -9461,7 +9552,7 @@ pane index: -1 pane-2 rotate: false - xy: 993, 477 + xy: 1113, 435 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -9469,7 +9560,7 @@ pane-2 index: -1 scroll rotate: false - xy: 1967, 360 + xy: 1879, 136 size: 24, 35 split: 10, 10, 6, 5 orig: 24, 35 @@ -9477,7 +9568,7 @@ scroll index: -1 scroll-horizontal rotate: false - xy: 1183, 480 + xy: 487, 181 size: 35, 24 split: 6, 5, 10, 10 orig: 35, 24 @@ -9493,7 +9584,7 @@ scroll-knob-horizontal-black index: -1 scroll-knob-vertical-black rotate: false - xy: 1967, 397 + xy: 1879, 173 size: 24, 40 split: 10, 10, 6, 10 orig: 24, 40 @@ -9501,7 +9592,7 @@ scroll-knob-vertical-black index: -1 sector-select rotate: false - xy: 1699, 1131 + xy: 1395, 273 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -9515,7 +9606,7 @@ selection index: -1 slider rotate: false - xy: 1387, 467 + xy: 1763, 1156 size: 1, 8 orig: 1, 8 offset: 0, 0 @@ -9529,14 +9620,14 @@ slider-knob index: -1 slider-knob-down rotate: false - xy: 1905, 687 + xy: 1663, 133 size: 29, 38 orig: 29, 38 offset: 0, 0 index: -1 slider-knob-over rotate: false - xy: 1905, 687 + xy: 1663, 133 size: 29, 38 orig: 29, 38 offset: 0, 0 @@ -9550,7 +9641,7 @@ slider-vertical index: -1 underline rotate: false - xy: 487, 178 + xy: 945, 171 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -9558,7 +9649,7 @@ underline index: -1 underline-2 rotate: false - xy: 1145, 477 + xy: 1151, 435 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -9573,7 +9664,7 @@ white index: -1 window-empty rotate: false - xy: 2016, 1138 + xy: 1701, 280 size: 27, 61 split: 8, 8, 44, 11 orig: 27, 61 @@ -9721,7 +9812,7 @@ revenant index: -1 spirit rotate: false - xy: 1079, 656 + xy: 979, 606 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -9742,7 +9833,7 @@ titan-leg index: -1 wraith rotate: false - xy: 1313, 511 + xy: 1263, 511 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -9840,21 +9931,21 @@ reaper-gun-equip index: -1 revenant-missiles-equip rotate: false - xy: 1737, 691 + xy: 1737, 741 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 shockgun-equip rotate: false - xy: 879, 671 + xy: 1966, 1101 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 swarmer-equip rotate: false - xy: 1229, 564 + xy: 1179, 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 c1a09efe23..1e7dd1e515 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/TileEntity.java b/core/src/io/anuke/mindustry/entities/type/TileEntity.java index 71a095025c..350857ee18 100644 --- a/core/src/io/anuke/mindustry/entities/type/TileEntity.java +++ b/core/src/io/anuke/mindustry/entities/type/TileEntity.java @@ -284,7 +284,7 @@ public class TileEntity extends BaseEntity implements TargetTrait, HealthTrait{ Block previous = tile.block(); tile.block().update(tile); if(tile.block() == previous && cons != null){ - cons.update(this); + cons.update(); } } diff --git a/core/src/io/anuke/mindustry/type/Item.java b/core/src/io/anuke/mindustry/type/Item.java index e061e51caa..f655e65b6e 100644 --- a/core/src/io/anuke/mindustry/type/Item.java +++ b/core/src/io/anuke/mindustry/type/Item.java @@ -106,7 +106,8 @@ public class Item extends UnlockableContent implements Comparable{ public enum Icon{ small(8*2), medium(8*3), - large(8*4); + large(8*4), + xlarge(8*5); public final int size; diff --git a/core/src/io/anuke/mindustry/ui/fragments/BlockInventoryFragment.java b/core/src/io/anuke/mindustry/ui/fragments/BlockInventoryFragment.java index f373097a9b..171ac4c692 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/BlockInventoryFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/BlockInventoryFragment.java @@ -121,7 +121,7 @@ public class BlockInventoryFragment extends Fragment{ int row = 0; table.margin(6f); - table.defaults().size(16 * 2.5f).space(6f); + table.defaults().size(8 * 5).space(6f); if(tile.block().hasItems){ @@ -136,7 +136,7 @@ public class BlockInventoryFragment extends Fragment{ HandCursorListener l = new HandCursorListener(); l.setEnabled(canPick); - ItemImage image = new ItemImage(item.icon(Icon.large), () -> { + ItemImage image = new ItemImage(item.icon(Icon.xlarge), () -> { if(tile == null || tile.entity == null){ return ""; } diff --git a/core/src/io/anuke/mindustry/world/Tile.java b/core/src/io/anuke/mindustry/world/Tile.java index 2f35604c31..6472edd13d 100644 --- a/core/src/io/anuke/mindustry/world/Tile.java +++ b/core/src/io/anuke/mindustry/world/Tile.java @@ -357,7 +357,7 @@ public class Tile implements Position, TargetTrait{ if(block.hasEntity()){ entity = block.newEntity().init(this, block.update); - entity.cons = new ConsumeModule(); + entity.cons = new ConsumeModule(entity); if(block.hasItems) entity.items = new ItemModule(); if(block.hasLiquids) entity.liquids = new LiquidModule(); if(block.hasPower){ diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/Conveyor.java b/core/src/io/anuke/mindustry/world/blocks/distribution/Conveyor.java index 6165cdd92e..69b6d20d7d 100644 --- a/core/src/io/anuke/mindustry/world/blocks/distribution/Conveyor.java +++ b/core/src/io/anuke/mindustry/world/blocks/distribution/Conveyor.java @@ -59,7 +59,7 @@ public class Conveyor extends Block{ @Override public void setStats(){ super.setStats(); - stats.add(BlockStat.itemSpeed, speed * 60, StatUnit.pixelsSecond); + stats.add(BlockStat.itemsMoved, speed * 60, StatUnit.itemsSecond); } @Override diff --git a/core/src/io/anuke/mindustry/world/blocks/production/GenericCrafter.java b/core/src/io/anuke/mindustry/world/blocks/production/GenericCrafter.java index 09ea091647..68b40ea6cc 100644 --- a/core/src/io/anuke/mindustry/world/blocks/production/GenericCrafter.java +++ b/core/src/io/anuke/mindustry/world/blocks/production/GenericCrafter.java @@ -1,16 +1,15 @@ package io.anuke.mindustry.world.blocks.production; -import io.anuke.mindustry.entities.Effects; -import io.anuke.mindustry.entities.Effects.Effect; import io.anuke.arc.graphics.g2d.Draw; import io.anuke.arc.math.Mathf; import io.anuke.arc.util.Time; import io.anuke.mindustry.content.Fx; +import io.anuke.mindustry.entities.Effects; +import io.anuke.mindustry.entities.Effects.Effect; import io.anuke.mindustry.entities.type.TileEntity; import io.anuke.mindustry.type.Item; import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Tile; -import io.anuke.mindustry.world.consumers.ConsumeItem; import io.anuke.mindustry.world.meta.BlockStat; import io.anuke.mindustry.world.meta.StatUnit; @@ -22,6 +21,7 @@ public class GenericCrafter extends Block{ protected final int timerDump = timers++; protected Item output; + protected float craftTime = 80; protected Effect craftEffect = Fx.purify; protected Effect updateEffect = Fx.none; @@ -77,13 +77,9 @@ public class GenericCrafter extends Block{ } if(entity.progress >= 1f){ - - //TODO, bad design, crafter has to know that this consumes items - //there should be a separate trigger in #cons to consume discrete amounts of items - if(consumes.has(ConsumeItem.class)) tile.entity.items.remove(consumes.item(), consumes.itemAmount()); + entity.cons.trigger(); useContent(tile, output); - offloadNear(tile, output); Effects.effect(craftEffect, tile.drawx(), tile.drawy()); entity.progress = 0f; @@ -94,6 +90,11 @@ public class GenericCrafter extends Block{ } } + @Override + public boolean canProduce(Tile tile){ + return super.canProduce(tile); + } + @Override public TileEntity newEntity(){ return new GenericCrafterEntity(); diff --git a/core/src/io/anuke/mindustry/world/blocks/sandbox/LiquidSource.java b/core/src/io/anuke/mindustry/world/blocks/sandbox/LiquidSource.java index 3897e9c33d..641a768148 100644 --- a/core/src/io/anuke/mindustry/world/blocks/sandbox/LiquidSource.java +++ b/core/src/io/anuke/mindustry/world/blocks/sandbox/LiquidSource.java @@ -3,7 +3,6 @@ package io.anuke.mindustry.world.blocks.sandbox; import io.anuke.annotations.Annotations.Loc; import io.anuke.annotations.Annotations.Remote; import io.anuke.arc.collection.Array; -import io.anuke.arc.graphics.Color; import io.anuke.arc.graphics.g2d.Draw; import io.anuke.arc.scene.style.TextureRegionDrawable; import io.anuke.arc.scene.ui.ButtonGroup; @@ -13,9 +12,7 @@ import io.anuke.mindustry.content.Liquids; import io.anuke.mindustry.entities.type.Player; import io.anuke.mindustry.entities.type.TileEntity; import io.anuke.mindustry.gen.Call; -import io.anuke.mindustry.graphics.Pal; import io.anuke.mindustry.type.Liquid; -import io.anuke.mindustry.ui.Bar; import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Tile; @@ -38,11 +35,10 @@ public class LiquidSource extends Block{ } @Override - public void displayBars(Tile tile, Table bars){ - TileEntity entity = tile.entity; + public void setBars(){ + super.setBars(); - bars.add(new Bar("blocks.health", Pal.health, entity::healthf).blink(Color.WHITE)); - bars.row(); + bars.remove("liquid"); } @Override diff --git a/core/src/io/anuke/mindustry/world/consumers/Consume.java b/core/src/io/anuke/mindustry/world/consumers/Consume.java index e52901f7c8..43c5b21866 100644 --- a/core/src/io/anuke/mindustry/world/consumers/Consume.java +++ b/core/src/io/anuke/mindustry/world/consumers/Consume.java @@ -52,6 +52,11 @@ public abstract class Consume{ }).size(10 * scale).get().addListener(new Tooltip<>(t)); } + /**Called when a consumption is triggered manually.*/ + public void trigger(Block block, TileEntity entity){ + + } + public abstract void buildTooltip(Table table); public abstract String getIcon(); diff --git a/core/src/io/anuke/mindustry/world/consumers/ConsumeItem.java b/core/src/io/anuke/mindustry/world/consumers/ConsumeItem.java index 05d4b84a70..88e88e68c0 100644 --- a/core/src/io/anuke/mindustry/world/consumers/ConsumeItem.java +++ b/core/src/io/anuke/mindustry/world/consumers/ConsumeItem.java @@ -31,6 +31,11 @@ public class ConsumeItem extends Consume{ return item; } + @Override + public void trigger(Block block, TileEntity entity){ + entity.items.remove(item, amount); + } + @Override public void buildTooltip(Table table){ table.add(new ItemImage(new ItemStack(item, amount))).size(8 * 4); diff --git a/core/src/io/anuke/mindustry/world/consumers/ConsumeItemFilter.java b/core/src/io/anuke/mindustry/world/consumers/ConsumeItemFilter.java index 994f2543f6..5426510dd8 100644 --- a/core/src/io/anuke/mindustry/world/consumers/ConsumeItemFilter.java +++ b/core/src/io/anuke/mindustry/world/consumers/ConsumeItemFilter.java @@ -46,6 +46,17 @@ public class ConsumeItemFilter extends Consume{ } + @Override + public void trigger(Block block, TileEntity entity){ + for(int i = 0; i < content.items().size; i++){ + Item item = content.item(i); + if(entity.items != null && entity.items.has(item) && this.filter.test(item)){ + entity.items.remove(item, 1); + break; + } + } + } + @Override public boolean valid(Block block, TileEntity entity){ for(int i = 0; i < content.items().size; i++){ diff --git a/core/src/io/anuke/mindustry/world/consumers/ConsumeItems.java b/core/src/io/anuke/mindustry/world/consumers/ConsumeItems.java index 07ccb08278..5c2fb5840c 100644 --- a/core/src/io/anuke/mindustry/world/consumers/ConsumeItems.java +++ b/core/src/io/anuke/mindustry/world/consumers/ConsumeItems.java @@ -37,6 +37,13 @@ public class ConsumeItems extends Consume{ } + @Override + public void trigger(Block block, TileEntity entity){ + for(ItemStack stack : items){ + entity.items.remove(stack); + } + } + @Override public boolean valid(Block block, TileEntity entity){ return entity.items != null && entity.items.has(items); diff --git a/core/src/io/anuke/mindustry/world/consumers/ConsumePower.java b/core/src/io/anuke/mindustry/world/consumers/ConsumePower.java index e215c75f4e..9bc332daa1 100644 --- a/core/src/io/anuke/mindustry/world/consumers/ConsumePower.java +++ b/core/src/io/anuke/mindustry/world/consumers/ConsumePower.java @@ -50,7 +50,7 @@ public class ConsumePower extends Consume{ @Override public void display(BlockStats stats){ if(isBuffered){ - stats.add(BlockStat.powerCapacity, powerCapacity, StatUnit.powerSecond); + stats.add(BlockStat.powerCapacity, powerCapacity, StatUnit.none); }else{ stats.add(BlockStat.powerUse, powerPerTick * 60f, StatUnit.powerSecond); } diff --git a/core/src/io/anuke/mindustry/world/meta/BlockBars.java b/core/src/io/anuke/mindustry/world/meta/BlockBars.java index e0624cf0f8..c47211181f 100644 --- a/core/src/io/anuke/mindustry/world/meta/BlockBars.java +++ b/core/src/io/anuke/mindustry/world/meta/BlockBars.java @@ -13,6 +13,7 @@ public class BlockBars{ } public void remove(String name){ + if(!bars.containsKey(name)) throw new RuntimeException("No bar with name '" + name + "' found; current bars: " + bars.keys().toArray()); bars.remove(name); } diff --git a/core/src/io/anuke/mindustry/world/meta/BlockStat.java b/core/src/io/anuke/mindustry/world/meta/BlockStat.java index a78bcc0166..d34423625c 100644 --- a/core/src/io/anuke/mindustry/world/meta/BlockStat.java +++ b/core/src/io/anuke/mindustry/world/meta/BlockStat.java @@ -12,7 +12,7 @@ public enum BlockStat{ itemCapacity(StatCategory.items), inputItemCapacity(StatCategory.items), outputItemCapacity(StatCategory.items), - itemSpeed(StatCategory.items), + itemsMoved(StatCategory.items), liquidCapacity(StatCategory.liquids), liquidOutput(StatCategory.liquids), diff --git a/core/src/io/anuke/mindustry/world/meta/StatUnit.java b/core/src/io/anuke/mindustry/world/meta/StatUnit.java index 8951339b1c..5dc4e2d2f2 100644 --- a/core/src/io/anuke/mindustry/world/meta/StatUnit.java +++ b/core/src/io/anuke/mindustry/world/meta/StatUnit.java @@ -12,7 +12,6 @@ public enum StatUnit{ powerSecond, liquidSecond, itemsSecond, - pixelsSecond, liquidUnits, powerUnits, degrees, diff --git a/core/src/io/anuke/mindustry/world/modules/ConsumeModule.java b/core/src/io/anuke/mindustry/world/modules/ConsumeModule.java index 027027938c..9643377a7b 100644 --- a/core/src/io/anuke/mindustry/world/modules/ConsumeModule.java +++ b/core/src/io/anuke/mindustry/world/modules/ConsumeModule.java @@ -9,10 +9,13 @@ import java.io.IOException; public class ConsumeModule extends BlockModule{ private boolean valid; - private TileEntity entity; + private final TileEntity entity; - public void update(TileEntity entity){ + public ConsumeModule(TileEntity entity){ this.entity = entity; + } + + public void update(){ boolean prevValid = valid(); valid = true; @@ -27,8 +30,14 @@ public class ConsumeModule extends BlockModule{ } } + public void trigger(){ + for(Consume cons : entity.tile.block().consumes.all()){ + cons.trigger(entity.tile.block(), entity); + } + } + public boolean valid(){ - return valid && (entity == null || entity.tile.block().canProduce(entity.tile)); + return valid && entity.tile.block().canProduce(entity.tile); } @Override diff --git a/core/src/io/anuke/mindustry/world/producers/Produce.java b/core/src/io/anuke/mindustry/world/producers/Produce.java new file mode 100644 index 0000000000..c055f50645 --- /dev/null +++ b/core/src/io/anuke/mindustry/world/producers/Produce.java @@ -0,0 +1,4 @@ +package io.anuke.mindustry.world.producers; + +public class Produce{ +} diff --git a/core/src/io/anuke/mindustry/world/producers/ProduceItem.java b/core/src/io/anuke/mindustry/world/producers/ProduceItem.java new file mode 100644 index 0000000000..f1083e17ed --- /dev/null +++ b/core/src/io/anuke/mindustry/world/producers/ProduceItem.java @@ -0,0 +1,4 @@ +package io.anuke.mindustry.world.producers; + +public class ProduceItem{ +}