mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-24 18:05:33 +07:00
Code Issues Packages Projects Releases Wiki Activity
17,453 Commits 4 Branches 160 Tags 2.3 GiB
5d180e9dd8
Commit Graph

6098 Commits

Author SHA1 Message Date
Anuken
afee374a66 Merge remote-tracking branch 'origin/master' 2023-06-02 11:56:13 -04:00
Anuken
4dd414c22f Closes Anuken/Mindustry-Suggestions/issues/4456 2023-06-02 11:56:08 -04:00
Github Actions
4e0e48ea32 Automatic bundle update 2023-06-02 15:38:01 +00:00
JniTrRny
c84ec75c53
Improvements to the Schematics UI (#8605) 
* schematics UI improvements

* better edit tags UI

* visual tweaks

* cleanup

inline obsession
cleanup again...
another little bit of cleanup
a little bit of cleanup
minor cleanup
 2023-06-02 11:37:15 -04:00
Anuken
e9fe52d578 Merge remote-tracking branch 'origin/master' 2023-05-24 09:49:35 -04:00
Anuken
19cd6fd07c Fixed #8632 2023-05-24 09:49:30 -04:00
YozoZChomutova
9869922710
Update bundle_cs.properties (#8639) 
* Updated bundle_cs.properties

All unstraslated words I've found were translated. Spacing between lines were synchronized with bundle.properties. +Added self to contributors file.

* Updated bundle_cs.properties

Replaced with shorters words, fixing issue with multilined text in buttons.

* Translated several keys to Czech.
 2023-05-24 09:22:34 -04:00
The Serjio
ad4ce35a42
Update bundle_ru.properties (#8638) 2023-05-24 09:22:05 -04:00
Anuken
f59c439f2f Some more random schematics 2023-05-17 19:32:47 -04:00
Anuken
e6daf63a5a New base schematcs from Bluewolf 2023-05-17 19:03:16 -04:00
Github Actions
c6829c23d4 Automatic bundle update 2023-05-16 21:26:10 +00:00
Anuken
29855243cb Base building AI is back 2023-05-16 17:24:41 -04:00
Vojtak42
9b02d26856
Update bundle_cs.properties (#8610) 2023-05-15 08:54:07 -04:00
WayZer
0496d2108c
fix NPE in SpawnGroup.write (#8584) 
* Update SpawnGroup.java

* Update contributors

* No Objects.isNull
 2023-05-11 22:21:05 -04:00
Anuken
3b8f789955 Merge remote-tracking branch 'origin/master' 2023-05-11 15:24:45 -04:00
Anuken
be751f5b28 Minor cleanup 2023-05-11 15:24:41 -04:00
Github Actions
9a7f8bb573 Automatic bundle update 2023-05-11 17:42:50 +00:00
Anuken
d34631458e Mobile rebuild button support 2023-05-11 13:41:45 -04:00
Phinner
bedd8f612a
Update French translation (#8579) 
* pull #7883

* add new translations

* add these fine gentlemen to the contributors

* bateau -> vaisseau

* forgor again 💀

* chore: Translate missing strings + Small changes

* chore: Apply suggested changes (author: Kalpas)
 2023-05-11 12:04:14 -04:00
xStaBUx
a3dbbe63c4
Better planet selection (#8572) 
* Better AboutDialog

* I'm there!

* New Planet Select UI

* fix

* Better Planet Selection

* no
 2023-05-10 12:54:18 -04:00
Github Actions
db0691f32f Automatic bundle update 2023-05-07 16:33:03 +00:00
Mario A
a36e31c4b4
Fix some Italian translations (#8564) 
Co-authored-by: Midblyte <midblyte@anonaddy.me>
 2023-05-07 12:32:10 -04:00
JniTrRny
23f1d24c45
Search bar for wave UI (#8501) 
* wave search + other editor things

* everything but wave search
 2023-05-07 10:42:45 -04:00
Github Actions
2b5ff56460 Automatic bundle update 2023-05-07 13:39:11 +00:00
JniTrRny
bb06c3f1e9
Wave limit game rule in custom maps (#8550) 
* custom maps wave limit

* whoopsies
 2023-05-06 23:04:31 -04:00
Github Actions
8bbd58053a Automatic bundle update 2023-05-07 01:53:52 +00:00
Philipp
f1b52164c9
Fix some mistakes in German translation (#8543) 
* Fix typo in German tutorial

* Fix some more
 2023-05-06 21:53:10 -04:00
Prosta4okua
6cfcffd04e
New translation (#8555) 
* Update bundle_uk_UA.properties

Old

* Messaged

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

---------

Co-authored-by: SUS <94375206+1stvaliduser@users.noreply.github.com>
 2023-05-06 21:52:52 -04:00
Даркнесс#3729
f581aa3332
Update russian bundle (#8559) 
* Update russian bundle

* Update bundle_ru.properties
 2023-05-06 21:51:51 -04:00
Catchears
8126e970f3
update german translation (#8560) 
* update german translation

* resolve @Shawak's comment
 2023-05-06 21:51:37 -04:00
Joan Josep
c4e1719c0c
Update bundle_ca.properties (#8542) 2023-04-29 09:03:51 -04:00
Github Actions
fc23ad9910 Automatic bundle update 2023-04-28 14:41:51 +00:00
JniTrRny
eba58c73e6
Update bundle_th.properties (#8532) 
* 6 months of doing nothing

* Why am I up there

* More ✨lore✨ to the descriptions

* RIP original item description

* revenge of the item details

* new vocabulary just dropped

* cancel transliteration

sounds kinda lame, so might revert it later.
 2023-04-28 10:40:32 -04:00
Anuken
583a1c69b6 Logic pathfind instruction 2023-04-24 23:59:46 -04:00
Github Actions
c54a76fc8a Automatic bundle update 2023-04-16 02:21:40 +00:00
MonoDx
288080eeac
Rework (#8488) 
* update core/assets/bundles/bundle_be.properties

* update core/assets/bundles/bundle_be.properties

* update core/assets/bundles/bundle_be.properties

* update core/assets/bundles/bundle_be.properties

* update core/assets/bundles/bundle_be.properties

* update core/assets/bundles/bundle_be.properties

* update core/assets/bundles/bundle_be.properties

* update core/assets/bundles/bundle_be.properties
 2023-04-15 22:16:44 -04:00
Github Actions
4fcb338d94 Automatic bundle update 2023-04-06 23:08:17 +00:00
JniTrRny
6dc3b7e729
More Dark UI in stats display (#8473) 
* The Dark UI Menace

* Attack of the Dark UI
 2023-04-06 19:07:24 -04:00
Github Actions
f67e2c71e7 Automatic bundle update 2023-04-06 13:56:07 +00:00
Nunting
bee977cadc
Update bundle_ko.properties (#8479) 2023-04-06 09:55:06 -04:00
MonoDx
183ebb33b7
Update bundle_be.properties (#8478) 
Update logical translate.

Work monoDx.
Thanks
 2023-04-06 09:54:48 -04:00
Anuken
97390d25c0 Removed pointless code 2023-04-05 19:51:16 -04:00
Joan Josep
6630f88613
Update bundle_ca.properties (#8464) 2023-04-02 11:00:27 -04:00
Bernd Ritter
1e2e0a48a1
Update bundle_de.properties (#8452) 
Fixed two typos of fordere -> vordere
 2023-04-01 10:39:00 -04:00
Github Actions
226e8b8a20 Automatic bundle update 2023-04-01 02:45:47 +00:00
Anuken
43424547f2 Setprop description 2023-03-31 22:44:54 -04:00
Xasmedy
c30cbc0f20
Update contributors (#8450) 2023-03-31 16:30:14 -04:00
MEEPofFaith
fcb44e4952
Fix frags in frags creating a large empty space (#8430) 
* Fix frags in frags creating a large empty space

* Change suppression message

Consistency with status duration

* Too little space between boxes
 2023-03-26 11:53:46 -04:00
Github Actions
af26e60a4f Automatic bundle update 2023-03-26 02:45:57 +00:00
MEEPofFaith
6b936aa7f6
Better Ammo Stats Display (#8429) 
* Cleaner ammo stats based on unit factory recipe stats

* Display suppression in bullet stats

Also reword from "regen" to "repair" to more accurately convey that build towers are affected as well.

* PointLaserBulletTypes don't display damage in dps

* Display preview region instead of region

* autoFixed
 2023-03-25 22:45:07 -04:00
phoskee
355f33b0a4
Update bundle_it.properties (#8411) 
Fixed errors
Translated some sentences
 2023-03-25 13:52:04 -04:00
Github Actions
2553891c25 Automatic bundle update 2023-03-25 16:43:28 +00:00
Anuken
e4bef567b5 Fixed Steam public lobby hosting / Misc Steam bugfixes 2023-03-25 12:42:29 -04:00
Joan Josep
d937af7497
Update bundle_ca.properties (#8341) 
Missatge reforçat->Missatge destacat
Unir->Uneix (use imperative in buttons)
 2023-03-08 09:25:56 -05:00
Github Actions
a216c9c56e Automatic bundle update 2023-03-08 14:21:36 +00:00
Ngọc Lam
0e9f250e93
Vietnamese translation for mindustry v7 update (Phase 1) (#7843) 
* Update bundle_vi.properties

* Update bundle_vi.properties

* Alot of todo ...

* More...

* REEEEEEEE

* Alot of descriptions

* re-translate sectors desc

* fck VSC

* update sector descriptions

* Sector hints

* Block description

---------

Co-authored-by: Arckyn Nightingale <86044974+Kynarc@users.noreply.github.com>
Co-authored-by: Anuken <arnukren@gmail.com>
 2023-03-08 09:20:48 -05:00
Github Actions
29d4246019 Automatic bundle update 2023-03-08 14:19:41 +00:00
MonoDx
3a73a97746
Update bundle_be.properties. (#8374) 
Worked Dima Pozniac and monodx.

Thanks.
 2023-03-08 09:18:17 -05:00
Github Actions
2cc486febc Automatic bundle update 2023-03-08 14:11:55 +00:00
MEEPofFaith
0a1957eb13
Display Interval Bullet in Stats + Collapsers (#8366) 
* Display interval bullets in stats

* Collapsers for sub-bullets

* highlight /sec as well

* top
 2023-03-08 09:10:34 -05:00
Sunky.MPEG
327a8fc61b
Clearer translations (#8364) 
* Clearer translations

* Small changes
 2023-03-08 07:12:04 -05:00
Evgenij
4f314afe21
[RU] Small translation update (#8342) 
* [RU] Small translation update

* Update bundle_ru.properties
 2023-02-27 11:25:29 -05:00
Anuken
e234ac43a6 Fixed keybind names 2023-02-25 11:38:18 -05:00
Github Actions
ab2138d8e7 Automatic bundle update 2023-02-22 18:03:15 +00:00
MonoDx
46c75af9e4
Updated and improved belarusian translation. (#8331) 
Edited by monodx.
 2023-02-22 13:02:09 -05:00
MonoDx
804dd61cd9
Updated belarusian translate. (#8327) 
Edited by monodx.
 2023-02-21 10:26:04 -05:00
ulwepo
ab772dccd4
Update bundle_ja.properties (#8324) 2023-02-21 09:55:55 -05:00
Fischer1000
92c0552fd5
Update hungarian language file (#8315) 
Fine tune the file. I have made it to it's quarter today (line 537).
 2023-02-19 09:26:59 -05:00
ferrandusqui31
b65c3cd931
Missing translation and errors correction (#8312) 
On line 104 updated joingame from "Uneix-me a una partida" to "Unir-se a una partida".
On line 494 update editor.savemap from "Desa un mapa" to "Desa el mapa".
On line 1386 updated block.kiln.name from "Kiln" to "Forn de vidre".
On line 1468 updated block.reinforced.message  from "Missatge remarcat" to "Missatge reforçat".
 2023-02-18 19:48:08 -05:00
ulwepo
652aa4c456
Update bundle_ja.properties (#8300) 2023-02-15 09:00:10 -05:00
Github Actions
5ac9e9f63c Automatic bundle update 2023-02-13 19:13:48 +00:00
Anuken
ec8262418f Basic unit boost command support 2023-02-11 17:40:57 -05:00
Github Actions
66406806b7 Automatic bundle update 2023-02-09 03:49:19 +00:00
Anuken
a093fa5718 Replaced #8035 2023-02-08 22:48:17 -05:00
Github Actions
be39c31865 Automatic bundle update 2023-02-01 20:22:46 +00:00
Phinner
0d2dfadba7
Mod dependency resolution improvements (#7972) 
* soft dependencies + better mod resolution algorithm

* update ModMeta#toString

* var

* add #7962 bugfix

* Use existing code to resolve

* add state text for mod dialog

* bugfix

* fix error text

* remove external resolver class

It's simpler like that :)
 2023-02-01 15:21:42 -05:00
LeTuanVN
c381499c58
Update vi translation (#8225) 
* Update bundle_vi.properties

* Update bundle_vi.properties
 2023-02-01 14:57:09 -05:00
Joan Josep
0750348cb1
Update bundle_ca.properties (#8190) 2023-01-17 18:49:20 -05:00
Knochi
98157f2852
Never use „tun“ in German language (#8179) 2023-01-14 14:41:14 -05:00
Nunting
c3209f2cdd
Update bundle_ko.properties (#8171) 2023-01-13 09:44:08 -05:00
Github Actions
58315acfa3 Automatic bundle update 2023-01-13 03:53:33 +00:00
Anuken
ec9eadd660 encoding test 2023-01-12 22:52:32 -05:00
Даркнесс#3729
80afe5ad86
Fixed russian translate (#8045) 
* 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 bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties
 2023-01-12 08:51:28 -05:00
Github Actions
b2bb6136de Automatic bundle update 2023-01-11 13:57:16 +00:00
MEEPofFaith
87949679f1
Make crash damage a multiplier instead of a toggle (#8151) 
* Switch unitCrashDamage to a multiplier

* Add to rules dialog
 2023-01-11 08:56:29 -05:00
Github Actions
8212c54446 Automatic bundle update 2023-01-09 17:48:55 +00:00
Prosta4okua
c1b0b22e4c
Ukr translation v7 (#8134) 
* hehe

* Finished translation. Need to proofread. Added 2 missing entries.

* Fixes

* Fixes #2

* Added button Random to translations and fixed error

* Fixes from @1stvaliduser

* fixes

* fixes

* виправлення

* Update bundle_uk_UA.properties
 2023-01-08 22:55:07 -05:00
Github Actions
45591fab83 Automatic bundle update 2023-01-08 06:24:54 +00:00
Anuken
658ebf4bc5 Merged #8053 2023-01-08 01:23:54 -05:00
Joan Josep
59c2a11824
Update bundle_ca.properties (#7947) 2023-01-08 01:22:32 -05:00
Github Actions
33a57b11f6 Automatic bundle update 2023-01-08 05:18:51 +00:00
Anuken
d082963167 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	core/assets/bundles/bundle_es.properties
 2023-01-08 00:17:52 -05:00
Anuken
e2fa834079 Merge of #7987 2023-01-08 00:16:58 -05:00
Khanx
e6bfc1cee8
Updated spanish translation (#7928) 2023-01-08 00:15:55 -05:00
Miniontoby
0211732520
Fixed sand-floor translation in Dutch (#8058) 
Changed from 'Donker Zand' which means 'dark sand' to 'Zand' which is just 'sand'
 2023-01-07 23:38:12 -05:00
adamlolgaming
33f6004c81
Update bundle_pl.properties (#8057) 2023-01-07 23:34:18 -05:00
Github Actions
cf392d13ed Automatic bundle update 2023-01-07 19:43:14 +00:00
Prosta4okua
574a10e5f8
🍉🍉🍉 Watermelons have deployed. Prepare yourself for new Ukrainian translation for v7 release (#7885) 
* hehe

* Finished translation. Need to proofread. Added 2 missing entries.

* Fixes

* Fixes #2

* Added button Random to translations and fixed error

* Fixes from @1stvaliduser

* fixes

* fixes

* будівль -> будівель
 2023-01-07 14:42:27 -05:00
Slotterleet
fe99c7da62
Update bundle_ru.properties (#7973) 2023-01-07 14:00:32 -05:00
Github Actions
4e51586b3b Automatic bundle update 2023-01-07 18:23:43 +00:00
Phinner
d3a90d68d1
Update bundle_fr.properties (reopen of #7883) (#7918) 
* pull #7883

* add new translations

* add these fine gentlemen to the contributors

* bateau -> vaisseau

* forgor again 💀
 2023-01-07 13:22:58 -05:00
Github Actions
78973d3f12 Automatic bundle update 2023-01-07 18:17:21 +00:00
Anuken
246591eab4 Fixed #8119 2023-01-07 13:15:56 -05:00
Nunting
eb9b0f69bb
Update bundle_ko.properties (#7992) 2023-01-07 11:44:25 -05:00
Github Actions
bf07deafc6 Automatic bundle update 2023-01-07 16:40:17 +00:00
kituta
2809a083a0
Update bundle_ja.properties (#8006) 
* Update bundle_ja.properties

一部を翻訳 // Translated in part.

1244 Factions 派閥ではなくチームでも良いかもしれません

* Update bundle_ja.properties

セクター名と説明文 //Sector Name and Description
ブロックの説明文 //Block Description

* Update bundle_ja.properties

Jun 3, 2021 Partial 7.0 merge - API preview から Nov 14, 2022 Revert hold time までの原語版の追記変更を適用しました。//Applied changes additions from Jun 3, 2021 to Nov 14, 2022.
チュートリアル、現在目標(左上)、ユニット説明文などを翻訳//Translated tutorial text, current target text (upper left), unit description, etc.

* Update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

セルプロの説明文を原語版に合わせました。 // The description of Serpulo has been adapted to the original language version.
語句の変更 // Changed a word or phrase.

「依存関係」を「前提Mod」にしました。

* Update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

ブロックの説明文を整理しました。 // Organized block descriptions.

* Update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

Don't translate these yet! だったので戻しました。// Since it was "Don't translate these yet!", I returned the corresponding text.

* Update bundle_ja.properties

翻訳の追加と微修正 // Translations were added and minor corrections were made.

* Update bundle_ja.properties

脱字を修正 // Fixed a typo

* Update bundle_ja.properties

表記ゆれの統一 // Uniformity of notation

* Update bundle_ja.properties

* Update bundle_ja.properties

誤字の修正 // Correction of typos
 2023-01-07 11:39:31 -05:00
Epowerj
1180764dab Fixed some weird issues on stronghold 2022-11-16 14:40:47 -05:00
Anuken
7f292b14a7 Merge remote-tracking branch 'origin/master' 2022-11-13 13:26:23 -05:00
Anuken
f7f3d5bde3 Revert hold time 2022-11-13 13:26:19 -05:00
Github Actions
f400ccc66a Automatic bundle update 2022-11-13 16:14:54 +00: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
Anuken
56eb1a084c Revert "Fixing a mistake I made (#7788)" 
This reverts commit 3c7ddc8375.
 2022-11-09 08:29:32 -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
BF 109 F-4
3c7ddc8375
Fixing a mistake I made (#7788) 
* Add files via upload

* Delete Erekir Waves Map better.msav

* Fixing a mistake

I uploaded it incorrectly last time so I'm fixing it.

* Old version

Fixed
 2022-11-07 15:50:47 -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
Anuken
83be0116c6 Merge remote-tracking branch 'origin/master' 2022-11-06 13:38:44 -05:00
Anuken
3a0b1a6cf5 Fixed missile unit DPS calculation 2022-11-06 13:38:38 -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
f6d344e5a5 Tweaked origin enemy base 2022-11-01 01:53:20 -04:00
Epowerj
4e8e65d1dd Updated sector descriptions 2022-10-31 19:17:36 -04:00
Anuken
e3d7acc556 Show world processors in darkness in editor mode 2022-10-31 17:51:34 -04:00
Anuken
2e42071c92 Faster constructors 2022-10-31 08:57:32 -04:00
Epowerj
dd06c7ddb7 Tweaks to origin 2022-10-30 18:55:16 -04:00
Epowerj
7f87fa88b3 Merge remote-tracking branch 'origin/master' 2022-10-30 16:54:20 -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
Epowerj
aefd7133e2 Tweaks to origin 2022-10-30 16:20:41 -04:00
Epowerj
2609f1e4ed Tweaks to origin 2022-10-30 16:18:17 -04:00
Epowerj
71699e9f6d Tweaks to origin 2022-10-30 15:08:15 -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
Epowerj
a1882d60a8 Tweaks to origin 2022-10-29 18:28:40 -04:00
Epowerj
4f0316434d Tweaks to origin 2022-10-29 17:46:42 -04:00
Epowerj
fae6077c43 Increased timers on origin 2022-10-29 14:27:32 -04:00
Anuken
e5fefe4822 Merge remote-tracking branch 'origin/master' 2022-10-29 14:24:35 -04:00
Anuken
22dff1473c Fixed some cheesing in origin 2022-10-29 14:24:31 -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
Anuken
a8aedbed13 Temporarily slowed down landing music to sync 2022-10-29 11:18:27 -04:00
Anuken
959e0ad8a8 More difficult 'waves' for Origin 2022-10-28 18:24:17 -04:00
Anuken
f6ee087044 More difficult 'waves' for Origin 2022-10-28 18:22:54 -04:00
The Serjio
7d6fff1e37
Tiny romanian translation fix (#7781) 
Changed (0) to {0}
 2022-10-28 17:38:18 -04:00
Epowerj
4eb2314fae Added origin to campaign 2022-10-28 16:30:46 -04:00
Anuken
42d929f32d Origin testing 2022-10-28 16:15:09 -04:00
Epowerj
47eb34e842 Work on origin 2022-10-28 15:24:48 -04:00
Epowerj
9cec0227ab Work on origin 2022-10-27 15:55:56 -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
Anuken
6566bf9dd5 How 2022-10-26 15:52:51 -04:00
Anuken
4a7231fb5a Merge remote-tracking branch 'origin/master' 2022-10-26 14:26:20 -04:00
Anuken
661b2124cd Increased Karst wave spacing 2022-10-26 14:26:14 -04:00
Epowerj
2f31b20931 Work on origin 2022-10-26 13:54:39 -04:00
Epowerj
7c35fccc14 Renamed the last to origin 2022-10-26 01:52:49 -04:00
Mechanical fish
86d4950912
Map for campaign (#7762) 
* Add files via upload

* Delete Karst[8]v2.msav

* Map for campaign
 2022-10-25 08:11:06 -04:00
Anuken
ac32b0a1e0 Fixed #7760 2022-10-24 12:50:34 -04:00
Anuken
8c78f37566 More tweaks to Karst / Default player limit of 30 2022-10-24 10:59:10 -04:00
Anuken
1796f25482 More difficult waves for Karst 2022-10-24 09:45:32 -04:00
Epowerj
ea6f666a80 Work on karst 2022-10-23 19:15:56 -04:00
Anuken
0804146b94 Karst wave tweaks 2022-10-23 18:36:52 -04:00
Epowerj
d31489041f Work on karst 2022-10-23 18:14:36 -04:00
Epowerj
9af0137f1d Tweaks to stronghold 2022-10-23 17:57:52 -04:00
Epowerj
f214da0479 Work on karst 2022-10-23 17:48:13 -04:00
Anuken
d352a96f55 Untested modifications to karst map 2022-10-23 14:29:35 -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
Anuken
989848ead5 Crossroads higher attack weight 2022-10-21 18:35:56 -04:00
Epowerj
5132b17a83 Tweaks to crossroads 2022-10-21 17:29:51 -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