Mindustry/core/assets
Anuken 385f493f36 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features
 Conflicts:
	core/src/mindustry/content/Blocks.java
	core/src/mindustry/net/CrashSender.java
	core/src/mindustry/ui/Links.java
	core/src/mindustry/ui/dialogs/SchematicsDialog.java
	core/src/mindustry/world/blocks/power/LightBlock.java
	gradle.properties
2021-07-23 17:58:02 -04:00
..
baseparts
bloomshaders Partial 7.0 merge - API preview 2021-06-02 11:08:08 -04:00
bundles Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-07-23 17:58:02 -04:00
cubemaps/stars Prop cleanup / Optimization of large skybox PNG 2021-07-05 21:18:40 -04:00
cursors Cursor antialiasing 2019-08-04 09:41:25 -04:00
fonts
icons Payload loader/unloader progress 2021-07-22 21:07:36 -04:00
maps
music
scripts
shaders Fixed crash caused by invalid NinePatch sprites 2021-07-06 15:23:37 -04:00
sounds Fixed continuous weapon sounds / Improved naval support audio 2021-07-14 18:46:51 -04:00
sprites
contributors Server qol (#5534) 2021-07-04 21:18:41 -04:00
logicids.dat Payload loader/unloader progress 2021-07-22 21:07:36 -04:00