Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,045 Commits 4 Branches 180 Tags
c2d808b921f2926507cf6e7a869d8532085160ab
Commit Graph
8542 Commits
Author SHA1 Message Date
Anuken bc55e43def Fixed #3591 2020-11-25 11:15:46 -05:00
AnukenandGitHub 084d7e8355 Merge pull request #3583 from Quezler/patch-69 
automatic reconnect
 2020-11-25 11:14:04 -05:00
Patrick 'Quezler' MounierGitHubAnuken
 		f26b3358ef Update core/src/mindustry/ui/dialogs/JoinDialog.java 
Co-authored-by: Anuken <arnukren@gmail.com>
 2020-11-25 17:08:03 +01:00
Patrick 'Quezler' MounierandGitHub 3d6390a76a Set the ping to null when canceling manually as well 2020-11-25 16:51:57 +01:00
Patrick 'Quezler' MounierandGitHub ff20928bec Anukify reconnect logic 2020-11-25 16:49:36 +01:00
Anuken 8418770bbf Merge remote-tracking branch 'origin/master' 2020-11-25 10:15:22 -05:00
Anuken eaa7b04c3d Fixed CI / Fixed exponentially increasing broken blocks 2020-11-25 10:15:14 -05:00
EzLam f5023aa846 Update bundle_vi.properties 2020-11-25 19:22:28 +07:00
EzLam d10fd8e738 fix typos. 2020-11-25 17:46:38 +07:00
Patrick 'Quezler' MounierandGitHub b002d8b446 Update bundle.properties 2020-11-25 10:42:13 +01:00
Patrick 'Quezler' MounierandGitHub f5e06cca54 Update NetClient.java 2020-11-25 10:41:41 +01:00
Patrick 'Quezler' MounierandGitHub 642b877ab0 Update JoinDialog.java 2020-11-25 10:40:42 +01:00
NgLamVNandGitHub c2bedc0210 Update 2020-11-25 16:09:41 +07:00
EzLam 103f5a65b6 LOL I forgot to do that :v 2020-11-25 15:42:30 +07:00
Patrick 'Quezler' MounierandGitHub 8ee3f2b2e6 Remove stray newline 2020-11-25 09:38:04 +01:00
EzLam 7697a21003 ... 2020-11-25 15:36:45 +07:00
Patrick 'Quezler' MounierandGitHub 40bf0741f0 Remove unused import 2020-11-25 09:36:12 +01:00
EzLam 72a453654e ... 2020-11-25 14:56:15 +07:00
EzLam 25c31c5250 Update to lastest main bundle. 2020-11-25 14:30:53 +07:00
AnukenandGitHub 6633b07fb2 Merge pull request #3561 from Volas171/patch-2 
Update contributors
 2020-11-24 18:55:00 -05:00
Volas171andGitHub e65971db47 h 2020-11-24 18:30:59 -05:00
Anuken 5fd66d38bb Fixed #3573 2020-11-24 18:15:40 -05:00
Anuken 15f33b45c7 Salt Flats should probably require additive reconstructors 2020-11-24 18:12:45 -05:00
Anuken 17e66f1008 Final campaign tweaks 2020-11-24 17:17:55 -05:00
Anuken bcaf5e4c3d Campaign balance / Smarter power node placement 2020-11-24 16:33:36 -05:00
Anuken 6fd36d97f0 Balancing 2020-11-24 12:53:55 -05:00
Anuken 61bec243dc Campaign balance 2020-11-24 12:35:04 -05:00
Anuken 7d43856735 Bugfixes 2020-11-24 10:23:28 -05:00
Anuken 058b2ddfce Fixed #3565 2020-11-24 09:00:34 -05:00
EzLam 77ba760a94 Update to lastest main bundle :) 2020-11-24 15:36:37 +07:00
Volas171andGitHub 97254a6672 Update contributors 2020-11-23 22:27:08 -05:00
Anuken 2282cb89b1 Fixed sector damage calculations / Campaign balance 2020-11-23 18:09:20 -05:00
Anuken 06929ee8f3 Fixed boss hint not disappearing 2020-11-23 15:47:15 -05:00
Anuken ec19381c4e Fixed campaign bases having ridiculous wall tiers 2020-11-23 15:41:10 -05:00
Anuken 4a52392ce9 Added hint about guards & armor 2020-11-23 13:09:42 -05:00
Anuken dcbe06229c Campaign fixes & balance 2020-11-23 10:36:41 -05:00
Anuken 075be1a862 Fixed #3540 / Fixed #3544 / Fixed #3542 2020-11-23 09:12:36 -05:00
EzLam fe01282421 re-trans 2020-11-23 18:06:06 +07:00
EzLam 226ff9aa03 re trans 2020-11-23 17:33:18 +07:00
NgLamVNandGitHub 5d92b4dd2e I hate to do this in my phone 2020-11-23 13:44:07 +07:00
Anuken 8d91a9b014 Fixed sectors not auto-unlocking 2020-11-22 22:03:23 -05:00
Anuken ecea8eab01 Various tweaks and bugfixes 2020-11-22 21:20:33 -05:00
Anuken ad71007a0a Campaign balance 2020-11-22 17:20:20 -05:00
Anuken b595f7b175 Cleanup 2020-11-22 17:03:49 -05:00
AnukenandGitHub e783ad8893 Merge pull request #3526 from feu-follet/patch-5 
Update bundle_fr_BE.properties
 2020-11-22 17:00:36 -05:00
AnukenandGitHub fc47e1cf16 Merge pull request #3510 from Nikolass1000/patch-1 
Polish language update.
 2020-11-22 17:00:21 -05:00
AnukenandGitHub 37246becc2 Merge pull request #3474 from PetrGasparik/v116 
Czech translation for v116
 2020-11-22 16:59:20 -05:00
AnukenandGitHub 58e45aa22d Merge pull request #3462 from Prosta4okua/master 
[Bundle][RU] actual L10n
 2020-11-22 16:59:09 -05:00
AnukenandGitHub 5952785199 Merge pull request #3350 from YellOw139/patch-1 
[Bundle][RO] Translation Update
 2020-11-22 16:58:36 -05:00
Anuken ea377c6f16 Bugfixes 2020-11-22 16:53:50 -05:00