Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,633 Commits 4 Branches 180 Tags
85d32cd5102fb314dbc6b3b56ba8eb33f4e4da46
Commit Graph

2135 Commits

Author SHA1 Message Date
Ali-C-Ila
6c52812a0d Update bundle_zh_TW.properties (#2054) 2020-07-14 10:37:41 -04:00
Lapis
360494af50 Update bundle_ja.properties (#2046) 
* update bundle_ja.properties

* update bundle_ja.properties

* update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

* removed experimental tag

* Small fix

* fix typo

* bundle_ja.properties

* Small fix

* Small fix

* Update bundle_ja.properties

* Update bundle_ja.properties

* add waves.guardian

* Fixed setting.atmosphere.name translation

* translation of waves.shields

* Update bundle_ja.properties
 2020-07-14 10:37:22 -04:00
Felix Corvus
83d334582b Update bundle_ru.properties 
Changes from https://github.com/Anuken/Mindustry/pull/2225
 2020-07-14 07:24:40 +03:00
Ubuntu8406
982b7f33bc A small update of the finnish translation 2020-07-13 19:10:40 +03:00
Petr Gašparík
a0ef83fb62 Czech translation - small improvement 2020-07-13 10:43:31 +02:00
Petr Gašparík
682bfcc8e8 Merge branch 'master' of https://github.com/Anuken/Mindustry into v105 2020-07-13 10:42:30 +02:00
Anuken
9cb4645b11 More unit progress 2020-07-10 20:04:45 -04:00
T1NT4
b81de5ebe4 Update bundle_pt_BR.properties 
changed the revenant factory description to match the revenant unit description on the database, and also fixed the revenant factory description so it no longer says that revenant are ground units
 2020-07-10 18:00:12 -03:00
Anuken
b95206cf87 Support for jar mods on desktop 2020-07-07 09:34:52 -04:00
Anuken
a6523630bf Unit sprite cleanup 2020-07-06 11:05:37 -04:00
Catchears
8a5f19e4f9 Changes from stuffAI 2020-07-06 13:08:48 +02:00
Janek
14f975bde7 Unify Tutorial terminology in german translation 
A friend of mine was playing through the tutorial and was confused by the term "Turm", since the duo is translated as "Geschütz", so he didn't quite know what the tutorial wanted. This unifies the terminology, since in the beginning you only have one "Geschütz" choice anyways.
 2020-07-05 17:54:48 +02:00
Anuken
ee3aedc75f Implemented core item display (WIP) 2020-07-02 15:27:02 -04:00
Anuken
cecb5cf4b4 Added tractor beam turret 2020-07-02 14:02:33 -04:00
Anuken
5f6c71b9d3 Replaced concept of "turns" with raw seconds 2020-07-01 11:50:33 -04:00
Anuken
df4278a646 Removed item core restrictions 2020-06-29 19:32:15 -04:00
WinterUnderTheSnow
679aab18ee *Phantom is now Phenom too 
XD
 2020-06-29 10:07:53 +08:00
Anuken
b3f29f100d Custom launch items 2020-06-28 13:33:53 -04:00
Prosta4okua
24071ed23b Merge branch 'master' into master 2020-06-28 19:41:37 +03:00
Prosta4okua
e1e9b28bf1 Ненужная большая буква + обновление с master. 
1. Вы -> вы
2. Ваш -> ваш
«Вы» используется только в деловом общении.
 2020-06-28 19:34:12 +03:00
Anuken
6386cae19a Launching dialog bugfixes & requirement display 2020-06-28 11:40:03 -04:00
WinterUnderTheSnow
b12d3ae0ba Corrected some translations 
4,5 Noticed that using discord in China need some unusual ways.
19 ‘Gameover’ not ‘Your core has been destroyed!’
105 Mod guide is actually guiding you how to make a mod 
116 ‘dependences’refers to ‘mods needed’,not ‘condition needed’
126 ‘import mod from GitHub’sounds better than’import github mod’
151 I think ‘Your are not invited to play on this server’ sounds better than ‘You are not in the whitelist’.This will stop noobs spamming everywhere.
155 ‘Server admin’ but not ‘Room owner’
156,193,203,206 ‘ban’ is better than ‘blacklist’
195 added one this server’
1000 phantom?Why not Phenom(Yes that CPU) XD (In fact ‘神魂修理机’ is a joke too)
 2020-06-28 21:40:17 +08:00
Anuken
80332e37d5 Upgradeable cores 2020-06-27 19:16:39 -04:00
Catchears
bec394abbc Fix translations 2020-06-26 08:43:39 +01:00
Anuken
c12865eabc Removed reload, forced mandatory mod restart 2020-06-25 22:31:47 -04:00
Catchears
f4f5658fee Revert "Revert "Small comma fix"" 
This reverts commit 62399d0f2b.
 2020-06-25 13:22:50 +01:00
Catchears
62399d0f2b Revert "Small comma fix" 
This reverts commit 47ec565316.
 2020-06-25 13:22:39 +01:00
Catchears
47ec565316 Small comma fix 2020-06-25 11:06:28 +01:00
Catchears
0f224c7780 Add / improve translations again 2020-06-25 11:02:48 +01:00
Catchears
946ac8eefb Change capitalisation due to a mistake 2020-06-25 09:45:21 +01:00
Petr Gašparík
f0882d8d5e Czech translation - up to date 2020-06-22 23:19:57 +02:00
Petr Gašparík
e3735ffa9c Merge branch 'master' of https://github.com/Anuken/Mindustry into v105 2020-06-22 22:54:57 +02:00
Math2128
185e4334f6 Update bundle_fr.properties 
Update to the main bundle
 2020-06-22 13:52:06 -04:00
Anuken
58d8e22b40 Added smooth camera option 2020-06-22 13:40:04 -04:00
Catchears
af7b7ef2b1 Improved german translation. 2020-06-21 20:03:46 +01:00
Anuken
6bcc103cf7 Research system progress 2020-06-19 19:31:14 -04:00
Anuken
63eee99aba Merge remote-tracking branch 'origin/master' 2020-06-19 12:26:48 -04:00
Anuken
2280ed6071 Research block tweaks / Merged in #1927 2020-06-19 12:26:41 -04:00
Albert Cerfeda
5a1c9ce785 Minor changes 2020-06-19 15:53:21 +02:00
Albert Cerfeda
2ee518c9fc Uppercase initial of 'Trello' (#2174) 2020-06-19 08:06:31 -04:00
Anuken
e88ff1a358 Minor UI tweaks 2020-06-17 15:07:20 -04:00
Anuken
3c02234a3b Ammo resupply point implementation 2020-06-17 10:41:26 -04:00
Math2128
cecfe77e95 Update bundle_fr.properties 
Translated new stuffs + fixed two mistakes.
 2020-06-15 15:06:42 -04:00
Anuken
90b0650af9 Merge remote-tracking branch 'origin/master' 2020-06-15 09:58:54 -04:00
Anuken
d04ce2a750 Block damage multiplier rule 2020-06-15 09:58:46 -04:00
Cyberman
3dfad51e93 Update bundle_nl.properties 
Just a few things I had time for.
 2020-06-15 15:49:10 +02:00
ILiekMelons
dbe482d494 Fixed disassembler and overdrive projector (#2163) 
I misspelt disassembler and forgot to put a .name somewhere 😅
 2020-06-15 09:44:38 -04:00
Math2128
db77cfa3b5 Update bundle_fr.properties 
added the new stuff from the main bundle + fixed a typo
 2020-06-15 02:02:04 -04:00
Math2128
ac14f43107 Update bundle_fr.properties 
1125
 2020-06-14 20:45:10 -04:00
ILiekMelons
2a7da8c80e Add names for new drones and machines (#2162) 
* Add in names for drone-related things

* Various machines added

* extra newline that i removed
 2020-06-14 20:43:25 -04:00