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,876 Commits 4 Branches 160 Tags 2.3 GiB
f7f3d5bde3
Commit Graph

5789 Commits

Author SHA1 Message Date
Anuken
f7f3d5bde3 Revert hold time 2022-11-13 13:26:19 -05:00
Anuken
3a4a37cf0c Fixed mod version requirement text missing 2022-11-13 11:14:04 -05:00
Github Actions
4f912f25ee Automatic bundle update 2022-11-13 15:05:50 +00:00
Slotterleet
3ca68e426c
[RU] Fixed typos and new translations (#7897) 
* [RU] Fixed typos and new translations

* One. Single. Typo.

* New Onset objective
 2022-11-13 10:05:14 -05:00
Joan Josep
20f8fd79ff
Update bundle_ca.properties (#7907) 
Co-authored-by: Anuken <arnukren@gmail.com>
 2022-11-13 10:04:54 -05:00
OpalSoPL
d4a7b49233
Update bundle_pl.properties (#7891) 
small change in translation (line 1811 only)
 2022-11-13 09:58:51 -05:00
Nunting
0db2e40e27
Update bundle_ko.properties (#7889) 2022-11-13 09:58:44 -05:00
SoMall-dumpling
6a8fe28e70
Update bundle_zh_CN.properties (#7888) 
* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties
 2022-11-13 09:58:34 -05:00
Angel-24
23067674c9
Update bundle_es.properties (#7848) 2022-11-13 09:58:24 -05:00
Github Actions
883ecb97d0 Automatic bundle update 2022-11-13 14:36:41 +00:00
Anuken
4c51b97667 Fixed #7893 / Fixed #7902 2022-11-13 09:35:48 -05:00
Anuken
7d695784d1 Merge remote-tracking branch 'origin/master' 2022-11-11 15:08:42 -05:00
Anuken
59ca257cca Fixed #7874 2022-11-11 15:08:38 -05:00
Epowerj
bf9d61ce3a Updated onset description 2022-11-11 10:26:49 -05:00
SoMall-dumpling
a1cc3b4b26
Update bundle_zh_CN.properties (#7870) 2022-11-11 06:18:29 -05:00
Github Actions
8b197b378f Automatic bundle update 2022-11-11 10:36:04 +00:00
Phinner
4b73d809f0
Finishing french translation for release (#7774) 
* partial translation

* equalize to the original file

* translated 1775 to 1794

* 1805 to 1831 + escaping [

* 791, 792, 793 + hortifixes

* small translations

* yay, more merged translations
 2022-11-11 05:35:06 -05:00
SoMall-dumpling
55d490159f
Update bundle_zh_CN.properties (#7869) 2022-11-11 05:34:27 -05:00
Даркнесс#3729
df3e455666
translate new texts, fix old (#7867) 2022-11-11 05:24:40 -05:00
Nunting
7cdd383509
Update bundle_ko.properties (#7868) 2022-11-11 05:24:30 -05:00
Github Actions
7fd91fc584 Automatic bundle update 2022-11-11 02:42:15 +00:00
ThatOneBepis
09a3928cb1
Update bundle_sr.properties (#7862) 2022-11-10 21:41:28 -05:00
end-me-please
45bbc16a8f
update german translation (#7860) 
* updated german translation

* sector descriptions

* ,
 2022-11-10 19:24:09 -05:00
Anuken
09f96b1477 Merge remote-tracking branch 'origin/master' 2022-11-10 19:00:39 -05:00
Anuken
c0da3e6e9f fabric 2022-11-10 19:00:35 -05:00
Github Actions
ec124652e4 Automatic bundle update 2022-11-10 23:57:28 +00:00
Anuken
479cf85a3b Merge remote-tracking branch 'origin/master' 2022-11-10 18:56:39 -05:00
Anuken
c3906ebae1 Merge remote-tracking branch 'origin/master' 2022-11-10 18:56:36 -05:00
Thomas Widyantoko
6ebe78e4b5
added Erekir descriptions and stuffs (#7548) 
- erekt
- ravine sector description
- erekir core descriptions
- processors

more later

Co-authored-by: Anuken <arnukren@gmail.com>
 2022-11-10 18:56:36 -05:00
Anuken
463afaafe8 wording 2022-11-10 18:56:26 -05:00
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
Anuken
ef526a6d83 Merge remote-tracking branch 'origin/master' 2022-11-09 13:29:17 -05:00
Anuken
be72da71de map name 2022-11-09 13:29:13 -05:00
Nunting
b0303e84a3
Update bundle_ko.properties (#7850) 2022-11-09 08:47:50 -05:00
Anuken
37f1760a59 Renamed 'erekir waves map' 2022-11-09 08:45:11 -05:00
Anuken
8d255b3ccd Fixed #7852 2022-11-09 08:31:19 -05:00
Anuken
1842e9d139 Merge remote-tracking branch 'origin/master' 2022-11-09 08:30:01 -05:00