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

1850 Commits

Author SHA1 Message Date
WinterUnderTheSnow
679aab18ee *Phantom is now Phenom too 
XD
 2020-06-29 10:07:53 +08: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
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
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
Anuken
69d0751e65 Cleanup 2020-06-01 18:55:19 -04:00
Anuken
780c4208bb Cleanup 2020-05-29 13:58:53 -04:00
Anuken
d851a09944 Cleanup 2020-05-29 13:52:42 -04:00
Anuken
0e59a22cbe Respawn key 2020-05-24 22:27:14 -04:00
Anuken
e8869c07fe Removed respawn time rule 2020-05-24 17:05:31 -04:00
Anuken
f250008db3 Cleanup 2020-05-22 20:00:02 -04:00
Anuken
78f24b8840 Support for wave shields 2020-05-20 17:16:18 -04:00
Przemyslaw Paluch
0af1e549f8 Fixed typos in Polish translation (#2083) 2020-05-18 20:24:21 -04:00
zethnest
dafe629c1d fix coloring (#2077) 2020-05-18 08:37:10 -04:00
Anuken
6938c69d97 Minor planet dialog polish 2020-05-15 22:24:01 -04:00
sk7725
8c501fa10b [KO] Small Revert (#2059) 
Readd translator credits(Kieaer said he removed it temporarily, and also https://discord.com/channels/391020510269669376/395414970793459714/710497552071655484)
 2020-05-14 22:00:24 -04:00
Anuken
8abe6c4270 Merge remote-tracking branch 'origin/master' 2020-05-13 17:05:10 -04:00
Anuken
04dc701c25 Various campaign-related tweaks 2020-05-13 17:04:59 -04:00
zethnest
2dfa334ba6 Lowercases ColorNames (#2053) 
* lowercase colornames

* change yellow to accent
 2020-05-13 14:38:26 -04:00
ian
b758b69243 Partially add to and fix swedish translations (#2052) 2020-05-13 14:37:05 -04:00
Anuken
ab49825d35 Merge remote-tracking branch 'origin/master' 2020-05-12 21:34:40 -04:00
Anuken
6a22d45320 Prototype unit cap mechanic 2020-05-12 21:34:27 -04:00
Summet
fea5142955 Replaced all upper-case colors to lower-case (#2044) 2020-05-12 20:03:35 -04:00
Alberto Galera
4910afbc82 Fix translation typo (#2045) 
* Fix translation typo

* typo
 2020-05-12 20:03:23 -04:00
sk7725
911424b2e2 Changed [lighthray] to [lightgray] (#2033) 
If somehow the color [lighthray] will be added, ignore this pull request!
 2020-05-11 21:23:50 -04:00
Lapis
130eee35ec Update bundle_ja.properties (#2029) 
* 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
 2020-05-11 10:46:34 -04:00
TheMainOne
a5b235d829 Fixed "Restart required" (#2025) 2020-05-10 22:56:24 -04:00
Lapis
1514f9f7ec Update bundle_ja.properties (#2026) 
* 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
 2020-05-10 22:48:14 -04:00
Anuken
07701f8c01 Merge remote-tracking branch 'origin/master' 2020-05-10 13:34:57 -04:00
Anuken
2cb9cfb097 Cleanup 2020-05-10 13:34:52 -04:00
DLJ-345
11d2ed06cd Update bundle_fi.properties (#2020) 2020-05-10 12:27:44 -04:00
Lapis
53d60e9cf6 Update bundle_ja.properties (#2013) 
* 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
 2020-05-09 10:21:34 -04:00
valtsu41
dcaf0dded5 Better zone naming in finnish (#2008) 2020-05-08 18:28:20 -04:00
cinnx
21e446e6f0 Update bundle_pl.properties (#2010) 
updated, fixed and translated some phrases.
thanks @Kubek0212 for reporting old description of power nodes ❤
 2020-05-08 16:43:11 -04:00
laohuaji233
e5e325b25b Update bundle_zh_CN.properties (#2007) 2020-05-08 09:20:44 -04:00
Lapis
1fd22f6d10 Small fix bundle_ja.properties (#1992) 
* 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
 2020-05-07 20:17:29 -04:00
TheSlaylord
a0c747407f Update bundle_ru.properties (#2004) 
Removed experimental tag
 2020-05-07 20:17:21 -04:00
LFlicker
735187e78a Update bundle_ko.properties (#1986) 
* Update bundle_ko.properties

Typo correction

* Update bundle_ko.properties

* Update bundle_ko.properties

Typo Correction
 2020-05-05 11:06:32 -04:00
Koteyka_by
c920902481 Update bundle_be.properties (#1977) 
Fix a errors in a translate
 2020-05-04 09:09:58 -04:00