Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,274 Commits 4 Branches 180 Tags
f694e42c78e54b38c4773c0c6b5f165944ec1ce7
Commit Graph
11274 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuken 1d8ec9abd9 Campaign bugfixes 2020-11-26 15:31:58 -05:00
Anuken d3f58c0e83 Campaign bugfixes 2020-11-26 15:31:19 -05:00
Anuken 84474040c0 Fungal Pass map fixes 2020-11-26 14:24:35 -05:00
L0615T1C5-216AC-9437andGitHub 18d7f8ddfb Add CN pvp Server to Community Server List 2020-11-26 14:21:52 -05:00
YellOw139andGitHub ef63c5073a Legacy prompts 2020-11-26 21:11:55 +02:00
Anuken 3fe4ae38b6 Misc cleanup 2020-11-26 12:53:19 -05:00
Petr Gašparík 0b515395e8 Merge branch 'master' of https://github.com/Anuken/Mindustry into v117 2020-11-26 17:48:24 +01:00
AmateurPotionandGitHub 22116314c5 1st translation bundle 
Please do not merge yet. Not all translated.
 2020-11-27 01:32:31 +09:00
Wiki Updater 35da950986 german translation 2020-11-26 16:41:46 +01:00
Anuken 465219540c Added prompt for loading legacy research data 2020-11-26 10:22:01 -05:00
Angel_24andGitHub 0e354dbf23 Merge pull request #1 from Angel-24/patch-2 
Patch 2
 2020-11-26 10:46:59 +01:00
Angel_24andGitHub 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
NgLamVNandGitHub 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_24andGitHub fa3a19d766 Update bundle_es.properties 2020-11-26 08:52:46 +01:00
Angel_24andGitHub 0d4add667f Update bundle_es.properties 2020-11-26 08:49:44 +01:00
Angel_24andGitHub 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
AnukenandGitHub 17a571f22a Merge pull request #3604 from sk7725/patch-30 
[KO]Quick Fix
 2020-11-25 20:06:10 -05:00
Sunny KimandGitHub dd9c3fc8d6 Update bundle_ko.properties 2020-11-26 10:01:15 +09:00
Sunny KimandGitHub a70e29127b [KO]quick patch 2020-11-26 09:59:07 +09:00
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