Commit graph

10178 commits

Author SHA1 Message Date
Anuken
7954d7e4e9
Merge pull request #3618 from L0615T1C5-216AC-9437/patch-2
Add CN pvp Server to Community Server List
2020-11-30 18:11:43 -05:00
Anuken
7a0bac95a5
Merge pull request #3615 from Catchears/german-v6
Final v6 german translation
2020-11-30 18:11:24 -05:00
Anuken
625486ade9
Merge pull request #3584 from Lapis256/master
update bundle_ja.properties
2020-11-30 18:11:06 -05:00
Anuken
6a33f41fb4
Merge pull request #3554 from Nikolass1000/patch-3
Update contributors
2020-11-30 18:10:40 -05:00
Anuken
38f722e0b6
Merge branch 'master' into patch-3 2020-11-30 18:10:28 -05:00
Anuken
9c773f48ee
Merge pull request #3548 from simba-fs/master
modify zh-TW translation
2020-11-30 18:10:07 -05:00
Anuken
d142777fca
Merge pull request #3547 from PetrGasparik/v117
[Bundle][cs] Czech translation ready for 6.0
2020-11-30 18:09:57 -05:00
Anuken
2332595f2d
Merge pull request #3545 from YellOw139/patch-1
[Bundle][RO] Translation Update
2020-11-30 18:09:36 -05:00
Anuken
cdb1003133
Merge pull request #3443 from DaGamerFiles/patch-4
[Bundle][ID] Updated translation
2020-11-30 18:09:14 -05:00
Anuken
c0c8235e3d Merge remote-tracking branch 'origin/master' 2020-11-30 17:49:24 -05:00
Anuken
d868ff81bf Dependency resolution fix 2020-11-30 17:49:20 -05:00
Anuken
16f64a90a8
Merge pull request #3675 from Remint32/patch-4
typo
2020-11-30 17:32:08 -05:00
Felix Corvus
8dae9babab
not typo 2020-12-01 01:27:34 +03:00
Anuken
d33cea6003 Merge remote-tracking branch 'origin/master' 2020-11-30 17:12:33 -05:00
Anuken
9870098457 Updated Steam meta / Fixed #3673 2020-11-30 17:12:29 -05:00
Felix Corvus
44204db2bb
typo 2020-12-01 00:30:52 +03:00
Petr Gašparík
082a43da35 Czech translation up to date with final beta 2020-11-30 21:35:14 +01:00
Petr Gašparík
ca35b113f0 Merge branch 'master' of https://github.com/Anuken/Mindustry into v117 2020-11-30 21:29:13 +01:00
Anuken
c09b1e0d6e
Merge pull request #3562 from skykatik/patch-10
[Typo] comiting changes
2020-11-30 12:58:55 -05:00
Anuken
3b9f775f82
Merge pull request #3535 from Nikolass1000/patch-2
Update bundle_pl.properties
2020-11-30 12:56:59 -05:00
Anuken
af122a76a4 Merge remote-tracking branch 'origin/master' 2020-11-30 12:52:15 -05:00
Anuken
5c89fa2d2b Achievement cleanup 2020-11-30 12:52:10 -05:00
Anuken
e76dee8cbe
Merge pull request #3665 from Quezler/patch-72
Fix configuring buildings with blocks
2020-11-30 12:32:46 -05:00
Anuken
639702ae1a Fixed unit tests 2020-11-30 11:12:09 -05:00
Patrick 'Quezler' Mounier
9df4eac2f8
Update BuildingComp.java 2020-11-30 16:36:10 +01:00
Anuken
18b0cd4e99 Merge remote-tracking branch 'origin/master' 2020-11-30 10:15:58 -05:00
Anuken
371a14af87 Inlined Time.time 2020-11-30 10:15:22 -05:00
Anuken
fc85aae500
Merge pull request #3662 from Quezler/patch-71
Fixes #3661
2020-11-30 09:44:01 -05:00
Patrick 'Quezler' Mounier
5ba99ecb42
Fixed #3661 2020-11-30 14:21:18 +01:00
YellOw139
fb580326b2
Easier reading for the monolingual 2020-11-30 11:53:52 +02:00
Anuken
c41dfa46aa Fixed #3657 2020-11-29 19:41:10 -05:00
Anuken
ba9bc472e8 Merge remote-tracking branch 'origin/master' 2020-11-29 16:34:35 -05:00
Anuken
a7c18fc598 Fixed #3656 2020-11-29 16:34:31 -05:00
Anuken
67169a2ffc
Merge pull request #3655 from Quezler/patch-70
display the repair field healed effect at the healed unit(s)
2020-11-29 13:59:57 -05:00
Anuken
2a9f362e15 Fixed #3654 2020-11-29 13:59:09 -05:00
Patrick 'Quezler' Mounier
80f027471c
Update RepairFieldAbility.java 2020-11-29 19:35:49 +01:00
Anuken
682c1692df Compilation fix 2020-11-29 12:15:22 -05:00
lapis256
da97d1e1eb update bundle_ja.properties 2020-11-30 02:14:53 +09:00
Anuken
979e39f588 Added unit to BlockBuildBeginEvent 2020-11-29 12:14:46 -05:00
lapis256
4fb97b60a9 update bundle_ja.properties 2020-11-30 01:54:43 +09:00
Anuken
bc114dfefc Version is "release" for real now 2020-11-29 11:37:02 -05:00
Anuken
29be8176c1 Fixed some crashes 2020-11-29 11:08:12 -05:00
Anuken
67c6e0179f Merge remote-tracking branch 'origin/master' 2020-11-29 10:37:11 -05:00
Anuken
e3f2966db3 Nevermind, reverting to beta for last pre-release 2020-11-29 10:37:07 -05:00
Anuken
9e53b3b7e6
Update bug_report.md 2020-11-29 10:33:51 -05:00
Anuken
8f186a16b3 Build beginPlace+Break access tracking / Instant rotation 2020-11-29 10:12:24 -05:00
Anuken
9a3b21d77a Fixed #3650 2020-11-29 09:54:52 -05:00
Anuken
23fc86fac1 Updated wiki links 2020-11-28 23:59:56 -05:00
Anuken
3d6fd8a351 De-abstracted weather 2020-11-28 23:23:39 -05:00
Anuken
3c51d82a1a Fixed #3648 2020-11-28 22:45:36 -05:00