Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,711 Commits 4 Branches 180 Tags
c1cd84593dfbf482079018e535ff066b71488c45
Commit Graph
1897 Commits
Author SHA1 Message Date
Anuken c1cd84593d Merge pull request #2194 from driver1748/patch-1 
Corrected some translations
 2020-07-14 14:58:35 -04:00
Anuken 85d67db1ed Merge pull request #2175 from AlbertCerfeda/patch-2 
Minor changes
 2020-07-14 14:58:13 -04:00
Anuken fe0d3cfe22 Merge pull request #2140 from soytheLB/patch-5 
Update bundle_es.properties
 2020-07-14 14:56:30 -04:00
Anuken 1661905d9b Merge pull request #2106 from PetrGasparik/v105 
Czech translation - up to date!
 2020-07-14 14:56:09 -04:00
Anuken ca1e43d79c Merge branch 'master' into patch-2 2020-07-14 14:52:28 -04:00
Anuken 43676b68bf Merge pull request #2105 from TheJaaju/patch-4 
Update bundle_fi.properties
 2020-07-14 14:49:27 -04:00
Anuken 752cccb588 Merge pull request #2062 from GioIacca9/patch-11 
Minor changes
 2020-07-14 14:45:51 -04:00
Anuken 064a0545a8 Merge pull request #1941 from bluet-it/master 
add bundle_hu
 2020-07-14 10:41:34 -04:00
Anuken a33ac30a01 Merge pull request #1595 from andreasgamborg/patch-1 
Create bundle_da.properties
 2020-07-14 10:41:28 -04:00
Anuken 6d7d4bcba1 Merge pull request #2028 from burunduk/patch-2 
Update bundle_uk_UA.properties
 2020-07-14 10:40:34 -04:00
Anuken b541cfcc75 Update bundle_zh_TW.properties (#2081) 
* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties
 2020-07-14 10:37:54 -04:00
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
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
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
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
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
Anuken c12865eabc Removed reload, forced mandatory mod restart 2020-06-25 22:31:47 -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
Anuken 58d8e22b40 Added smooth camera option 2020-06-22 13:40:04 -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 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 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
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
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
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
Ali-C-Ila 0e7c70fe3c Update bundle_zh_TW.properties 2020-06-04 18:44:30 +08:00
soytheLB d2d0be7759 Update bundle_es.properties 
added line 275 respawn
changed  waves.boss to waves.guardian

added bar.units
removed bar.
 2020-06-04 05:16:04 -03:00
Anuken 69d0751e65 Cleanup 2020-06-01 18:55:19 -04:00
Ali-C-Ila 95ade7f32a Update bundle_zh_TW.properties 2020-05-30 19:48:14 +08:00