Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,100 Commits 4 Branches 180 Tags
e76dee8cbe7194aa5f68c1083be6f1e2fe71aeac
Commit Graph
8584 Commits
Author SHA1 Message Date
Angel_24andGitHub 7e5c69a107 Update bundle_es.properties 2020-11-27 13:07:38 +01:00
Angel_24andGitHub 40dd3d5677 Update bundle_es.properties 2020-11-27 10:07:38 +01:00
Anuken e39eceee28 Allow research even if sector was attacked after capture 2020-11-26 21:48:45 -05:00
Anuken 869c329fbf Fixed Nuclear Complex gen / Increased damage simulation harshness 2020-11-26 21:29:22 -05:00
Anuken c8b425116e Fixed Impact0078 ore gen / Misc campaign fixes 2020-11-26 20:46:17 -05:00
Anuken 0a290d2e10 Auto-rebuilding of broken attack sector blocks on restart 2020-11-26 20:19:13 -05:00
Anuken 9863cbc991 Disabled unit explosion team damage 2020-11-26 19:30:49 -05:00
Anuken 91c50ae126 Disabled explosion fires for item flammability <= 1 
coming soon: spore bombing?
 2020-11-26 19:25:26 -05:00
Anuken dae46ceb6d Campaign bugfixes / Balancing 2020-11-26 18:53:20 -05:00
Anuken 6b3919e8f7 Added Call#setItem 2020-11-26 16:49:01 -05:00
Anuken 1d8ec9abd9 Campaign bugfixes 2020-11-26 15:31:58 -05:00
Anuken 84474040c0 Fungal Pass map fixes 2020-11-26 14:24:35 -05:00
Anuken 3fe4ae38b6 Misc cleanup 2020-11-26 12:53:19 -05:00
Anuken 465219540c Added prompt for loading legacy research data 2020-11-26 10:22:01 -05:00
Angel_24andGitHub d1563ee55e Merge branch 'master' into patch-2 2020-11-26 10:43:13 +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
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
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 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
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
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
AnukenandGitHub 084d7e8355 Merge pull request #3583 from Quezler/patch-69 
automatic reconnect
 2020-11-25 11:14:04 -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
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_24andGitHub 1467a3a7fd Update bundle_es.properties 2020-11-25 14:59:07 +01: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