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

2118 Commits

Author SHA1 Message Date
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
Math2128
baa0d5a951 Update bundle_fr.properties 
1030
 2020-06-14 18:46:32 -04:00
Math2128
9e105dbce5 Update bundle_fr.properties 
971
 2020-06-14 14:13:15 -04:00
Math2128
a7a31f6c35 Update bundle_fr.properties 
837
 2020-06-14 00:33:57 -04:00
Math2128
917db20e76 Update bundle_fr.properties 2020-06-10 23:10:00 -04:00
Math2128
c5df9aa814 Update bundle_fr.properties 
Ligne 644: Le jeu ne se met pas en pause pendant que l'on construit, même avec cette option de cocher. En fait, cela met la construction sur pause et attend que l'on appuie sur la touche E (par défaut) pour confirmer la construction. Je trouvais l'ancien nom assez trompeur, et je l'ai donc changer comme cela. 

I'm at line 762
 2020-06-10 19:20:31 -04:00
Math2128
61d212128a Update bundle_fr.properties 
line 709
 2020-06-09 23:47:13 -04:00
Math2128
778b61914a Update bundle_fr.properties 
Correction de quelques fautes de frappe lors des modifications des descriptions des tourelles.
Fixed some typos about turret descriptions.
 2020-06-09 14:04:00 -04:00
Math2128
758b327639 Update bundle_fr.properties 
Quelques changements aux descriptions des tourelles pour s'ajuster aux définitions anglaises et dans le but d'homogénéiser les descriptions. Je ne suis pas sur au niveau du Cyclone.
Some changes about the turret descriptions to fit more the english description.
 2020-06-08 15:07:50 -04:00
Math2128
be50ededcd Update bundle_fr.properties 
Because I made typos translating the tutorial
 2020-06-07 21:35:00 -04:00
Math2128
f7a7521120 Update bundle_fr.properties 
Worked on the « may be subject to a lot of changes» tutorial.
 2020-06-07 21:09:40 -04:00
Math2128
5ca1d66755 Update bundle_fr.properties 2020-06-07 20:01:36 -04:00
Anuken
36ce04e8f0 fuse fix 2020-06-07 18:26:45 -04:00
Petr Gašparík
cd1918e337 Czech translation - update with cleanups 2020-06-08 00:00:56 +02:00
Petr Gašparík
269a92a723 Merge branch 'master' of https://github.com/Anuken/Mindustry into v105 2020-06-07 23:56:42 +02:00
Math2128
68cfd1790a Update bundle_fr.properties 
Line 633
 2020-06-07 13:44:12 -04:00
키에르
09d42773a6 Match 69d0751e65 2020-06-07 22:29:03 +09:00
키에르
b9b57f7908 Finish 2020-06-07 22:03:43 +09:00