Commit Graph
28 Commits
Author SHA1 Message Date
Anuken aeae286273 Merge branch '6.0' of https://github.com/Anuken/Mindustry into object-config
# Conflicts:
#	core/src/mindustry/entities/traits/BuilderTrait.java
#	core/src/mindustry/entities/type/TileEntity.java
#	core/src/mindustry/game/EventType.java
#	core/src/mindustry/game/Schematics.java
#	core/src/mindustry/input/InputHandler.java
#	core/src/mindustry/io/TypeIO.java
#	core/src/mindustry/world/Block.java
#	core/src/mindustry/world/blocks/distribution/Sorter.java
2020-03-04 08:38:36 -05:00
Anuken 2581353c5e Merge branch '6.0' of https://github.com/Anuken/Mindustry into object-config
# Conflicts:
#	core/src/mindustry/entities/traits/BuilderTrait.java
#	core/src/mindustry/entities/type/TileEntity.java
#	core/src/mindustry/game/EventType.java
#	core/src/mindustry/game/Schematics.java
#	core/src/mindustry/input/InputHandler.java
#	core/src/mindustry/io/TypeIO.java
#	core/src/mindustry/world/Block.java
#	core/src/mindustry/world/blocks/distribution/Sorter.java
2020-03-03 21:33:03 -05:00
Anuken 04f8282821 Better lighting 2020-02-28 13:44:03 -05:00
Patrick 'Quezler' MounierandGitHub ce1884512d Null the block as well? (#1630) 2020-02-24 11:44:39 -05:00
Anuken cfbe631e66 Merge 2020-02-23 20:14:38 -05:00
Patrick 'Quezler' MounierandGitHub b7a8fa4191 Fix typo in banned comment (#1617) 2020-02-21 13:49:15 -05:00
Anuken a7b39e56bd Cleanup continues 2020-02-04 18:00:32 -05:00
Anuken 67106abb9b Updated arc 2020-02-03 20:30:18 -05:00
Anuken a942ed2cad More cleanup 2020-02-03 20:24:49 -05:00
Vam-JamandGitHub 36782a2454 [Fix] lastMessage doesnt change if prevented by antispam (#1471)
Fixes issue #1470
2020-01-29 11:32:41 -05:00
Anuken e14a36a97e Fixed #1445 2020-01-25 17:50:59 -05:00
Anuken 95352e1729 Added server descriptions 2020-01-18 10:05:18 -05:00
Anuken 4c0302bcb1 Added search command 2020-01-15 09:31:25 -05:00
Anuken ae2dd5732a Objectification 2020-01-14 13:32:19 -05:00
Anuken 68be77fa1d Added configurable block access validation 2020-01-14 10:32:52 -05:00
Anuken 6050274c0f Bugfixes 2020-01-09 14:56:21 -05:00
Anuken e06f514023 Added basic subnet bans 2020-01-09 12:03:45 -05:00
Anuken 6e5d506a35 Stub implementation of action filters 2020-01-08 09:37:18 -05:00
Anuken c183b2dac4 Fixed incorrect variable usage 2020-01-07 15:54:51 -05:00
Anuken 1f3bab5fa3 Added untested rate limits 2020-01-07 14:16:48 -05:00
Anuken 7fa61eaf3b Added server MOTD 2020-01-02 22:09:33 -05:00
Anuken e7d813ab5b Votekick config 2019-12-30 13:03:29 -05:00
Anuken 73461e0364 Added config for showing connect/disconnect messages 2019-12-30 11:36:50 -05:00
Anuken 7543d92473 Added startup commands to server 2019-12-28 18:05:45 -05:00
Anuken d3c559fa00 Moved server run scripts 2019-12-28 17:33:17 -05:00
Anuken e1bf8bdab1 Added BE auto-updater / Server config / Fixed #1266 2019-12-28 16:30:40 -05:00
Anuken d6d6dc29dc More plugin customization / Renamed Rectangle 2019-12-26 22:44:15 -05:00
Anuken 514d4817c8 it is done 2019-12-25 01:39:38 -05:00