Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
503650654737dfeccc3a91cf66b179370ce89149
Mindustry/core/assets-raw/sprites/blocks/distribution
T
History
Patrick 'Quezler' Mounier e5e4884448 Merge branch 'master' into crater 
# Conflicts:
#	core/assets/sprites/block_colors.png
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/sprites/sprites3.png
#	core/assets/sprites/sprites5.png
#	core/src/mindustry/world/modules/ItemModule.java
2020-03-05 10:00:02 +01:00
..
conveyors
Merge branch 'master' into crater
2020-03-05 10:00:02 +01:00
bridge-arrow.png
Improved battery brightness display / Palette tweak / Diffgen buff
2020-02-11 17:27:33 -05:00
bridge-conveyor-arrow.png
Improved battery brightness display / Palette tweak / Diffgen buff
2020-02-11 17:27:33 -05:00
bridge-conveyor-bridge.png
Merged replacement sprites. Scaling is now disabled by default.
2019-06-04 22:54:01 -04:00
bridge-conveyor-end.png
Improved battery brightness display / Palette tweak / Diffgen buff
2020-02-11 17:27:33 -05:00
bridge-conveyor.png
Improved battery brightness display / Palette tweak / Diffgen buff
2020-02-11 17:27:33 -05:00
center.png
Improved battery brightness display / Palette tweak / Diffgen buff
2020-02-11 17:27:33 -05:00
distributor.png
Improved battery brightness display / Palette tweak / Diffgen buff
2020-02-11 17:27:33 -05:00
inverted-sorter.png
Improved battery brightness display / Palette tweak / Diffgen buff
2020-02-11 17:27:33 -05:00
junction.png
Improved battery brightness display / Palette tweak / Diffgen buff
2020-02-11 17:27:33 -05:00
mass-driver-base.png
Merged replacement sprites. Scaling is now disabled by default.
2019-06-04 22:54:01 -04:00
mass-driver.png
Changed turret outlines / Wall block tweaks
2019-06-06 21:18:54 -04:00
overflow-gate.png
Improved battery brightness display / Palette tweak / Diffgen buff
2020-02-11 17:27:33 -05:00
phase-conveyor-arrow.png
Improved battery brightness display / Palette tweak / Diffgen buff
2020-02-11 17:27:33 -05:00
phase-conveyor-bridge.png
Merged replacement sprites. Scaling is now disabled by default.
2019-06-04 22:54:01 -04:00
phase-conveyor-end.png
Merged replacement sprites. Scaling is now disabled by default.
2019-06-04 22:54:01 -04:00
phase-conveyor.png
Improved battery brightness display / Palette tweak / Diffgen buff
2020-02-11 17:27:33 -05:00
router.png
Improved battery brightness display / Palette tweak / Diffgen buff
2020-02-11 17:27:33 -05:00
sorter.png
Improved battery brightness display / Palette tweak / Diffgen buff
2020-02-11 17:27:33 -05:00
underflow-gate.png
Improved battery brightness display / Palette tweak / Diffgen buff
2020-02-11 17:27:33 -05:00