Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added new recipes, fixed some bugs, changed names

Browse Source
This commit is contained in:
Anuken
2018-01-08 16:38:03 -05:00
parent 0e82a4491f
commit eba6c9bb8e
11 changed files with 106 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

164
core/assets/sprites/sprites.atlas
View File

@@ -608,14 +608,14 @@ blocks/mortarturret
index: -1
blocks/mossblock
rotate: false
xy: 811, 445
xy: 801, 443
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/mossstone
rotate: false
xy: 811, 445
xy: 801, 443
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -636,7 +636,7 @@ blocks/nuclearreactor-center
index: -1
blocks/nuclearreactor-icon
rotate: false
xy: 821, 445
xy: 811, 445
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -657,7 +657,7 @@ blocks/nuclearreactor-small
index: -1
blocks/oil
rotate: false
xy: 831, 445
xy: 821, 445
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -671,14 +671,14 @@ blocks/oiledge
index: -1
blocks/oilrefinery
rotate: false
xy: 841, 444
xy: 831, 445
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/omnidrill
rotate: false
xy: 851, 443
xy: 841, 444
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -692,77 +692,77 @@ blocks/plasmaturret
index: -1
blocks/playerspawn
rotate: false
xy: 861, 443
xy: 851, 443
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/powerbooster
rotate: false
xy: 871, 445
xy: 861, 443
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/poweredconveyor
rotate: false
xy: 881, 445
xy: 871, 445
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/poweredconveyormove
rotate: false
xy: 891, 445
xy: 881, 445
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/powerlaser
rotate: false
xy: 901, 445
xy: 891, 445
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/powerlasercorner
rotate: false
xy: 911, 445
xy: 901, 445
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/powerlaserrouter
rotate: false
xy: 921, 445
xy: 911, 445
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/pulseconduit
rotate: false
xy: 931, 445
xy: 921, 445
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/pulseconduitbottom
rotate: false
xy: 941, 445
xy: 931, 445
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/pulseconduittop
rotate: false
xy: 951, 445
xy: 941, 445
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/pump
rotate: false
xy: 961, 445
xy: 951, 445
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -776,77 +776,77 @@ blocks/repairturret
index: -1
blocks/rock1
rotate: false
xy: 981, 445
xy: 961, 445
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/rock2
rotate: false
xy: 991, 445
xy: 971, 445
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/router
rotate: false
xy: 1001, 445
xy: 981, 445
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/rtgenerator
rotate: false
xy: 1011, 445
xy: 991, 445
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/rtgenerator-top
rotate: false
xy: 527, 126
xy: 1001, 445
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/sand1
rotate: false
xy: 527, 116
xy: 1011, 445
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/sand2
rotate: false
xy: 524, 106
xy: 527, 126
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/sand3
rotate: false
xy: 736, 381
xy: 527, 116
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/sandblock1
rotate: false
xy: 740, 371
xy: 524, 106
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/sandblock2
rotate: false
xy: 740, 361
xy: 736, 381
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/sandblock3
rotate: false
xy: 740, 351
xy: 740, 371
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -867,7 +867,7 @@ blocks/shadow
index: -1
blocks/shieldgenerator
rotate: false
xy: 740, 331
xy: 740, 351
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -881,28 +881,28 @@ blocks/shotgunturret
index: -1
blocks/shrub
rotate: false
xy: 302, 79
xy: 798, 393
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/shrubshadow
rotate: false
xy: 312, 79
xy: 302, 79
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/smelter
rotate: false
xy: 322, 79
xy: 312, 79
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/smelter-middle
rotate: false
xy: 332, 79
xy: 322, 79
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -916,42 +916,42 @@ blocks/sniperturret
index: -1
blocks/snow1
rotate: false
xy: 342, 79
xy: 332, 79
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/snow2
rotate: false
xy: 352, 79
xy: 342, 79
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/snow3
rotate: false
xy: 362, 83
xy: 352, 79
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/snowblock1
rotate: false
xy: 372, 83
xy: 362, 83
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/snowblock2
rotate: false
xy: 382, 83
xy: 372, 83
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/snowblock3
rotate: false
xy: 392, 83
xy: 382, 83
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -965,28 +965,28 @@ blocks/snowedge
index: -1
blocks/sorter
rotate: false
xy: 402, 83
xy: 392, 83
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/steelconveyor
rotate: false
xy: 412, 83
xy: 402, 83
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/steelconveyormove
rotate: false
xy: 422, 83
xy: 412, 83
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/steelwall
rotate: false
xy: 432, 83
xy: 422, 83
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -1000,56 +1000,56 @@ blocks/steelwall-large
index: -1
blocks/steelwall-large-icon
rotate: false
xy: 442, 83
xy: 432, 83
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/stone1
rotate: false
xy: 452, 83
xy: 442, 83
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/stone2
rotate: false
xy: 462, 83
xy: 452, 83
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/stone3
rotate: false
xy: 472, 83
xy: 462, 83
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/stoneblock1
rotate: false
xy: 482, 76
xy: 472, 83
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/stoneblock2
rotate: false
xy: 492, 72
xy: 482, 76
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/stoneblock3
rotate: false
xy: 502, 72
xy: 492, 72
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/stonedrill
rotate: false
xy: 512, 72
xy: 502, 72
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -1063,35 +1063,35 @@ blocks/stoneedge
index: -1
blocks/stoneformer
rotate: false
xy: 522, 72
xy: 512, 72
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/stonewall
rotate: false
xy: 528, 96
xy: 522, 72
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/teleporter
rotate: false
xy: 534, 106
xy: 528, 96
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/teleporter-top
rotate: false
xy: 538, 96
xy: 534, 106
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/thermalgenerator
rotate: false
xy: 532, 86
xy: 538, 96
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -1112,49 +1112,49 @@ blocks/titancannon-icon
index: -1
blocks/titanium1
rotate: false
xy: 532, 76
xy: 532, 86
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/titanium2
rotate: false
xy: 542, 86
xy: 532, 76
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/titanium3
rotate: false
xy: 542, 76
xy: 542, 86
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/titaniumdrill
rotate: false
xy: 746, 381
xy: 542, 76
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/titaniumpurifier
rotate: false
xy: 750, 371
xy: 746, 381
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/titaniumshieldwall
rotate: false
xy: 750, 361
xy: 750, 371
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/titaniumwall
rotate: false
xy: 750, 351
xy: 750, 361
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -1168,7 +1168,7 @@ blocks/titaniumwall-large
index: -1
blocks/titaniumwall-large-icon
rotate: false
xy: 750, 341
xy: 750, 351
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -1182,28 +1182,28 @@ blocks/turret
index: -1
blocks/uranium1
rotate: false
xy: 740, 311
xy: 750, 321
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/uranium2
rotate: false
xy: 750, 311
xy: 740, 311
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/uranium3
rotate: false
xy: 734, 301
xy: 750, 311
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
blocks/uraniumdrill
rotate: false
xy: 744, 301
xy: 734, 301
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -1595,28 +1595,28 @@ mechs/ship-standard
index: -1
shell
rotate: false
xy: 740, 341
xy: 740, 361
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
shot
rotate: false
xy: 740, 321
xy: 740, 331
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
shot-long
rotate: false
xy: 798, 393
xy: 740, 321
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
titanshell
rotate: false
xy: 750, 331
xy: 750, 341
size: 8, 8
orig: 8, 8
offset: 0, 0
@@ -2404,23 +2404,23 @@ weapons/clustergun
orig: 8, 8
offset: 0, 0
index: -1
weapons/mortar
weapons/shockgun
rotate: false
xy: 801, 443
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
weapons/railgun
rotate: false
xy: 971, 445
xy: 740, 341
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
weapons/triblaster
rotate: false
xy: 750, 321
xy: 750, 331
size: 8, 8
orig: 8, 8
offset: 0, 0
index: -1
weapons/vulcan
rotate: false
xy: 744, 301
size: 8, 8
orig: 8, 8
offset: 0, 0