Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,098 Commits 4 Branches 180 Tags
0013402962836368f1e44c9f77bf8e02220332f4
Commit Graph
11098 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
AnukenandGitHub 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
AnukenandGitHub 9a7d359626 Merge pull request #3579 from Quezler/patch-68 
Remove stray newline
 2020-11-25 17:49:40 -05:00
AnukenandGitHub 0437d50a5c Merge pull request #3598 from summetdev/patch-8 
Remove unused imports
 2020-11-25 17:49:24 -05:00
AnukenandGitHub f49f151901 Merge pull request #3601 from genNAowl/projector-block-group 
Add Projectors Blockgroup
 2020-11-25 17:27:56 -05:00
Angel_24andGitHub 245e5d515a Update contributors 2020-11-25 23:22:17 +01: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
AnukenandGitHub 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 AndrewandGitHub 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
YellOw139andGitHub 91b05e4789 Reconnecting 2020-11-25 22:29:32 +02:00
Angel_24andGitHub 1cc73a4077 Finished Spanish Translation, for now... 2020-11-25 21:26:24 +01:00
Antsiferov AndrewandGitHub 4ac26d86f5 Remove unused imports 2020-11-25 20:04:32 +00:00
Angel_24andGitHub a693289867 Update bundle_es.properties 2020-11-25 20:57:32 +01:00
AnukenandGitHub 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
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
AnukenandGitHub 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' 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
AnukenandGitHub 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
AnukenandGitHub 6131ef23fc Merge pull request #3578 from Quezler/patch-67 
Remove unused import
 2020-11-25 09:36:41 -05:00
Angel_24andGitHub 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' 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
Angel_24andGitHub 2a618a6600 Update bundle_es.properties 2020-11-25 10:36:48 +01:00
Angel_24andGitHub fa48f1b2e0 Merge branch 'master' into patch-2 2020-11-25 10:26:11 +01:00
Angel_24andGitHub 69063e9dc5 Update contributors 2020-11-25 10:23:07 +01:00
NgLamVNandGitHub c2bedc0210 Update 2020-11-25 16:09:41 +07:00