18963 Commits
Author SHA1 Message Date
AnukenandGitHub 400d36609a Merge pull request #3022 from Ilya246/patch-1
armor defined twice in mega
2020-10-19 09:41:06 -04:00
GlennFolkerandGitHub cae66a1e6d allow mods to easily load icon region 2020-10-19 19:13:06 +07:00
Thomas WidyantokoandGitHub e88a2f8437 Space block name changed 2020-10-19 14:50:56 +07:00
Thomas WidyantokoandGitHub 4b4cde288b Update bundle_in_ID.properties
Improved translation, new lines and a slight text color format fix.
2020-10-19 13:43:59 +07:00
Ilya246andGitHub ad5d3581f6 armor defined twice in mega 2020-10-19 10:09:39 +04:00
Petr Gašparík 538c198113 Czecg translation up to commit 46ec457 2020-10-19 07:48:57 +02:00
Petr Gašparík 8f4ac642d1 Merge branch 'master' of https://github.com/Anuken/Mindustry into v107 2020-10-19 07:34:10 +02:00
Anuken 7f21d61078 Crash fix 2020-10-18 19:54:52 -04:00
Anuken c7622198fd Cleanup 2020-10-18 19:21:59 -04:00
Anuken 3a52fb2afe Merge branch 'router' 2020-10-18 19:03:13 -04:00
Anuken e63bbe6ac9 Merge remote-tracking branch 'origin/master' 2020-10-18 18:34:24 -04:00
Anuken dac236b0e9 Better launch selection 2020-10-18 18:34:19 -04:00
Leonwang4234 1e0545c1ec Merge branch 'wall-stats' of https://github.com/genNAowl/Mndstry into wall-stats 2020-10-18 14:29:18 -07:00
Leonwang4234 cff2799c72 remove changes in description 2020-10-18 14:29:15 -07:00
7a7fa74e65 Update core/src/mindustry/world/blocks/defense/Wall.java
Co-authored-by: Summet <summet.dev@gmail.com>
2020-10-18 14:26:48 -07:00
AnukenandGitHub fcbad69b46 Merge pull request #3014 from summetdev/patch-6
:)
2020-10-18 17:20:25 -04:00
SummetandGitHub 8ceb155e38 :) 2020-10-19 00:14:40 +03:00
Leonwang4234 db3db47ca1 Add wall stats + other changes 2020-10-18 13:35:20 -07:00
Anuken 97fd9abd8c Merge remote-tracking branch 'origin/master' 2020-10-18 15:46:24 -04:00
Anuken 00d6997b5a Hex/bin logic number support 2020-10-18 15:46:20 -04:00
AnukenandGitHub 58ff6c60aa Merge pull request #3012 from summetdev/typo
Grammatical fix
2020-10-18 14:57:26 -04:00
AnukenandGitHub 7fc2d6be18 Merge pull request #3010 from summetdev/units-payload
Units payload.
2020-10-18 14:43:23 -04:00
summetdev bd6aebb961 fixed a typo in comment 2020-10-18 21:38:01 +03:00
summetdev 801eca5ca3 prevent sending extra packets 2020-10-18 21:26:32 +03:00
summetdev 96996f8079 merge 2020-10-18 20:28:29 +03:00
summetdev 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
Anuken 563e99aded Fixed #3009 2020-10-18 13:02:55 -04:00
summetdev 8625ef09cc Units payload 2020-10-18 19:54:10 +03:00
Anuken ce6292cc53 Recipe display for reconstructors 2020-10-18 11:53:36 -04:00
Anuken ef58111cc3 Merge remote-tracking branch 'origin/master' 2020-10-18 09:29:53 -04:00
Anuken 14c42c5652 Removed issue workaround from README 2020-10-18 09:29:49 -04:00
AnukenandGitHub 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
abomb4andGitHub 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
AnukenandGitHub e6606ca17e Update bug_report.md v109 2020-10-18 09:11:15 -04:00
Anuken c1c41a19c8 Cleanup 2020-10-18 09:08:47 -04:00
키에르andGitHub 48885a814c Update bundle_ko.properties 2020-10-18 13:56:55 +09:00
YellOw139andGitHub 2ff6630e23 Bumped up a couple of commits 2020-10-18 05:39:38 +03:00
Anuken 521d44714d Disabled spawnpoints during ongoing attack maps 2020-10-17 19:49:13 -04:00
Anuken 4ab0c8a1ca Merge remote-tracking branch 'origin/master' 2020-10-17 18:37:57 -04:00
Anuken 7349af4753 Various small tweaks 2020-10-17 18:37:54 -04:00
AnukenandGitHub 55a8ae083b Merge pull request #2992 from DeltaNedas/planetdraw
allow modded planets to customize drawing
2020-10-17 17:56:12 -04:00
Anuken e9131b4631 Minor payload acceptor fixes 2020-10-17 17:05:34 -04:00
Felix CorvusandGitHub 6ab7496a9d Update bundle_ru.properties 2020-10-18 00:04:01 +03:00
Anuken 5d9beb4c28 Fixed #2582 2020-10-17 14:37:51 -04:00
Anuken a47432c20b Merge remote-tracking branch 'origin/master' 2020-10-17 13:03:03 -04:00
Anuken 8043c09e2b Breaking logic change: Coordinates are now tile-based 2020-10-17 13:02:57 -04:00
DeltaNedasandGitHub 091593c84d Merge branch 'master' into planetdraw 2020-10-17 16:59:28 +00:00
AnukenandGitHub 1324e75eea Merge pull request #2996 from DeltaNedas/universe
add universe draw events
2020-10-17 12:52:26 -04:00
Volas171andGitHub f364892fce Merge branch 'master' into patch-1 2020-10-17 10:50:53 -05:00