Merge branch 'resource-rework' of https://github.com/Anuken/Mindustry

Browse Source

...

This commit is contained in:

Anuken

2018-08-20 22:09:57 -04:00

parent a7599e85dc 1cc8cbe8a8

commit dc6f01c0d3

677 changed files with 1221 additions and 1290 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

core/assets-raw/sprites/backgrounds/background.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 59 KiB After Width:  |  Height:  |  Size: 32 KiB

BIN

core/assets-raw/sprites/blocks/distribution/bridge-conveyor-arrow.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 160 B After Width:  |  Height:  |  Size: 83 B

BIN

core/assets-raw/sprites/blocks/distribution/bridge-conveyor-bridge.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 177 B After Width:  |  Height:  |  Size: 93 B

BIN

core/assets-raw/sprites/blocks/distribution/bridge-conveyor-end.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 178 B After Width:  |  Height:  |  Size: 95 B

BIN

core/assets-raw/sprites/blocks/distribution/bridge-conveyor.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 227 B After Width:  |  Height:  |  Size: 119 B

BIN

core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-0-0.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 215 B After Width:  |  Height:  |  Size: 98 B

BIN

core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-0-1.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 215 B After Width:  |  Height:  |  Size: 98 B

BIN

core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-0-2.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 212 B After Width:  |  Height:  |  Size: 98 B

BIN

core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-0-3.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 212 B After Width:  |  Height:  |  Size: 97 B

BIN

core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-1-0.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 231 B After Width:  |  Height:  |  Size: 116 B

BIN

core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-1-1.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 229 B After Width:  |  Height:  |  Size: 117 B

BIN

core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-1-2.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 233 B After Width:  |  Height:  |  Size: 119 B

BIN

core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-1-3.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 238 B After Width:  |  Height:  |  Size: 117 B

BIN

core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-2-0.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 228 B After Width:  |  Height:  |  Size: 113 B

BIN

core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-2-1.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 225 B After Width:  |  Height:  |  Size: 108 B

BIN

core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-2-2.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 217 B After Width:  |  Height:  |  Size: 104 B

BIN

core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-2-3.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 222 B After Width:  |  Height:  |  Size: 106 B

BIN

core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-3-0.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 249 B After Width:  |  Height:  |  Size: 109 B

BIN

core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-3-1.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 247 B After Width:  |  Height:  |  Size: 107 B

BIN

core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-3-2.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 248 B After Width:  |  Height:  |  Size: 110 B

BIN

core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-3-3.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 234 B After Width:  |  Height:  |  Size: 110 B

BIN

core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-4-0.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 233 B After Width:  |  Height:  |  Size: 109 B

BIN

core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-4-1.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 230 B After Width:  |  Height:  |  Size: 108 B

BIN

core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-4-2.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 229 B After Width:  |  Height:  |  Size: 105 B

BIN

core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-4-3.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 232 B After Width:  |  Height:  |  Size: 109 B

BIN

core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-0-0.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 210 B After Width:  |  Height:  |  Size: 105 B

BIN

core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-0-1.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 229 B After Width:  |  Height:  |  Size: 105 B

BIN

core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-0-2.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 228 B After Width:  |  Height:  |  Size: 105 B

BIN

core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-0-3.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 227 B After Width:  |  Height:  |  Size: 104 B

BIN

core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-1-0.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 265 B After Width:  |  Height:  |  Size: 127 B

BIN

core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-1-1.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 248 B After Width:  |  Height:  |  Size: 127 B

BIN

core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-1-2.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 274 B After Width:  |  Height:  |  Size: 133 B

BIN

core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-1-3.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 281 B After Width:  |  Height:  |  Size: 129 B

BIN

core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-2-0.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 246 B After Width:  |  Height:  |  Size: 120 B

BIN

core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-2-1.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 243 B After Width:  |  Height:  |  Size: 114 B

BIN

core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-2-2.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 236 B After Width:  |  Height:  |  Size: 111 B

BIN

core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-2-3.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 247 B After Width:  |  Height:  |  Size: 113 B

