Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
2200a44653684eea5a17c198f60e2b6d094cd740
Mindustry/core/assets-raw/sprites
History
Anuken 2200a44653 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/ui/dialogs/PlanetDialog.java
2021-08-13 10:08:34 -04:00
..
blocks
Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features
2021-08-13 10:08:34 -04:00
editor
Fallback atlas / Bugfixes / Cleanup
2020-06-11 15:25:46 -04:00
effects
Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features
2021-08-10 15:15:07 -04:00
items
Unspoiled
2021-06-02 11:15:30 -04:00
rubble
Fallback atlas / Bugfixes / Cleanup
2020-06-11 15:25:46 -04:00
shapes
Partial 7.0 merge - API preview
2021-06-02 11:08:08 -04:00
statuses
Partial 7.0 merge - API preview
2021-06-02 11:08:08 -04:00
teams
Things
2021-08-11 09:54:30 -04:00
ui
Sector info list / Minor hint fixes
2021-08-12 22:16:13 -04:00
units
Partial 7.0 merge - API preview
2021-06-02 11:08:08 -04:00
pack.json
Sprite packing fix
2021-06-03 11:37:33 -04:00