Commit Graph

9142 Commits

Author SHA1 Message Date
d3e26c7c16 Admin chat command 2020-10-20 13:33:28 +03:00
c27251cfb0 Fog 2020-10-19 18:28:37 -04:00
d5fb0e924a Merge remote-tracking branch 'origin/master' 2020-10-19 16:26:03 -04:00
6e8732387b Better weather classes 2020-10-19 16:25:59 -04:00
ef0376371d Merge pull request #3030 from sk7725/patch-21
remove final from item.color (and liquid too)
2020-10-19 12:20:14 -04:00
3c2e12621e rainbow liquid 2020-10-20 01:01:45 +09:00
efb42296cf remove final 2020-10-20 00:57:08 +09:00
cab08de1f7 Merge remote-tracking branch 'origin/master' 2020-10-19 11:34:59 -04:00
2ff749bd17 Unified stat system 2020-10-19 11:34:52 -04:00
073b82b70f Merge pull request #3029 from abomb4/patch-mod-environment
Json in Mod should be able to define OreBlock type
2020-10-19 10:43:53 -04:00
9e79ed8a26 Json in Mod should be able to define OreBlock type
That in mindustry.world.blocks.environment package
2020-10-19 22:34:52 +08:00
59e1fd1eb6 typo 2020-10-19 10:04:30 -04:00
d1d674cfc9 Merge remote-tracking branch 'origin/master' 2020-10-19 10:04:13 -04:00
80f801db36 Fixed #3023 / Fixed #3020 2020-10-19 10:04:10 -04:00
400d36609a Merge pull request #3022 from Ilya246/patch-1
armor defined twice in mega
2020-10-19 09:41:06 -04:00
ad5d3581f6 armor defined twice in mega 2020-10-19 10:09:39 +04:00
7f21d61078 Crash fix 2020-10-18 19:54:52 -04:00
c7622198fd Cleanup 2020-10-18 19:21:59 -04:00
3a52fb2afe Merge branch 'router' 2020-10-18 19:03:13 -04:00
e63bbe6ac9 Merge remote-tracking branch 'origin/master' 2020-10-18 18:34:24 -04:00
dac236b0e9 Better launch selection 2020-10-18 18:34:19 -04:00
fcbad69b46 Merge pull request #3014 from summetdev/patch-6
:)
2020-10-18 17:20:25 -04:00
8ceb155e38 :) 2020-10-19 00:14:40 +03:00
97fd9abd8c Merge remote-tracking branch 'origin/master' 2020-10-18 15:46:24 -04:00
00d6997b5a Hex/bin logic number support 2020-10-18 15:46:20 -04:00
58ff6c60aa Merge pull request #3012 from summetdev/typo
Grammatical fix
2020-10-18 14:57:26 -04:00
7fc2d6be18 Merge pull request #3010 from summetdev/units-payload
Units payload.
2020-10-18 14:43:23 -04:00
bd6aebb961 fixed a typo in comment 2020-10-18 21:38:01 +03:00
801eca5ca3 prevent sending extra packets 2020-10-18 21:26:32 +03:00
96996f8079 merge 2020-10-18 20:28:29 +03:00
12e35b643c sync fix 2020-10-18 20:24:09 +03:00
2e0c1cd613 code style
Co-authored-by: Anuken <arnukren@gmail.com>
2020-10-18 20:07:46 +03:00
563e99aded Fixed #3009 2020-10-18 13:02:55 -04:00
8625ef09cc Units payload 2020-10-18 19:54:10 +03:00
ce6292cc53 Recipe display for reconstructors 2020-10-18 11:53:36 -04:00
ef58111cc3 Merge remote-tracking branch 'origin/master' 2020-10-18 09:29:53 -04:00
14c42c5652 Removed issue workaround from README 2020-10-18 09:29:49 -04:00
4cd9c0194a Merge pull request #3008 from abomb4/master
Try fix 'Cannot attach to current VM' problem in IDEA
2020-10-18 09:28:33 -04:00
7f708a3f6c Try fix 'Cannot attach current VM' problem in IDEA
Seems add a 'fork' option to core module solves this problem
2020-10-18 21:15:30 +08:00
e6606ca17e Update bug_report.md v109 2020-10-18 09:11:15 -04:00
c1c41a19c8 Cleanup 2020-10-18 09:08:47 -04:00
521d44714d Disabled spawnpoints during ongoing attack maps 2020-10-17 19:49:13 -04:00
4ab0c8a1ca Merge remote-tracking branch 'origin/master' 2020-10-17 18:37:57 -04:00
7349af4753 Various small tweaks 2020-10-17 18:37:54 -04:00
55a8ae083b Merge pull request #2992 from DeltaNedas/planetdraw
allow modded planets to customize drawing
2020-10-17 17:56:12 -04:00
e9131b4631 Minor payload acceptor fixes 2020-10-17 17:05:34 -04:00
5d9beb4c28 Fixed #2582 2020-10-17 14:37:51 -04:00
a47432c20b Merge remote-tracking branch 'origin/master' 2020-10-17 13:03:03 -04:00
8043c09e2b Breaking logic change: Coordinates are now tile-based 2020-10-17 13:02:57 -04:00
091593c84d Merge branch 'master' into planetdraw 2020-10-17 16:59:28 +00:00