mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-25 02:15:37 +07:00
Code Issues Packages Projects Releases Wiki Activity
15,820 Commits 4 Branches 160 Tags 2.3 GiB
6968ccc19b
Commit Graph

3664 Commits

Author SHA1 Message Date
Github Actions
6968ccc19b Automatic bundle update 2022-11-10 22:17:45 +00:00
Anuken
bc96077d73 Merge remote-tracking branch 'origin/master' 2022-11-10 17:16:55 -05:00
Anuken
255e15d14c Added some missing block descriptions 2022-11-10 17:16:50 -05:00
Github Actions
544835fdda Automatic bundle update 2022-11-10 21:38:54 +00:00
Anuken
2642ed358a Merge remote-tracking branch 'origin/master' 2022-11-10 16:37:54 -05:00
Anuken
642d27c163 Fixed missing block name 2022-11-10 16:37:50 -05:00
Github Actions
8cdb32e476 Automatic bundle update 2022-11-10 18:43:12 +00:00
Epowerj
9457680bae Added peaks and marsh descriptions 2022-11-10 13:42:15 -05:00
Github Actions
3dfb8c4c20 Automatic bundle update 2022-11-10 16:41:24 +00:00
Catchears
d81500d99d
german translation (again) (#7232) 
* update to 9a3a6c31b3

* shawak's requested changes

* update sector names

no one has opposed them yet, so we'll give them a try

* oops, accidentally modified english bundle, reverting

* update translation to a54907583b

* changes as requested by shawak

* update to 522070be4b

* @stuffyAI's changes

* update to 69a7354468

* remove duplicate entries

new translations are quite plentiful, will take a bit to get done

* update to 99df85df1c

* vereinheitlichung - siehe commitbeschreibung

unterschied zwischen items und materialien verdeutlichen
vereinheitlichung von 'fracht' als begriff für 'payload'

ich halte diese verändernungnen für vernünftig, bin aber wie immer offen für andere vorschläge

bei 'materialeinheiten' (unit.items, zeile 976) bin ich mir unsicher, ob der begriff inzwischen veraltet ist (stattdessen lieber items?) - er wird nur an zwei stellen benutzt, die nur vor jahren bearbeitet wurden. ich habe ihn erstmal beibehalten.

* update to f968a8689c

* update to 85228bad0a

* update to e3d1a04626

* update to 634ece405f

I'll probably be keeping this PR more up to date as we get closer to v7 release date, feel free to unsub from the PR if it gets annoying.

* update to ebb37f4abe

* der Mod -> die Mod

Mod, abgeleitet von Modifikation (f), sollte mMn weiterhin feminin bleiben.

* update to 8f9736d1d9

* update to c3d9a501c6

hopefully final update

* add changes from https://github.com/Anuken/Mindustry/pull/6999/files

Co-authored-by: end-me-please <90796271+end-me-please@users.noreply.github.com>

Co-authored-by: end-me-please <90796271+end-me-please@users.noreply.github.com>
 2022-11-10 11:40:35 -05:00
Даркнесс#3729
2a11ac6414
fixes (#7856) 2022-11-10 09:18:09 -05:00
Github Actions
89e3f2a2fa Automatic bundle update 2022-11-10 13:24:03 +00:00
Даркнесс#3729
fcca002823
[Translation] RU V7 translation (#7785) 
* [Translation] RU V7 translation

* Категории процессоров

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* 👀

* Update bundle_ru.properties

* скилл исьюше

* Подсказки для командного режима

* Немного перевел цели секторов

* попробовал сделать описания юнитов :/

* Update bundle_ru.properties

* Update bundle_ru.properties

* дрели

* Create bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* нагрев -> тепло

* Подсказки

* Update contributors

* Update bundle_ru.properties

* скилл иссуе

* Update bundle_ru.properties

Co-authored-by: Evgenij <86189625+Kowkodivka@users.noreply.github.com>
Co-authored-by: Slotterleet <62336673+Slotterleet@users.noreply.github.com>
 2022-11-10 08:22:10 -05:00
Jerzozwierz
11e35370be
Update bundle_pl because 11.11 is close (#7853) 2022-11-09 14:14:37 -05:00
Nunting
b0303e84a3
Update bundle_ko.properties (#7850) 2022-11-09 08:47:50 -05:00
Github Actions
e5e41b497d Automatic bundle update 2022-11-09 02:46:35 +00:00
Anuken
52d2d25790 Merge remote-tracking branch 'origin/master' 2022-11-08 21:44:53 -05:00
Anuken
c3d9a501c6 Campaign completion text in bundle 2022-11-08 21:44:47 -05:00
Nunting
baa7580e13
Update bundle_ko.properties (#7806) 2022-11-08 18:47:17 -05:00
MEEPofFaith
8f9736d1d9
Make certain negative stats red (#7842) 2022-11-07 21:28:28 -05:00
Github Actions
4050812b84 Automatic bundle update 2022-11-07 16:28:17 +00:00
Anuken
927566e038 Merge remote-tracking branch 'origin/master' 2022-11-07 11:27:11 -05:00
Anuken
a329c4944b Fixed #7839 2022-11-07 11:27:07 -05:00
Github Actions
47a38d2bb8 Automatic bundle update 2022-11-07 15:22:08 +00:00
SoMall-dumpling
d20f4c42a7
Update bundle_zh_CN.properties (#7666) 
* Update bundle_zh_CN.properties

Translations for v139

* Update bundle_zh_CN.properties

abcigch的建议/其他修改

* Update bundle_zh_CN.properties

保姆级教学

* Update bundle_zh_CN.properties

补完

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

地图名字太难翻译啦！但是还是要翻译！怎么办！

* Update bundle_zh_CN.properties

先这样吧

* Update bundle_zh_CN.properties

a tweak to origin
 2022-11-07 10:21:20 -05:00
Github Actions
14984f6a02 Automatic bundle update 2022-11-07 14:44:21 +00:00
ThatOneBepis
e428e33cd2
Update bundle_sr.properties (#7810) 
Co-authored-by: Anuken <arnukren@gmail.com>
 2022-11-07 09:43:16 -05:00
Github Actions
d91a338f3d Automatic bundle update 2022-11-05 21:08:33 +00:00
Angel-24
9537cad965
Update bundle_es.properties (#7767) 
* Update bundle_es.properties

Updated spanish translation. Tutorials, mods messages, and more.

* Update bundle_es.properties

* ImUrX's review

* Bloques "integrados" -> Bloques "estáticos"

Renamed "world" blocks.

* Update bundle_es.properties

Co-authored-by: Anuken <arnukren@gmail.com>
 2022-11-05 17:07:50 -04:00
Github Actions
58e9d641f0 Automatic bundle update 2022-11-04 23:35:50 +00:00
Garen7
82fffb1285
Adds select all unit production hotkey (#7824) 
Co-authored-by: Garen7 <Garen7@users.noreply.github.com>
 2022-11-04 19:34:44 -04:00
Github Actions
e7b7fc971a Automatic bundle update 2022-11-04 22:00:43 +00:00
RTOmega
6ecf9b1e73
TR V7 Translate (#7822) 
wow this took a really long time
 2022-11-04 17:59:50 -04:00
Github Actions
e073eca93c Automatic bundle update 2022-11-03 16:15:17 +00:00
Anuken
4e5bc8fc94 Rebuild select hint 2022-11-03 12:11:35 -04:00
Anuken
b8e245f945 Tested and fixed Steam achievements 2022-11-03 11:37:37 -04:00
Github Actions
f21cea225b Automatic bundle update 2022-11-03 13:04:48 +00:00
osoitz
e12aee6961
Update bundle_eu.properties (#7727) 
Co-authored-by: Anuken <arnukren@gmail.com>
 2022-11-03 09:03:55 -04:00
Github Actions
6abb549b18 Automatic bundle update 2022-11-03 12:59:57 +00:00
Nunting
161bb87eb8
Update bundle_ko.properties (#7800) 2022-11-03 08:58:59 -04:00
Anuken
d1f7fce7f9 Merge remote-tracking branch 'origin/master' 2022-11-03 08:45:13 -04:00
Anuken
cef2778d43 Fixed #7803 2022-11-03 08:45:07 -04:00
Github Actions
4c0664c068 Automatic bundle update 2022-11-02 14:02:46 +00:00
Anuken
ebb37f4abe Fixed ability descriptions 2022-11-02 10:01:43 -04:00
Catchears
5c353b1807
this game -> mod caused errors (#7799) 2022-11-01 19:38:53 -04:00
Anuken
4aae1d7c9e Merge remote-tracking branch 'origin/master' 2022-11-01 02:00:11 -04:00
Anuken
8b13298468 Desc typo fix 2022-11-01 02:00:07 -04:00
Github Actions
df056d0f6a Automatic bundle update 2022-11-01 05:59:47 +00:00
Anuken
9d343057c6 Fixed #7790 2022-11-01 01:59:00 -04:00
Epowerj
4e8e65d1dd Updated sector descriptions 2022-10-31 19:17:36 -04:00