Epowerj f6b5962997 Merge branch 'master' of https://github.com/Anuken/Mindustry into maps_phase_2 ...

 Conflicts:

	core/src/mindustry/content/Blocks.java

2022-08-04 14:55:14 -04:00

..

baseparts

Generic node/bridge placement system

2020-12-18 12:41:13 -05:00

bloomshaders

Fixed potential divide-by-zero in bloom shader

2022-05-07 00:34:28 -04:00

bundles

Update bundle_ko.properties (#7285)

2022-08-04 14:06:47 -04:00

cubemaps/stars

Prop cleanup / Optimization of large skybox PNG

2021-07-05 21:18:40 -04:00

cursors

Added target cursor

2022-02-19 08:58:24 -05:00

fonts

Add fixed font.woff

2020-11-22 12:59:42 +02:00

icons

Neoplasia reactor

2022-08-02 21:26:15 -04:00

maps

Progress on marsh

2022-08-04 14:32:05 -04:00

music

fine

2022-04-29 21:44:46 -04:00

scripts

Mod subtitles

2022-04-27 23:14:14 -04:00

shaders

Logic second/minute spent variables

2022-03-13 21:39:35 -04:00

sounds

Chat message sound + minor JSOn fix

2022-05-25 23:15:09 -04:00

sprites

Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features

2021-08-10 15:15:07 -04:00

contributors

Tree-like objective node structure (#7152)

2022-07-15 10:41:18 -04:00

logicids.dat

Neoplasia reactor

2022-08-02 21:26:15 -04:00