Commit Graph

10002 Commits

Author SHA1 Message Date
Wiki Updater
7a81fde64e changes from Shawak 2020-11-28 14:36:55 +01:00
Wiki Updater
1d8fbf7aa9 final changes 2020-11-28 10:50:35 +01:00
Wiki Updater
6634e6f8a5 ...
I think that it would be fair to add me into the list of translators and contributors as I've somehow editied over 800 lines of the german translation. If you don't think I should be added to the list, say that in a comment.
2020-11-27 23:19:56 +01:00
Wiki Updater
525643cb17 unit descriptions 2020-11-27 23:10:58 +01:00
Wiki Updater
4fbfb50380 more translations 2020-11-27 21:43:58 +01:00
Wiki Updater
ed89a70cbc hints + sector descriptions in german 2020-11-26 21:39:14 +01:00
Wiki Updater
35da950986 german translation 2020-11-26 16:41:46 +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
Anuken
17a571f22a Merge pull request #3604 from sk7725/patch-30
[KO]Quick Fix
2020-11-25 20:06:10 -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
Anuken
f49f151901 Merge pull request #3601 from genNAowl/projector-block-group
Add Projectors Blockgroup
2020-11-25 17:27:56 -05:00
Leonwang4234
2b8c11c451 projectors blockgroup 2020-11-25 14:19:56 -08:00
Anuken
11d864f2b5 Merge remote-tracking branch 'origin/master' 2020-11-25 16:25:43 -05:00
Anuken
977b55bf32 Testing BE builds 2020-11-25 16:25:39 -05:00
Anuken
b06be81f1e Merge pull request #3600 from summetdev/patch-10
GitHub Actions: Manual Triggers
2020-11-25 16:24:33 -05:00
Anuken
93313664f0 Testing BE builds 2020-11-25 16:14:39 -05:00
Antsiferov Andrew
25cb2b0abf Add workflow_dispatch event 2020-11-26 00:09:17 +03:00
Anuken
b841af3a48 Testing BE builds 2020-11-25 16:09:11 -05:00
Anuken
709f43b83c Testing BE builds 2020-11-25 16:00:35 -05:00
Anuken
aabc094dd9 Testing BE builds 2020-11-25 15:47:44 -05: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
Antsiferov Andrew
4ac26d86f5 Remove unused imports 2020-11-25 20:04:32 +00:00
Anuken
010e5341dc Merge pull request #3596 from Catchears/ai
Fix ai schematics with power weapons and steam gens
2020-11-25 14:14:28 -05:00
Wiki Updater
51790e0bf9 fix ai schematics with power weapons and steam gens 2020-11-25 19:52:36 +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
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 v117.1 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
8ee3f2b2e6 Remove stray newline 2020-11-25 09:38:04 +01:00