Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,067 Commits 4 Branches 180 Tags
cff957feaf95906150dc77d2c8a3a63f9902da03
Commit Graph
4019 Commits
Author SHA1 Message Date
CatchearsandGitHub cff957feaf Merge branch 'master' into german-v6 2020-11-28 16:53:33 +01:00
Wiki Updater 4deb8fd626 resolve merge conflict 2020-11-28 16:49:24 +01:00
AnukenandGitHub 2816aeb6e9 Merge pull request #3451 from Angel-24/patch-2 
[Bundle][ES] Translation update
 2020-11-28 09:46:30 -05:00
AnukenandGitHub f40e523764 Merge pull request #3567 from CPXMC/patch-6 
Update bundle_zh_CN.properties
 2020-11-28 09:46:23 -05:00
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
Anuken 47e622dee3 (more) Campaign balancing 2020-11-27 18:07:10 -05:00
Anuken 99125e9218 Merge remote-tracking branch 'origin/master' 2020-11-27 17:37:28 -05:00
Anuken 66918f0322 Campaign balancing 2020-11-27 17:37:22 -05: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
AnukenandGitHub b8a2c609cb Merge pull request #3629 from Catchears/typo 
typo
 2020-11-27 16:19:16 -05:00
Wiki Updater 968277477a typo 2020-11-27 22:18:08 +01:00
Wiki Updater 4fbfb50380 more translations 2020-11-27 21:43:58 +01:00
Anuken 525dc0cd7e Added bosses for sectors missing them 2020-11-27 12:35:20 -05:00
Anuken 8dd66fb942 Campaign tweaks 2020-11-27 11:56:01 -05:00
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 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 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
Wiki Updater ed89a70cbc hints + sector descriptions in german 2020-11-26 21:39:14 +01: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
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 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
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
Angel_24andGitHub 245e5d515a Update contributors 2020-11-25 23:22:17 +01:00
Angel_24andGitHub 1cc73a4077 Finished Spanish Translation, for now... 2020-11-25 21:26:24 +01: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
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
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
AnukenandGitHub 6633b07fb2 Merge pull request #3561 from Volas171/patch-2 
Update contributors
 2020-11-24 18:55:00 -05:00
Volas171andGitHub e65971db47 h 2020-11-24 18:30:59 -05:00
Anuken 17e66f1008 Final campaign tweaks 2020-11-24 17:17:55 -05:00
Anuken bcaf5e4c3d Campaign balance / Smarter power node placement 2020-11-24 16:33:36 -05:00
Anuken 61bec243dc Campaign balance 2020-11-24 12:35:04 -05:00
CPXMCandGitHub 9f8e1b93f1 Update bundle_zh_CN.properties 
单位，方块，物品的简介翻译交给你们了（滑稽
 2020-11-24 22:02:28 +08:00
Angel_24andGitHub 38f4154d18 Update bundle_es.properties 2020-11-24 10:47:35 +01:00