BIN

core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-3-0.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 247 B After Width:  |  Height:  |  Size: 109 B

BIN

core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-3-1.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 249 B After Width:  |  Height:  |  Size: 107 B

BIN

core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-3-2.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 249 B After Width:  |  Height:  |  Size: 110 B

BIN

core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-3-3.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 253 B After Width:  |  Height:  |  Size: 110 B

BIN

core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-4-0.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 254 B After Width:  |  Height:  |  Size: 112 B

BIN

core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-4-1.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 260 B After Width:  |  Height:  |  Size: 111 B

BIN

core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-4-2.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 258 B After Width:  |  Height:  |  Size: 110 B

BIN

core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-4-3.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 260 B After Width:  |  Height:  |  Size: 113 B

BIN

core/assets-raw/sprites/blocks/distribution/distributor.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 296 B After Width:  |  Height:  |  Size: 163 B

BIN

core/assets-raw/sprites/blocks/distribution/junction.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 257 B After Width:  |  Height:  |  Size: 112 B

BIN

core/assets-raw/sprites/blocks/distribution/mass-driver-turret.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 789 B After Width:  |  Height:  |  Size: 389 B

BIN

core/assets-raw/sprites/blocks/distribution/mass-driver.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 532 B After Width:  |  Height:  |  Size: 273 B

BIN

core/assets-raw/sprites/blocks/distribution/overflow-gate.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 233 B After Width:  |  Height:  |  Size: 115 B

BIN

core/assets-raw/sprites/blocks/distribution/phase-conveyor-arrow.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 179 B After Width:  |  Height:  |  Size: 83 B

BIN

core/assets-raw/sprites/blocks/distribution/phase-conveyor-bridge.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 189 B After Width:  |  Height:  |  Size: 84 B

BIN

core/assets-raw/sprites/blocks/distribution/phase-conveyor-end.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 172 B After Width:  |  Height:  |  Size: 75 B

BIN

core/assets-raw/sprites/blocks/distribution/phase-conveyor.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 301 B After Width:  |  Height:  |  Size: 132 B

BIN

core/assets-raw/sprites/blocks/distribution/router.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 113 B

BIN

core/assets-raw/sprites/blocks/distribution/sorter.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 248 B After Width:  |  Height:  |  Size: 111 B

BIN

core/assets-raw/sprites/blocks/distribution/splitter.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 226 B

BIN

core/assets-raw/sprites/blocks/distribution/titanium-conveyor.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 210 B

BIN

core/assets-raw/sprites/blocks/distribution/warp-gate-top.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 346 B After Width:  |  Height:  |  Size: 216 B

BIN

core/assets-raw/sprites/blocks/distribution/warp-gate.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 492 B After Width:  |  Height:  |  Size: 271 B

BIN

core/assets-raw/sprites/blocks/drills/blast-drill-rim.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 219 B After Width:  |  Height:  |  Size: 119 B

BIN

core/assets-raw/sprites/blocks/drills/blast-drill-rotator.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 298 B After Width:  |  Height:  |  Size: 168 B

BIN

core/assets-raw/sprites/blocks/drills/blast-drill-top.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 289 B After Width:  |  Height:  |  Size: 155 B

BIN

core/assets-raw/sprites/blocks/drills/blast-drill.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 562 B After Width:  |  Height:  |  Size: 294 B

BIN

core/assets-raw/sprites/blocks/drills/carbide-drill-rotator.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 298 B

BIN

core/assets-raw/sprites/blocks/drills/carbide-drill-top.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 261 B

BIN

core/assets-raw/sprites/blocks/drills/carbide-drill.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 286 B

BIN

core/assets-raw/sprites/blocks/drills/laser-drill-rotator.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 261 B After Width:  |  Height:  |  Size: 136 B

BIN

core/assets-raw/sprites/blocks/drills/laser-drill-top.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 286 B After Width:  |  Height:  |  Size: 144 B

BIN

core/assets-raw/sprites/blocks/drills/laser-drill.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 327 B After Width:  |  Height:  |  Size: 170 B

