Angel_24
|
d1563ee55e
|
Merge branch 'master' into patch-2
|
2020-11-26 10:43:13 +01:00 |
|
EzLam
|
49f4b1fd67
|
Merge branch 'master' of https://github.com/NgLamVN/Mindustry
|
2020-11-26 15:47:55 +07:00 |
|
EzLam
|
ba6d40cc22
|
to be continued ...
|
2020-11-26 15:47:30 +07:00 |
|
NgLamVN
|
dc15c9a7e4
|
To be continued ...
|
2020-11-26 15:42:27 +07:00 |
|
EzLam
|
27e22a84d3
|
to be continued ...
|
2020-11-26 15:40:35 +07:00 |
|
Petr Gašparík
|
33c3d587dd
|
Merge branch 'master' of https://github.com/Anuken/Mindustry into v117
|
2020-11-26 09:11:09 +01:00 |
|
Angel_24
|
fa3a19d766
|
Update bundle_es.properties
|
2020-11-26 08:52:46 +01:00 |
|
Angel_24
|
0d4add667f
|
Update bundle_es.properties
|
2020-11-26 08:49:44 +01:00 |
|
Angel_24
|
7f214f1343
|
Update bundle_es.properties
|
2020-11-26 08:47:11 +01:00 |
|
Anuken
|
e1ddf115e0
|
Merged turret types
|
2020-11-25 20:41:38 -05:00 |
|
Anuken
|
56f1d0548e
|
Merge remote-tracking branch 'origin/master'
|
2020-11-25 20:23:24 -05:00 |
|
Anuken
|
38471d68d7
|
Fixed Salt Flats being deadlocked
|
2020-11-25 20:23:17 -05:00 |
|
Sunny Kim
|
dd9c3fc8d6
|
Update bundle_ko.properties
|
2020-11-26 10:01:15 +09:00 |
|
Sunny Kim
|
a70e29127b
|
[KO]quick patch
|
2020-11-26 09:59:07 +09:00 |
|
Anuken
|
6be2b6021b
|
Merge pull request #3603 from skykatik/patch-12
Some typos
|
2020-11-25 18:28:30 -05:00 |
|
Skat
|
488147759a
|
Some typos
|
2020-11-26 02:04:08 +03:00 |
|
Anuken
|
9a7d359626
|
Merge pull request #3579 from Quezler/patch-68
Remove stray newline
|
2020-11-25 17:49:40 -05:00 |
|
Anuken
|
0437d50a5c
|
Merge pull request #3598 from summetdev/patch-8
Remove unused imports
|
2020-11-25 17:49:24 -05:00 |
|
Angel_24
|
245e5d515a
|
Update contributors
|
2020-11-25 23:22:17 +01:00 |
|
Leonwang4234
|
2b8c11c451
|
projectors blockgroup
|
2020-11-25 14:19:56 -08:00 |
|
Anuken
|
58acc0a970
|
Merge remote-tracking branch 'origin/master'
|
2020-11-25 15:42:56 -05:00 |
|
Anuken
|
c874089f27
|
Bugfixes
|
2020-11-25 15:42:51 -05:00 |
|
YellOw139
|
91b05e4789
|
Reconnecting
|
2020-11-25 22:29:32 +02:00 |
|
Angel_24
|
1cc73a4077
|
Finished Spanish Translation, for now...
|
2020-11-25 21:26:24 +01:00 |
|
Antsiferov Andrew
|
4ac26d86f5
|
Remove unused imports
|
2020-11-25 20:04:32 +00:00 |
|
Angel_24
|
a693289867
|
Update bundle_es.properties
|
2020-11-25 20:57:32 +01:00 |
|
Wiki Updater
|
51790e0bf9
|
fix ai schematics with power weapons and steam gens
|
2020-11-25 19:52:36 +01:00 |
|
Petr Gašparík
|
fd80cbcae5
|
Update up to b002d8b
|
2020-11-25 18:42:20 +01:00 |
|
Petr Gašparík
|
45bb6fa2ee
|
Merge branch 'master' of https://github.com/Anuken/Mindustry into v117
|
2020-11-25 18:20:42 +01: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 |
|
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
|
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 |
|
Angel_24
|
1467a3a7fd
|
Update bundle_es.properties
|
2020-11-25 14:59:07 +01: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 |
|
lapis256
|
8ca833f753
|
update bundle_ja.properties
|
2020-11-25 18:50:44 +09: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 |
|
Angel_24
|
2a618a6600
|
Update bundle_es.properties
|
2020-11-25 10:36:48 +01:00 |
|
Angel_24
|
fa48f1b2e0
|
Merge branch 'master' into patch-2
|
2020-11-25 10:26:11 +01:00 |
|
Angel_24
|
69063e9dc5
|
Update contributors
|
2020-11-25 10:23:07 +01:00 |
|
NgLamVN
|
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 |
|