mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-06 08:57:45 +07:00
Code Issues Packages Projects Releases Wiki Activity
16,920 Commits 4 Branches 160 Tags 2.3 GiB
dbea2e2161
Commit Graph

3885 Commits

Author SHA1 Message Date
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
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
Github Actions
cafc0aa2d4 Automatic bundle update 2022-10-30 20:47:27 +00:00
Anuken
8459e68cfa Added rebuild region key on desktop 2022-10-30 16:46:36 -04:00
Github Actions
cfe57e75ce Automatic bundle update 2022-10-30 18:53:13 +00:00
Anuken
0ee054b310 Added "select all units" keybind 2022-10-30 14:52:12 -04:00
Github Actions
d73bd9e4f9 Automatic bundle update 2022-10-30 13:02:51 +00:00
Anuken
76c99400a4 Added message blocks for Erekir and the editor 2022-10-30 09:01:42 -04:00
Github Actions
c654067822 Automatic bundle update 2022-10-29 17:51:31 +00:00
Epowerj
f100bd177f Updated bundle for origin 2022-10-29 13:50:36 -04:00
The Serjio
7d6fff1e37
Tiny romanian translation fix (#7781) 
Changed (0) to {0}
 2022-10-28 17:38:18 -04:00
Github Actions
e9460c383e Automatic bundle update 2022-10-26 20:27:49 +00:00
Anuken
ba10fc252c Moved Payload Propulsion Tower to Erekir 2022-10-26 16:26:12 -04:00
Github Actions
1bae0ea96a Automatic bundle update 2022-10-23 15:25:52 +00:00
Anuken
a33c482ead Fixed #7755 2022-10-23 11:25:00 -04:00
Github Actions
2e42d19913 Automatic bundle update 2022-10-21 00:35:46 +00:00
Anuken
f8174eac53 Merge remote-tracking branch 'origin/master' 2022-10-20 20:01:48 -04:00
Anuken
55bc0846ae Better mod state errors 2022-10-20 20:01:43 -04:00
Github Actions
1c951422dc Automatic bundle update 2022-10-20 23:14:31 +00:00
Anuken
7409ff7fd8 Blacklisted ui-lib (startup crash) 2022-10-20 19:13:39 -04:00
Github Actions
1489095267 Automatic bundle update 2022-10-19 02:49:08 +00:00
Epowerj
634ece405f Added karst and crossroads to campaign 2022-10-18 22:48:15 -04:00
Anuken
1ea89190d4 Merge remote-tracking branch 'origin/master' 2022-10-18 12:56:12 -04:00
Anuken
769c0782f4 Bundle planet description fix 2022-10-18 12:56:07 -04:00
Angel-24
908842f556
Update bundle_es.properties (#7686) 
* Update bundle_es.properties

* Update bundle_es.properties

Naii-the-Baf and Uriel's reviews.
 2022-10-18 10:28:27 -04:00
Github Actions
dee897c6a8 Automatic bundle update 2022-10-15 21:14:11 +00:00
Anuken
4fa0c55b75 Ground Zero turret supply objective 2022-10-15 17:13:20 -04:00
FlippingPotatoes
0ca33477d8
Expand getBlock functionality (#7702) 
* Update LExecutor.java

* Update LUnitControl.java

* Update LExecutor.java

* Update LExecutor.java

* Update LExecutor.java

* Update LExecutor.java

* Update bundle.properties

* Update bundle.properties

* Update bundle.properties

* Update LExecutor.java
 2022-10-13 10:13:17 -04:00
Github Actions
2be787f810 Automatic bundle update 2022-10-13 11:47:26 +00:00
Catchears
e3d1a04626
remove unused entry (#7703) 2022-10-13 07:46:33 -04:00
Github Actions
a21319dcf4 Automatic bundle update 2022-10-10 23:20:35 +00:00
Anuken
dea70e9d71 Merge remote-tracking branch 'origin/master' 2022-10-10 19:19:44 -04:00
Anuken
44aa9d0bda Moved Onset tutorial into bundle 2022-10-10 19:19:40 -04:00
Github Actions
b0dfc0664c Automatic bundle update 2022-10-10 23:06:22 +00:00
Anuken
8104173b31 Ground zero tutorial from #7532 2022-10-10 19:05:23 -04:00
Github Actions
b67f4e04a2 Automatic bundle update 2022-10-10 21:33:10 +00:00
Epowerj
2eb3e5e034 Added siege to campaign 2022-10-10 17:31:58 -04:00
Github Actions
8ca31aa973 Automatic bundle update 2022-10-10 12:00:44 +00:00
Anuken
fd849494cc Fixed #7685 2022-10-10 07:59:47 -04:00
Joan Josep
f1bf6e5e43
Update bundle_ca.properties (#7676) 2022-10-08 07:53:31 -04:00
Github Actions
72b408158d Automatic bundle update 2022-10-08 00:25:32 +00:00
Epowerj
4446be612f Added crevice to campaign 2022-10-07 20:24:38 -04:00
ThatOneBepis
e9cdbf39a1
Update bundle_sr.properties (#7673) 2022-10-07 17:56:20 -04:00
Nunting
2ac689aacc
Update bundle_ko.properties (#7672) 2022-10-07 11:57:49 -04:00
Github Actions
35f4219e17 Automatic bundle update 2022-10-06 18:19:14 +00:00
Anuken
ae8f1fa5b1 Merge remote-tracking branch 'origin/master' 2022-10-06 14:18:00 -04:00
Anuken
b69cf34494 Rule cleanup/clarification 2022-10-06 14:17:55 -04:00
Github Actions
e724f025af Automatic bundle update 2022-10-06 18:15:40 +00:00
MEEPofFaith
a7c7238cc8
Whitelist Option + Hiding Banned Blocks Rules (#7553) 
* Whitelist Option

* Hide banned blocks rule
 2022-10-06 14:14:48 -04:00
Github Actions
e71c76956c Automatic bundle update 2022-10-04 20:19:13 +00:00
Angel-24
3c5f05d5df
Update bundle_es.properties (#7491) 
Co-authored-by: Anuken <arnukren@gmail.com>
 2022-10-04 16:18:28 -04:00
Github Actions
a2c73a748e Automatic bundle update 2022-10-04 20:13:38 +00:00
JniTrRny
ceba055406
Update bundle_th.properties (#7200) 
Co-authored-by: Anuken <arnukren@gmail.com>
 2022-10-04 16:12:40 -04:00
Anuken
ca4f710ec2 Bullet parts / Improved clipping in #7282 2022-10-04 15:58:40 -04:00
Github Actions
8f404869b2 Automatic bundle update 2022-10-04 17:08:35 +00:00
Anuken
c8e59ecfeb Merge remote-tracking branch 'origin/master' 2022-10-04 13:07:28 -04:00
Anuken
88d6c4c8f9 Full implementation of #7014 2022-10-04 13:07:23 -04:00
Github Actions
0dcec3366b Automatic bundle update 2022-10-04 16:07:07 +00:00
Anuken
be5eac5335 Implementation of #7325 2022-10-04 12:06:00 -04:00
Anuken
49b789fc39 Allow mixtech in sandbox / Beta release tag 2022-10-03 22:23:46 -04:00
Github Actions
645b5ecdd8 Automatic bundle update 2022-10-02 13:34:02 +00:00
TheMC2005
8a382a1715
Update bundle_hu.properties (#4908) 2022-10-02 09:33:15 -04:00
Semetrix
5af6751646
Update bundle_hu.properties (#5637) 
Co-authored-by: Anuken <arnukren@gmail.com>
 2022-10-02 09:32:43 -04:00
ManuWar73
d5c7ab74e3
10 minutes of translating... (#7474) 2022-10-01 23:06:46 -04:00
Github Actions
202d163a38 Automatic bundle update 2022-10-01 20:02:42 +00:00
Anuken
367e457b00 Merged #7437 2022-10-01 16:01:50 -04:00
Nunting
2f6aefeb6f
Update bundle_ko.properties (#7639) 2022-10-01 08:24:22 -04:00
Joan Josep
635e03a672
Update bundle_ca.properties (#7644) 2022-10-01 08:24:07 -04:00
Anuken
85228bad0a Merge branch 'master' of https://github.com/Anuken/Mindustry into map_4 2022-09-28 19:11:10 -04:00
Github Actions
9c97bbaa1c Automatic bundle update 2022-09-28 19:09:09 +00:00
Epowerj
c7dfa4a824 Added bundled objective text for stronghold 2022-09-28 15:07:48 -04:00
Anuken
5d4015387e Mark RTS AI rule as unfinished/buggy 2022-09-26 20:57:48 -04:00
Joan Josep
52759faa5d
Update bundle_ca.properties (#7623) 2022-09-25 07:13:36 -04:00
Github Actions
45c032c1cc Automatic bundle update 2022-09-21 04:13:04 +00:00
Jerzozwierz
dbf7902046
Update to bundle.pl (#7549) 
Translation was made by me and ܇۲▁⊕ᶬṉ๏൩⁷ , pożeracz cukierków#2648

Co-authored-by: Anuken <arnukren@gmail.com>
 2022-09-21 00:12:05 -04:00
ThatOneBepis
2cd85e6cc5
update bundle_sr.properties (#7544) 
* Update bundle_sr.properties

* Update bundle_sr.properties

* Dorada od Bodež u Nož (dođe na isto)
 2022-09-20 15:53:09 -04:00
Nunting
057f1ee446
Update bundle_ko.properties (#7598) 
* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties
 2022-09-20 10:35:52 -04:00
Anuken
51bb41f80d Merge remote-tracking branch 'origin/master' 2022-09-19 10:59:46 -04:00
Anuken
b1f5219b04 what on earth is wrong with jitpack this time 2022-09-19 10:59:41 -04:00
Github Actions
5f0611a945 Automatic bundle update 2022-09-19 03:34:51 +00:00
Anuken
cbd38003b1 Added initial campaign selection dialog 2022-09-18 23:33:47 -04:00
xem8k5
f39d30903a
Update bundle_zh_CN.properties (#7481) 
* 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

* 从我的pr同步

一些其他的翻译改进。这个merge以后我的那个pr应该就可以关了。

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

Co-authored-by: SoMall-dumpling <57857764+SoMall-dumpling@users.noreply.github.com>
 2022-09-17 08:36:37 -04:00
Joan Josep
0811e52618
Update bundle_ca.properties (#7552) 2022-09-16 10:58:12 -04:00
Vojtak42
cd234f03f4
Added \n and translated sentence (#7569) 
* Added \n

* Update bundle_cs.properties

* Update bundle_cs.properties
 2022-09-16 10:57:14 -04:00
Anuken
a0535395eb Unlinked global items of Serpulo and Erekir 2022-09-15 17:06:35 -04:00
Anuken
e6213dd7b4 "Name"? 2022-09-14 20:46:35 -04:00
NotFinboror
662e9c5dbb
Translations and fixes of grammatical errors (#7568) 2022-09-14 07:30:27 -04:00
Anuken
a45c0f4a42 Added crystalline stone vent variant 2022-09-12 19:47:54 -04:00
Epowerj
f968a8689c Cleaning up caldera 2022-09-10 16:53:59 -04:00
Github Actions
e279ac269b Automatic bundle update 2022-09-09 22:09:40 +00:00
AB
6c9108f370
Update bundle_pt_BR.properties (#7535) 
* Update bundle_pt_BR.properties

[Portuguese] Avisos: Evitei a tradução da parte de logic, nomes de unidades e torretas. Muitas das traduções foram adaptadas, pois de forma literal ficava estranho e "feio". 
Tradução feita e revisada durante uns 5 ou 6 dias.
Caso você encontre erros, me avise no discord: ABÊ#8931
[English] Disclaimer: I avoided translating the logic part, unit and turrets names. Many of the translations were adapted, because the literal way was strange and "ugly". 
Translation done and revised during 5 or 6 days.
If you find errors, let me know at discord: ABÊ#8931

* Update bundle_pt_BR.properties
 2022-09-09 18:08:36 -04:00
Anuken
979509acce Merge remote-tracking branch 'origin/master' 2022-09-09 14:28:45 -04:00
Anuken
f3002ef7c1 Fixed #7536 2022-09-09 14:28:36 -04:00
Github Actions
4410e90b9e Automatic bundle update 2022-09-07 22:55:23 +00:00
MEEPofFaith
31149c08ea
More control over wave sending (#7442) 
* Wave send rule

* Send natural wave command

* Use a boolean

* boolean selection

* Revert "boolean selection"

This reverts commit 01e7a8f0e0.

* Natural wave last

* I don't see why it wouldn't
 2022-09-07 18:54:26 -04:00
Github Actions
13ff9a035a Automatic bundle update 2022-09-04 20:33:05 +00:00
Anuken
6a79421040 Merge branch 'master' of https://github.com/Anuken/Mindustry 2022-09-04 16:32:16 -04:00
Anuken
08d5ca1912 Removed shield breaker block 2022-09-04 16:32:13 -04:00
Joan Josep
f8580d29fc
Update bundle_ca.properties (#7514) 2022-09-04 11:52:52 -04:00
Github Actions
337bf880ab Automatic bundle update 2022-09-02 00:57:33 +00:00
Epowerj
5810e308d4 Fixed bundle names for caldera 2022-09-01 20:55:54 -04:00
Github Actions
a2f36315b3 Automatic bundle update 2022-09-01 12:48:26 +00:00
Nunting
88e8165867
Update bundle_ko.properties (#7497) 
* Update bundle_ko.properties

Wait

* Update bundle_ko.properties

* Update bundle_ko.properties
 2022-09-01 08:47:38 -04:00
Mythril382
e8ec1c51f4
shielded wall description (#7492) 2022-08-31 22:11:18 -04:00
Github Actions
99df85df1c Automatic bundle update 2022-08-31 23:08:27 +00:00
Epowerj
72db5ff9f7 Added caldera to bundles 2022-08-31 18:56:00 -04:00
Github Actions
12906e17c9 Automatic bundle update 2022-08-31 01:18:58 +00:00
Anuken
8f4251db3a Merge remote-tracking branch 'origin/master' 2022-08-30 21:17:44 -04:00
Anuken
4cd78aad91 Fixed #7484 2022-08-30 21:17:39 -04:00
Epowerj
a0cc74891a Merge branch 'map1' 2022-08-30 15:53:09 -04:00
Cryofluid
4902c525fc
Update bundle.properties (#7482) 2022-08-30 06:46:54 -04:00
Epowerj
76997f8d47 typo 2022-08-29 17:49:03 -04:00
Github Actions
73ef72a8e3 Automatic bundle update 2022-08-29 21:45:18 +00:00
Epowerj
697e6d503f Added ravine to campaign list 2022-08-29 17:44:19 -04:00
Github Actions
d012521f23 Automatic bundle update 2022-08-29 20:55:18 +00:00
ThatOneBepis
424b0ed5d7
as per usual 2022-08-29 22:48:15 +02:00
Anuken
0d3c27dd59 Minor bundle tweaks 2022-08-29 14:26:29 -04:00
Anuken
d7abd35c97 Merge remote-tracking branch 'origin/master' 2022-08-29 13:37:54 -04:00
Anuken
07781f685d Heat wording changing 2022-08-29 13:37:49 -04:00
Phinner
ec48504bd2
French Translation: The end of the trilogy (#7434) 
* hello again

* smol but nice changes

* partial merge of #7293

The dude seems to be inactive so...

* zeta edits

* zeta edits 2

* zeta edits 3

* smol edits

* new unit translations

* many thanks xorblo-doitus

* praise language tool :)

* tiny fixes
 2022-08-29 12:40:08 -04:00
Anuken
74697a389c Updated bundles with new descriptions 2022-08-29 12:23:44 -04:00
Anuken
d7f4b15d3d WIP descriptions 2022-08-29 12:08:12 -04:00
Angel-24
f5a426bc12
Update bundle_es.properties (#7467) 
Fixed a little misapprehension.
 2022-08-28 08:18:05 -04:00
Nunting
32a8472b20
Update bundle_ko.properties (#7464) 
* Update bundle_ko.properties

Not done

* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties
 2022-08-28 08:15:20 -04:00
Github Actions
21ce48c5b5 Automatic bundle update 2022-08-27 23:47:07 +00:00
Anuken
2f45bb596b Merge remote-tracking branch 'origin/master' 2022-08-27 19:46:00 -04:00
Anuken
ff3a1c23c2 Removed unmerged PR leftovers for now 2022-08-27 19:45:56 -04:00
MEEPofFaith
cf0c7ff2d8
"Arkycite Floor" -> "Arkycite" (#7462) 2022-08-27 19:44:33 -04:00
Github Actions
b511a37a04 Automatic bundle update 2022-08-27 23:40:50 +00:00
Anuken
8453c52353 Merge branch 'master' of https://github.com/Anuken/Mindustry 2022-08-27 19:39:58 -04:00
Anuken
2a062b96ec Changed internal name of sand 2022-08-27 19:39:53 -04:00
Epowerj
9fd340d219 Tweaks to basin description 2022-08-26 12:31:42 -04:00
RTOmega
80d772b96e
TR Bundle Update (erekir units) (#7449) 
* TR Bundle Update

* güncerleme -> sürüm güncerlemesi

* Editor Translation Fix + Eleman -> Birim

* mini fixes

* Unit desc

* kumdan

* Update bundle_tr.properties
 2022-08-26 08:07:07 -04:00
Github Actions
7b63ec203e Automatic bundle update 2022-08-24 17:49:15 +00:00
Anuken
3f4ae7fed3 Merge remote-tracking branch 'origin/master' 2022-08-24 13:47:48 -04:00
Anuken
69a7354468 Names for hidden Neoplasm units 2022-08-24 13:47:42 -04:00
Github Actions
bef1b51ed2 Automatic bundle update 2022-08-24 14:39:08 +00:00
Anuken
eb01f0ed4a Unit descriptions + Cleanup (Based on #7066) 2022-08-24 10:38:15 -04:00
- MV -
f0300dcdde
TRANSLATION (it) (#7381) 2022-08-23 08:33:46 -04:00
ManuWar73
5a2ba71198
Spanish translation for v7: 2 try (#7378) 
Translated everything that isn't and should be translated
 2022-08-16 17:22:23 -04:00
Github Actions
b312459b6f Automatic bundle update 2022-08-16 02:35:09 +00:00
Angel-24
dff0a8294e
Update bundle_es.properties (#7191) 
* Update bundle_es.properties

* Update bundle_es.properties

* Update bundle_es.properties

I just realized the line which said "Don't translate them yet!"

* Update bundle_es.properties

* Update bundle_es.properties

* typo

* "Blast drill" => "Taladro de voladura"

@Vdoble's reported an issue related to a duplicated block name.

Co-authored-by: Anuken <arnukren@gmail.com>
 2022-08-15 22:33:31 -04:00
Github Actions
03accce8f2 Automatic bundle update 2022-08-15 21:43:21 +00:00
彭瑞暄
1f57332091
Update bundle_zh_TW.properties (#7360) 
lcategory pending
 2022-08-15 17:41:46 -04:00
Thomas Widyantoko
287ccf7e84
Update bundle_id_ID.properties (#7361) 
openable links, search function, viewing player
 2022-08-15 17:41:37 -04:00
Joan Josep
fd70598476
Update bundle_ca.properties (#7375) 2022-08-15 17:41:14 -04:00
K0baU
fe1d81b4d5
Update bundle_ja.properties (#7369) 
* Update bundle_ja.properties

* Update bundle_ja.properties
 2022-08-15 06:59:37 -04:00
Github Actions
522070be4b Automatic bundle update 2022-08-13 17:54:18 +00:00
Phinner
4030acbd75
Allow servers to send openable links to players (#7351) 
* commitin'

* Update core/assets/bundles/bundle.properties

Co-authored-by: Anuken <arnukren@gmail.com>

* Update bundle_fr.properties

* s p a c e

Co-authored-by: Anuken <arnukren@gmail.com>
 2022-08-13 13:52:46 -04:00
Joan Josep
8132e1f3aa
Update bundle_ca.properties. Change verbal periphrases and apostrophe symbol. (#7332) 2022-08-12 10:46:08 -04:00
Github Actions
1d43e16261 Automatic bundle update 2022-08-12 11:44:46 +00:00
Phinner
935d096b26
French Translation: The return (#7086) 
* yes

* yes 2

* hortisquash and the seven translations

* smol fixes

* y e s
 2022-08-12 07:43:38 -04:00
Github Actions
f3154d606b Automatic bundle update 2022-08-11 16:07:20 +00:00
Anuken
8cac2939b3 Merge remote-tracking branch 'origin/master' 2022-08-11 12:06:18 -04:00
Anuken
06e08c1074 Compact player list 2022-08-11 12:06:14 -04:00
Github Actions
2f7a646e2b Automatic bundle update 2022-08-11 15:37:24 +00:00
Luna
e28dbfad69
Community server search (#7305) 
* basic community server search

* normalise capitalisation

* localise "Search:"
 2022-08-11 11:36:10 -04:00
Github Actions
44af0bc08b Automatic bundle update 2022-08-10 02:51:16 +00:00
ThatOneBepis
0fa21ce165
Previous "update bundle_sr.properties" but no Sine shenanigans (#7333) 
* Update bundle_sr.properties

* ln but with angles

* rollback

* you saw nothing
 2022-08-09 22:50:14 -04:00
Github Actions
75b5efd5e2 Automatic bundle update 2022-08-09 20:03:27 +00:00
Nunting
a31175377a
Update bundle_ko.properties (#7307) 
* Update bundle_ko.properties

Unification of reactor terms. 
원자로 -> 반응로 통일. 같은 의미이지만 어감이 다름.

Added detailed description of parallax for beginners. This is not official and can be removed at any time.
초보자를 위한 패럴랙스 디테일 추가. 공식 설명이 아니므로 제거될 수 있음.

* Update bundle_ko.properties

토륨/핵융합 반응로->원자로로 복원
 2022-08-09 16:02:28 -04:00
SUS
f01278cf72
Update bundle_uk_UA.properties (#7318) 
* Update bundle_uk_UA.properties

Yesn't

* Update bundle_uk_UA.properties

Yay new update)

* Update bundle_uk_UA.properties

Start...

* Update bundle_uk_UA.properties

1

* Update bundle_uk_UA.properties

2

* Update bundle_uk_UA.properties

3.1

* Update bundle_uk_UA.properties

4

* Update bundle_uk_UA.properties

5

* Update bundle_uk_UA.properties

6

* Update bundle_uk_UA.properties

7

* Update bundle_uk_UA.properties

8

* Update bundle_uk_UA.properties

Finally (I'm waiting)
 2022-08-09 16:02:19 -04:00
彭瑞暄
af503d1a50
Update bundle_zh_TW.properties (#7190) 
* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties
 2022-08-07 21:38:00 -04:00
Joan Josep
275293e45c
Update bundle_ca.properties (#7301) 
* Update bundle_ca.properties

* Update bundle_ca.properties
 2022-08-05 15:09:05 -04:00
Github Actions
031ca650bd Automatic bundle update 2022-08-05 18:27:32 +00:00
Thomas Widyantoko
e3c4bd86db
[ID] id_ID bundle update (#7175) 
* [ID] various bundle update

+ Mod Browser release, some editor functions, sector four description, and more

* quick bundle update

sector, block, logic descriptions and other fixes
will continue again later my house is being renovated bruh

* finalizing v7 alpha id_ID translation

turrets are now translated, adjusted stats and status to match its function, and stuff

* added heat source to id_ID

...and other new things i guess

* adds new lines from EN bundle to id_ID

includes Neoplasia Reactor and other fixes

also things changed a lot behind the scenes
 2022-08-05 14:26:38 -04:00
Nunting
a13c8f5c4a
Update bundle_ko.properties (#7285) 2022-08-04 14:06:47 -04:00
Nunting
45f8712fe8
Update bundle_ko.properties (#7262) 2022-08-03 19:36:06 -04:00
SoMall-dumpling
c8257871b9
Update bundle_zh_CN.properties (#7261) 
* Update bundle_zh_CN.properties

The Ultimate Unit Control System Translation

* Update bundle_zh_CN.properties

The Ultimate Flux Reactor

* Update bundle_zh_CN.properties

删除一个多余的空行

* Update bundle_zh_CN.properties

语序调整
 2022-08-03 08:32:20 -04:00
Github Actions
65db43268c Automatic bundle update 2022-08-03 01:27:29 +00:00
Anuken
a54907583b Neoplasia reactor 2022-08-02 21:26:15 -04:00
Github Actions
efb258e9a6 Automatic bundle update 2022-08-02 00:29:14 +00:00
Anuken
2bc000f53c WIP flux reactor 2022-08-01 20:28:07 -04:00
Joan Josep
d029c85ec5
Add Catalan to available languages and start its localisation. (#7076) 
* Add Catalan to available languages and start its localisation.

* Update bundle_ca.properties

* Update bundle_ca.properties

* Update bundle_ca.properties

* Update Catalan.properties

* Update Catalan.properties

* Update bundle_ca.properties

* Update bundle_ca.properties

* Update bundle_ca.properties

* Update bundle_ca.properties

* Update bundle_ca.properties

* Update bundle_ca.properties

* Update bundle_ca.properties

* Update bundles_ca.properties

* Update bundles_ca.properties

* Update bundle_ca.properties

Co-authored-by: Anuken <arnukren@gmail.com>
 2022-07-31 10:57:00 -04:00
Nunting
9c276f362d
Update bundle_ko.properties (#7253) 
* Update bundle_ko.properties

* Update bundle_ko.properties
 2022-07-31 00:50:26 -04:00
Github Actions
cf9a7f0c63 Automatic bundle update 2022-07-31 01:03:28 +00:00
Anuken
55edd53f84 WIP command order system 2022-07-30 21:01:07 -04:00
RTOmega
a3bdcd175b
TR Bundle Cleanup (#7229) 2022-07-28 15:38:16 -04:00
Github Actions
b55465a4b0 Automatic bundle update 2022-07-28 14:22:45 +00:00
SoMall-dumpling
a263aa781d
Update bundle_zh_CN.properties (#7189) 
* Update bundle_zh_CN.properties

The following updates will focus on better unit names, turret names, map names, and other untranslated stuff.

* Update bundle_zh_CN.properties

four new lines

* Update bundle_zh_CN.properties

Revert rollback, and some missing translations.

* Update bundle_zh_CN.properties

map names

* Update bundle_zh_CN.properties

turret names, arkycite-related translations

* Update bundle_zh_CN.properties

boulders

* 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

这个\n的位置我实在看不下去了

* Create bundle_zh_CN.properties

恶灵->魔灵

* Update bundle_zh_CN.properties

奇奇怪怪多出来个\n

* 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

two new lines

* Update bundle_zh_CN.properties

还是改回来。事实上墙的描述是挡下敌方炮弹，但也挡不住抛射炮。所以没有太大必要改前面的东西。（而且shell也是炮弹的意思）
死神，太逊啦

* 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

没有人会说具备一台炮塔的。
 2022-07-28 10:21:38 -04:00
Catchears
224cc80b59
update heat source description to match other sources (#7230) 
* update heat source description to match other sources

* correct to large amounts of heat
 2022-07-28 09:39:30 -04:00