BIN

core/assets-raw/sprites/blocks/drills/mechanical-drill-rotator.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 230 B

BIN

core/assets-raw/sprites/blocks/drills/mechanical-drill-top.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 221 B

BIN

core/assets-raw/sprites/blocks/drills/mechanical-drill.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 287 B

BIN

core/assets-raw/sprites/blocks/drills/oil-extractor-liquid.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 239 B After Width:  |  Height:  |  Size: 120 B

BIN

core/assets-raw/sprites/blocks/drills/oil-extractor-rotator.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 341 B After Width:  |  Height:  |  Size: 175 B

BIN

core/assets-raw/sprites/blocks/drills/oil-extractor-top.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 379 B After Width:  |  Height:  |  Size: 174 B

BIN

core/assets-raw/sprites/blocks/drills/oil-extractor.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 473 B After Width:  |  Height:  |  Size: 271 B

BIN

core/assets-raw/sprites/blocks/drills/plasma-drill-rim.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 461 B After Width:  |  Height:  |  Size: 253 B

BIN

core/assets-raw/sprites/blocks/drills/plasma-drill-rotator.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 354 B After Width:  |  Height:  |  Size: 206 B

BIN

core/assets-raw/sprites/blocks/drills/plasma-drill-top.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 296 B After Width:  |  Height:  |  Size: 172 B

BIN

core/assets-raw/sprites/blocks/drills/plasma-drill.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 678 B After Width:  |  Height:  |  Size: 362 B

BIN

core/assets-raw/sprites/blocks/drills/pneumatic-drill-rotator.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 147 B

BIN

core/assets-raw/sprites/blocks/drills/pneumatic-drill-top.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 121 B

BIN

core/assets-raw/sprites/blocks/drills/pneumatic-drill.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 157 B

BIN

core/assets-raw/sprites/blocks/drills/tungsten-drill-rotator.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 279 B

BIN

core/assets-raw/sprites/blocks/drills/tungsten-drill-top.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 255 B

BIN

core/assets-raw/sprites/blocks/drills/tungsten-drill.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 274 B

BIN

core/assets-raw/sprites/blocks/drills/water-extractor-liquid.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 192 B After Width:  |  Height:  |  Size: 99 B

BIN

core/assets-raw/sprites/blocks/drills/water-extractor-rotator.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 256 B After Width:  |  Height:  |  Size: 132 B

BIN

core/assets-raw/sprites/blocks/drills/water-extractor-top.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 338 B After Width:  |  Height:  |  Size: 167 B

BIN

core/assets-raw/sprites/blocks/drills/water-extractor.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 298 B After Width:  |  Height:  |  Size: 169 B

BIN

core/assets-raw/sprites/blocks/environment/blackrock1.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 223 B After Width:  |  Height:  |  Size: 128 B

BIN

core/assets-raw/sprites/blocks/environment/blackrockshadow1.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 248 B After Width:  |  Height:  |  Size: 133 B

BIN

core/assets-raw/sprites/blocks/environment/blackstone1.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 186 B After Width:  |  Height:  |  Size: 98 B

BIN

core/assets-raw/sprites/blocks/environment/blackstone2.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 196 B After Width:  |  Height:  |  Size: 101 B

BIN

core/assets-raw/sprites/blocks/environment/blackstone3.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 194 B After Width:  |  Height:  |  Size: 102 B

BIN

core/assets-raw/sprites/blocks/environment/blackstoneedge.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 224 B After Width:  |  Height:  |  Size: 116 B

BIN

core/assets-raw/sprites/blocks/environment/coal1.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 253 B After Width:  |  Height:  |  Size: 133 B

BIN

core/assets-raw/sprites/blocks/environment/coal2.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 261 B After Width:  |  Height:  |  Size: 138 B

BIN

core/assets-raw/sprites/blocks/environment/coal3.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 236 B After Width:  |  Height:  |  Size: 120 B

Some files were not shown because too many files have changed in this diff Show More