Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
ed86f50a2f45c0ba816224f9915bba099ddb04be
Mindustry/core/assets-raw/sprites/blocks
History
Anuken 393d3a19a3 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/assets/icons/icons.properties
	core/src/mindustry/content/Blocks.java
	core/src/mindustry/world/meta/StatValues.java
2021-09-04 23:12:28 -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-09-04 23:12:28 -04:00
extra
why
2021-08-27 21:51:37 -04:00
fire
Partial 7.0 merge - API preview
2021-06-02 11:08:08 -04:00
liquid
Liquid container tweak
2021-08-19 22:26:54 -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
change (#5923)
2021-09-04 10:14:40 -04: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
Turret heat cleanup
2021-08-11 10:31:36 -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