mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-10 02:37:12 +07:00
Code Issues Packages Projects Releases Wiki Activity
9,970 Commits 4 Branches 160 Tags 2.3 GiB
c874089f27
Commit Graph

9970 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuken
c874089f27 Bugfixes 2020-11-25 15:42:51 -05:00
Anuken
40b67349d9 Fixed quotes 2020-11-25 11:56:10 -05:00
Anuken
735cb74483 Merge remote-tracking branch 'origin/master' 2020-11-25 11:15:50 -05:00
Anuken
bc55e43def Fixed #3591 2020-11-25 11:15:46 -05:00
Anuken
084d7e8355
Merge pull request #3583 from Quezler/patch-69 
automatic reconnect
 2020-11-25 11:14:04 -05:00
Anuken
22e60612ac Merge remote-tracking branch 'origin/master' 2020-11-25 11:09:33 -05:00
Anuken
b271c4be32 Fixed deploy CI, again 2020-11-25 11:09:29 -05:00
Patrick 'Quezler' Mounier
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' Mounier
3d6390a76a
Set the ping to null when canceling manually as well 2020-11-25 16:51:57 +01:00
Patrick 'Quezler' Mounier
ff20928bec
Anukify reconnect logic 2020-11-25 16:49:36 +01:00
Anuken
59387389a4
Merge pull request #3563 from skykatik/patch-11 
Deleted unnecessary DateTimeFormatter declaration
 2020-11-25 10:33:46 -05:00
Anuken
fb200c6d11 arc 2020-11-25 10:16:40 -05: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
Anuken
6131ef23fc
Merge pull request #3578 from Quezler/patch-67 
Remove unused import
 2020-11-25 09:36:41 -05:00
Patrick 'Quezler' Mounier
b002d8b446
Update bundle.properties 2020-11-25 10:42:13 +01:00
Patrick 'Quezler' Mounier
f5e06cca54
Update NetClient.java 2020-11-25 10:41:41 +01:00
Patrick 'Quezler' Mounier
642b877ab0
Update JoinDialog.java 2020-11-25 10:40:42 +01:00
Patrick 'Quezler' Mounier
40bf0741f0
Remove unused import 2020-11-25 09:36:12 +01:00
Anuken
6633b07fb2
Merge pull request #3561 from Volas171/patch-2 
Update contributors
 2020-11-24 18:55:00 -05:00
Volas171
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
Skat
1637360952
Deleted unnecessary DateTimeFormatter declaration 2020-11-24 13:00:08 +03:00
Volas171
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
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
3db2fea32b CI fix 2020-11-22 17:34:49 -05:00
Anuken
335e7489ce Fixed colors appearing in server logs 2020-11-22 17:33:10 -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
Anuken
e783ad8893
Merge pull request #3526 from feu-follet/patch-5 
Update bundle_fr_BE.properties
 2020-11-22 17:00:36 -05:00
Anuken
0ac54aba83
Merge pull request #3516 from Quezler/patch-65 
Remove stray newline
 2020-11-22 17:00:28 -05:00
Anuken
fc47e1cf16
Merge pull request #3510 from Nikolass1000/patch-1 
Polish language update.
 2020-11-22 17:00:21 -05:00
Anuken
37246becc2
Merge pull request #3474 from PetrGasparik/v116 
Czech translation for v116
 2020-11-22 16:59:20 -05:00
Anuken
58e45aa22d
Merge pull request #3462 from Prosta4okua/master 
[Bundle][RU] actual L10n
 2020-11-22 16:59:09 -05:00
Anuken
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