mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-03-06 07:30:35 +07:00
Code Issues Packages Projects Releases Wiki Activity
e6bd259c0e
Mindustry/core/assets-raw/sprites
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
..
blocks Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-08-10 15:15:07 -04:00
editor
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
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 WIP team icons 2021-07-31 18:23:22 -04:00
ui Better sliders 2021-07-12 12:36:45 -04:00
units Partial 7.0 merge - API preview 2021-06-02 11:08:08 -04:00
pack.json Fallback atlas / Bugfixes / Cleanup 2020-06-11 15:25:46 -04:00