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

3259 Commits

Author SHA1 Message Date
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
Anuken
313cadb763 Minor cleanup / Trail experiment 2020-06-27 09:20:52 -04:00
Anuken
0847b20401 Cleanup 2020-06-26 18:50:30 -04:00
Anuken
7401c16ded Team-colored shields 2020-06-26 18:42:29 -04:00
Anuken
fdf7c88083 argh 2020-06-26 14:27:26 -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
Anuken
ecfac00c30 Arc 2020-06-25 12:54:55 -04:00
Anuken
d90807b29c Bugfixes 2020-06-25 12:51:30 -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
Anuken
19cb144cdb Minor GL fixes 2020-06-24 20:37:49 -04: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
Anuken
47b06d0eac Added sandstorm weather 2020-06-22 11:10:12 -04:00
Catchears
af7b7ef2b1 Improved german translation. 2020-06-21 20:03:46 +01:00
Anuken
4a8be42258 Lowercase enums 2020-06-21 12:38:59 -04:00
Anuken
6f1a64db78 Updated atlas with correct enum names 2020-06-21 12:25:11 -04:00
Anuken
6517eaf62f Implemented #2177 2020-06-21 10:33:08 -04:00
Anuken
ec4a5880b7 Fixed #2178 2020-06-20 09:07:35 -04: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
31708b9af7 Exception parsing cleanup 2020-06-18 18:47:34 -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
Anuken
2e42526e90 Fixed up Discord RPC 2020-06-16 14:13:43 -04:00
Anuken
918c9492df Changing discord RPC system 2020-06-16 13:43:00 -04:00
Math2128
cecfe77e95 Update bundle_fr.properties 
Translated new stuffs + fixed two mistakes.
 2020-06-15 15:06:42 -04:00
Anuken
7001ad09cb Support for team-only lighting 2020-06-15 13:54:02 -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
Anuken
5f79040faa Testing doc script 2020-06-14 18:41:42 -04:00
Math2128
9e105dbce5 Update bundle_fr.properties 
971
 2020-06-14 14:13:15 -04:00
Anuken
1823bc8f15 Support for compiling on Java 14 2020-06-14 11:10:54 -04:00
Math2128
a7a31f6c35 Update bundle_fr.properties 
837
 2020-06-14 00:33:57 -04:00