Anuken 4ce494cc22 Merge remote-tracking branch 'origin/master'		2019-11-19 19:08:52 -05:00
..
ai
content	Add weave layer to phase 〃 icon (#1091)	2019-11-19 08:13:43 -05:00
core	slightly reduced cooldown between votekick (#1056)	2019-11-18 20:08:56 -05:00
ctype
editor	Fixed 'underwater' ores	2019-11-15 21:12:08 -05:00
entities	Added armored conduit / Lighting improvements / Moved liquid package	2019-11-17 13:51:36 -05:00
game	Bugfixes	2019-11-17 11:20:36 -05:00
graphics	Added armored conduit / Lighting improvements / Moved liquid package	2019-11-17 13:51:36 -05:00
input	Merge https://github.com/joshuaptfan/Mindustry	2019-11-18 19:40:45 -05:00
io	Added configurable global server rules	2019-11-16 15:51:35 -05:00
maps	Custom map providers / Added next map specification command	2019-11-18 18:56:49 -05:00
mod	Added armored conduit / Lighting improvements / Moved liquid package	2019-11-17 13:51:36 -05:00
net	Bugfixes	2019-11-17 11:20:36 -05:00
plugin
type	Merge https://github.com/joshuaptfan/Mindustry	2019-11-18 19:40:45 -05:00
ui	Merge https://github.com/joshuaptfan/Mindustry	2019-11-18 19:40:45 -05:00
world	Make offline force projector use no boost (#1092)	2019-11-19 09:03:42 -05:00
ClientLauncher.java	Bugfixes	2019-11-17 11:20:36 -05:00
Vars.java	Hjson unit tests	2019-11-19 19:08:41 -05:00