mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-24 18:05:33 +07:00
Code Issues Packages Projects Releases Wiki Activity
e5e4884448
Mindustry/core/assets-raw/sprites
History
Patrick 'Quezler' Mounier e5e4884448
Merge branch 'master' into crater 
# Conflicts:
#	core/assets/sprites/block_colors.png
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/sprites/sprites3.png
#	core/assets/sprites/sprites5.png
#	core/src/mindustry/world/modules/ItemModule.java
2020-03-05 10:00:02 +01:00
..
blocks Merge branch 'master' into crater 2020-03-05 10:00:02 +01:00
editor Improved battery brightness display / Palette tweak / Diffgen buff 2020-02-11 17:27:33 -05:00
effects Improved battery brightness display / Palette tweak / Diffgen buff 2020-02-11 17:27:33 -05:00
items Improved battery brightness display / Palette tweak / Diffgen buff 2020-02-11 17:27:33 -05:00
mechs Improved battery brightness display / Palette tweak / Diffgen buff 2020-02-11 17:27:33 -05:00
shapes Improved battery brightness display / Palette tweak / Diffgen buff 2020-02-11 17:27:33 -05:00
ui Merge branch 'master' into crater 2020-03-05 10:00:02 +01:00
units Improved battery brightness display / Palette tweak / Diffgen buff 2020-02-11 17:27:33 -05:00
weapons Improved battery brightness display / Palette tweak / Diffgen buff 2020-02-11 17:27:33 -05:00
zones Improved battery brightness display / Palette tweak / Diffgen buff 2020-02-11 17:27:33 -05:00
pack.json