Commit Graph
100 Commits
Author SHA1 Message Date
Anuken a451ad895c Slight sei buff 2020-12-03 20:29:58 -05:00
Anuken d13b69c36f Sort community servers by ping 2020-12-03 16:49:30 -05:00
Anuken d64f603e08 Merge branch 'master' of https://github.com/Anuken/Mindustry 2020-12-03 12:08:35 -05:00
Anuken 3d2c094056 arc 2020-12-03 12:08:31 -05:00
AnukenandGitHub 64e99f613e Update bug_report.md 2020-12-03 11:08:00 -05:00
Anuken 51b4078288 Clean tests before running 2020-12-03 11:05:02 -05:00
Anuken db8d099fcc arc 2020-12-03 10:29:19 -05:00
Anuken 002be46915 Updated miniaudio version 2020-12-03 10:28:57 -05:00
Anuken 9fa2691b02 Fixed campaign idle boss spoofing 2020-12-03 10:05:52 -05:00
Anuken 6686584003 Merge remote-tracking branch 'origin/master' 2020-12-02 18:01:49 -05:00
Anuken 78c8c57649 Made water unlocked again 2020-12-02 18:01:46 -05:00
AnukenandGitHub ca65fd31e5 Merge pull request #3728 from Vortetty/patch-2
Update surrealment to v6
2020-12-02 17:23:09 -05:00
Anuken e19c857d74 Possible crash fix 2020-12-02 16:08:53 -05:00
Anuken b18f418c61 Reduced easy sector difficulty 2020-12-02 14:48:42 -05:00
Anuken 12ee38476c Minor build fix 2020-12-02 14:35:03 -05:00
Anuken 48c8357ff7 Added community server disclaimer 2020-12-02 14:32:51 -05:00
Anuken a0702559f3 Fixed #3725 2020-12-02 14:14:42 -05:00
Anuken 55db91e53e Cleanup 2020-12-02 13:53:49 -05:00
Anuken a333fa3722 Added more hints 2020-12-02 13:40:49 -05:00
Anuken 5284750c6a Merge remote-tracking branch 'origin/master' 2020-12-02 13:02:35 -05:00
Anuken 9c616fd03b Possible fix for notched insets 2020-12-02 13:02:27 -05:00
AnukenandGitHub d4bee41103 Merge pull request #3722 from Quezler/patch-77
Fast forward boulder deconstruction
2020-12-02 12:58:58 -05:00
AnukenandGitHub c26a9bd123 Merge pull request #3715 from Quezler/patch-75
Keep items inside reconstructor when construction booped
2020-12-02 10:05:51 -05:00
AnukenandGitHub 5008573aa5 Merge pull request #3714 from Recessive/patch-7
Update servers_v6.json
2020-12-02 09:58:15 -05:00
Anuken 395f7193ea Merge remote-tracking branch 'origin/master' 2020-12-02 09:56:06 -05:00
Anuken 775e17a726 Fixed #3709 2020-12-02 09:56:02 -05:00
AnukenandGitHub 900ec8db6a Merge pull request #3717 from Quezler/patch-76
Fixes massdriver typo
2020-12-02 09:54:37 -05:00
AnukenandGitHub e23a7c213c Merge pull request #3710 from joshuaptfan/master
Spellcheck English Steam achievements
2020-12-02 09:53:46 -05:00
AnukenandGitHub 96513e4967 Merge pull request #3712 from MEEPofFaith/patch-1
Why is this protected in the first place?
2020-12-02 09:52:31 -05:00
Anuken 430538ea7e Possible fix for "unsupported combination of formats" error 2020-12-01 18:17:57 -05:00
Anuken ee966d1198 Removed requirements for optional inputs of blocks 2020-12-01 18:02:20 -05:00
AnukenandGitHub 076363ac87 Merge pull request #3651 from Prosta4okua/patch-1
[Bundle][uk_UA]Update translation
2020-12-01 16:53:47 -05:00
AnukenandGitHub 327442f6fe Merge pull request #3676 from Quezler/patch-74
Fix BlockForge progress bar & recenter payload
2020-12-01 16:53:13 -05:00
AnukenandGitHub c03400ccbc Merge pull request #3622 from genNAowl/distributors-come-on
Allow Distributors to Replace Conveyors
2020-12-01 16:46:09 -05:00
Anuken a5ad45ff30 Fixed #3706 2020-12-01 15:57:20 -05:00
Anuken 3161e23285 Merge remote-tracking branch 'origin/master' 2020-12-01 15:36:53 -05:00
Anuken e82ee227a5 1-bit stencil buffer, possible green line fix 2020-12-01 15:36:50 -05:00
AnukenandGitHub f8a859620d Merge pull request #3669 from Quezler/patch-73
per anuke's request
2020-12-01 14:02:03 -05:00
Anuken 30107db81e Fixed #3702 2020-12-01 13:01:38 -05:00
Anuken 05f7a15115 Merge remote-tracking branch 'origin/master' 2020-12-01 12:48:30 -05:00
Anuken 305e2642ba Minor bugfixes 2020-12-01 12:48:26 -05:00
AnukenandGitHub cb95059c3e Merge pull request #3699 from Somka000/patch-10
Update servers_v6.json
2020-12-01 11:40:00 -05:00
AnukenandGitHub c5574d3ae0 Merge pull request #3683 from Recessive/patch-6
Update servers_v6.json
2020-12-01 10:26:57 -05:00
AnukenandGitHub a461c184be Merge pull request #3691 from FruityPear/patch-4
Update server to v6
2020-12-01 09:48:46 -05:00
AnukenandGitHub 86887f2ec1 Merge pull request #3689 from Somka000/patch-9
Update servers_v6.json
2020-12-01 09:44:28 -05:00
Anuken fcaf1e49cb Merge remote-tracking branch 'origin/master' 2020-12-01 09:39:34 -05:00
Anuken 448fef980b Community server fetch logging 2020-12-01 09:39:30 -05:00
AnukenandGitHub 7832b6cafd Merge pull request #3688 from fuzzbuck/patch-5
mindustry.io from servers.json -> servers_v6.json
2020-12-01 09:31:05 -05:00
AnukenandGitHub 11168efffa Merge pull request #3524 from NgLamVN/master
Vietnamese translations
2020-12-01 09:24:22 -05:00
AnukenandGitHub f8bce3cea0 Merge pull request #3687 from AmateurPotion/patch-13
Korean Translate Typo fix
2020-12-01 09:24:06 -05:00
Anuken c00228f960 Merge remote-tracking branch 'origin/master' 2020-12-01 08:39:21 -05:00
Anuken ee28f4564b Final bugfixes 2020-12-01 08:39:16 -05:00
AnukenandGitHub 4c7b86196c Merge pull request #3681 from PetrGasparik/v118
[Bundle][cs] Czech translation - finishing touches for v6
2020-12-01 08:10:06 -05:00
AnukenandGitHub b946fd6a3b Merge pull request #3682 from GioIacca9/patch-13
fixes
2020-12-01 08:09:49 -05:00
Anuken c0c5257ed8 пропустит
ь
2020-11-30 19:14:03 -05:00
Anuken a476e3cf19 Merge remote-tracking branch 'origin/master' 2020-11-30 18:58:25 -05:00
Anuken 4c777fba5c Achievement fixes 2020-11-30 18:58:20 -05:00
AnukenandGitHub fe4497a4da Merge pull request #3541 from Prosta4okua/master
[Bundle][RU] actual L10n
2020-11-30 18:50:03 -05:00
AnukenandGitHub a232839cfd Merge pull request #3616 from AmateurPotion/patch-12
Korean translation bundle
2020-11-30 18:30:56 -05:00
AnukenandGitHub 5c483400e0 Merge pull request #3660 from Xasmedy/patch-1
Update servers_v6.json
2020-11-30 18:18:15 -05:00
AnukenandGitHub 3a05a2b0ef Merge pull request #3631 from Quick-korkc/patch-13
Update Contributors
2020-11-30 18:14:56 -05:00
AnukenandGitHub 26e90c99d3 Merge branch 'master' into patch-13 2020-11-30 18:14:51 -05:00
AnukenandGitHub fe59031fce Merge pull request #3674 from GioIacca9/patch-12
v6 Italian bundle
2020-11-30 18:13:16 -05:00
AnukenandGitHub 56e326ab1b Merge pull request #3671 from Nikolass1000/patch-2
Polish complete translation.
2020-11-30 18:12:44 -05:00
AnukenandGitHub 1a3af01b24 Merge pull request #3642 from laohuaji233/patch-42
Update bundle_zh_CN.properties[Unfinished]
2020-11-30 18:11:50 -05:00
AnukenandGitHub 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
AnukenandGitHub 7a0bac95a5 Merge pull request #3615 from Catchears/german-v6
Final v6 german translation
2020-11-30 18:11:24 -05:00
AnukenandGitHub 625486ade9 Merge pull request #3584 from Lapis256/master
update bundle_ja.properties
2020-11-30 18:11:06 -05:00
AnukenandGitHub 6a33f41fb4 Merge pull request #3554 from Nikolass1000/patch-3
Update contributors
2020-11-30 18:10:40 -05:00
AnukenandGitHub 38f722e0b6 Merge branch 'master' into patch-3 2020-11-30 18:10:28 -05:00
AnukenandGitHub 9c773f48ee Merge pull request #3548 from simba-fs/master
modify zh-TW translation
2020-11-30 18:10:07 -05:00
AnukenandGitHub d142777fca Merge pull request #3547 from PetrGasparik/v117
[Bundle][cs] Czech translation ready for 6.0
2020-11-30 18:09:57 -05:00
AnukenandGitHub 2332595f2d Merge pull request #3545 from YellOw139/patch-1
[Bundle][RO] Translation Update
2020-11-30 18:09:36 -05:00
AnukenandGitHub 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
AnukenandGitHub 16f64a90a8 Merge pull request #3675 from Remint32/patch-4
typo
2020-11-30 17:32:08 -05: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
AnukenandGitHub c09b1e0d6e Merge pull request #3562 from skykatik/patch-10
[Typo] comiting changes
2020-11-30 12:58:55 -05:00
AnukenandGitHub 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
AnukenandGitHub 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
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
AnukenandGitHub fc85aae500 Merge pull request #3662 from Quezler/patch-71
Fixes #3661
2020-11-30 09:44:01 -05: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
AnukenandGitHub 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
Anuken 682c1692df Compilation fix 2020-11-29 12:15:22 -05:00
Anuken 979e39f588 Added unit to BlockBuildBeginEvent 2020-11-29 12:14:46 -05: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
AnukenandGitHub 9e53b3b7e6 Update bug_report.md 2020-11-29 10:33:51 -05:00