Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
974ebe6937930a29bb9edfe97dd9b30365d9323a
Mindustry/core/assets-raw/sprites
History
Anuken 974ebe6937 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/content/Blocks.java
2021-06-05 11:57:14 -04:00
..
blocks
Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features
2021-06-05 11:57:14 -04:00
editor
Fallback atlas / Bugfixes / Cleanup
2020-06-11 15:25:46 -04:00
effects
Partial 7.0 merge - API preview
2021-06-02 11:08:08 -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
ui
Logic layout bugfixes
2021-02-09 12:10:15 -05: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