Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
90a58388d633d5dbf02ce80f667acba612e24f70
Mindustry/core/assets-raw/sprites/blocks
History
Anuken e6bd259c0e Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/assets/icons/icons.properties
	core/assets/logicids.dat
	core/src/mindustry/ui/dialogs/PlanetDialog.java
	core/src/mindustry/world/blocks/distribution/ItemBridge.java
	core/src/mindustry/world/blocks/liquid/LiquidExtendingBridge.java
	core/src/mindustry/world/blocks/storage/StorageBlock.java
	gradle.properties
2021-08-10 15:15:07 -04:00
..
attack
Unspoiled
2021-06-02 11:15:30 -04:00
campaign
Partial 7.0 merge - API preview
2021-06-02 11:08:08 -04:00
defense
Team-colored force projectors
2021-07-08 12:14:20 -04:00
distribution
Partial 7.0 merge - API preview
2021-06-02 11:08:08 -04:00
drills
Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features
2021-07-23 17:58:02 -04:00
environment
Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features
2021-08-10 15:15:07 -04:00
extra
Bugfixes / Logic category (no icon) / Switch block
2020-08-10 17:09:54 -04:00
fire
Partial 7.0 merge - API preview
2021-06-02 11:08:08 -04:00
liquid
Payload loader/unloader progress
2021-07-22 21:07:36 -04:00
logic
Fixed #2690
2020-09-23 21:46:40 -04:00
payload
Payload loader/unloader progress
2021-07-22 21:07:36 -04:00
power
arc
2020-12-17 10:46:49 -05:00
production
Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features
2021-08-10 15:15:07 -04:00
props
when git add . is too hard
2021-06-21 20:53:08 -04:00
storage
New core landing animation
2021-07-26 19:29:14 -04:00
turrets
More contrast for specific colors
2020-10-01 14:22:48 -04:00
units
Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features
2021-08-10 15:15:07 -04:00
walls
Scrap Walls Textures Cleanup (#4074)
2020-12-22 11:31:24 -05:00