mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-27 16:09:57 +07:00
Code Issues Packages Projects Releases Wiki Activity
9,284 Commits 4 Branches 160 Tags 2.3 GiB
73a5af2e5e
Commit Graph

2307 Commits

Author SHA1 Message Date
Anuken
378e81cd90 Fixed #2917 2020-10-12 10:06:34 -04:00
Wiki Updater
08629bb7f7 add bundle entry for dacit boulder 2020-10-12 10:49:41 +02:00
Leonwang4234
7f5561f037 add... 2020-10-11 17:03:48 -07:00
YellOw139
8ed6f1e3a8
Updates until commit 3fe79531a6 2020-10-11 21:01:37 +03:00
Felix Corvus
6d436ce680
избегаем потенциальных проблем 2020-10-11 19:18:28 +03:00
Summet
504d29ca54
Подключения узлов ⚡ 
* Подключения узлов ⚡

* Подключения -> Подключений
 2020-10-11 19:10:02 +03:00
Anuken
3fe79531a6 Added message for last accessed player of block 2020-10-11 11:47:22 -04:00
Anuken
e11a8565d0 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	core/src/mindustry/ui/dialogs/PausedDialog.java
 2020-10-11 10:51:46 -04:00
Anuken
3d99e38f10 Sector simplification 2020-10-11 10:51:33 -04:00
Patrick 'Quezler' Mounier
6d632fc532
Update bundle.properties 2020-10-11 14:59:44 +02:00
Vanguard
ec8708067b
1 new line 
editor.center
 2020-10-11 14:59:05 +03:00
Anuken
3f74c61c0a Map center button 2020-10-10 12:05:11 -04:00
Pietro303HD
2e4cbdcc05
Update bundle_pt_BR.properties 2020-10-10 09:51:23 -03:00
Summet
be1cc21ff5
Протекает меньше -> Не протекает (#21) 2020-10-10 01:04:31 +03:00
Patrick 'Quezler' Mounier
d776744905
Update leak behaviour in plated conduit description 2020-10-09 19:11:56 +02:00
Sunny Kim
30a5c6631b
consistency 2020-10-09 15:50:27 +09:00
Felix Corvus
fcb027f3e5
Космос ✨ 2020-10-09 00:56:42 +03:00
Anuken
c7f1204119 space 2020-10-08 15:14:28 -04:00
Sunny Kim
a698258b67
Update bundle_ko.properties 
some stuff, unit shield(방어막) vs force field(보호막) distinction and more
 2020-10-08 19:17:30 +09:00
Vanguard
f81a88feca
2 new lines; 1 changed line 
New:
rules.enemyLights
units.processorcontrol

Changed:
item.titanium.description
 2020-10-06 13:54:01 +03:00
Petr Gašparík
38ef46aa41 Czech translation - update for commit 7088ae8 2020-10-06 10:09:24 +02:00
Petr Gašparík
91875ec45f Merge branch 'master' of https://github.com/Anuken/Mindustry into v106-alpha 2020-10-06 10:06:06 +02:00
Anuken
7088ae89b3 Logic unit control 2020-10-05 15:42:37 -04:00
Petr Gašparík
bf4b01e46c name change 2020-10-05 12:05:53 +02:00
Petr Gašparík
cbb1058dc7 Merge branch 'v106-alpha' of https://github.com/PetrGasparik/Mindustry into v106-alpha 2020-10-05 12:04:38 +02:00
Petr Gašparík
26f6bcccb7 Czech - up to date for commit 14156c1 2020-10-05 12:04:35 +02:00
Petr Gašparík
81e4fb3759 Merge branch 'master' of https://github.com/Anuken/Mindustry into v106-alpha 2020-10-05 11:56:55 +02:00
Petr Gašparík
55be1fd969
Apply suggestions from code review 
Co-authored-by: Roman Plášil <me@rplasil.name>
 2020-10-05 11:55:01 +02:00
TheMrAlbert
c1be33cf2f
Minor update 
These are the minor translations, please review this translation before merging.
Also, block.consecutive (line 611) are left untranslated to allow other translator who are capable to translate it well.
 2020-10-04 12:45:08 +07:00
grimsoul10
5d2c36f186
Small changes (#1) 
* Small changes
* Capitalizations
 2020-10-04 10:48:48 +07:00
Thomas Widyantoko
3e49c68ec2
Updated for missing lines 2020-10-04 10:08:42 +07:00
Wina
903424654d
Updates to bundle_es.properties 2020-10-03 22:39:33 -03:00
cinnx
6b36b65ac0
Update bundle_pl.properties 
fixed some translations; compared, fixed and added few lines from original bundle file
 2020-10-03 23:14:11 +02:00
ThePythonGuy
50491755d1
typo and stuff 2020-10-03 16:59:39 +02:00
老滑稽
04b03b0749
Update bundle_zh_CN.properties 2020-10-02 08:19:31 +08:00
老滑稽
b7b2da6bbd
Update bundle_zh_CN.properties 2020-10-01 21:01:30 +08:00
Vanguard
65a0bd9a63
2 lines changed; 1 line added 
Changed:
unit.vela.name
block.foreshadow.name

Added:
block.tsunami.name
 2020-10-01 14:47:56 +03:00
Leonwang4234
14156c1ce7 "cryofluidmixer" to "cryofluid-mixer"fl 2020-09-30 17:54:50 -07:00
Anuken
7eb0da82de Added enemy lights setting 2020-09-30 17:44:13 -04:00
YellOw139
09934d9e12
Foreshadow 2020-09-30 19:15:52 +03:00
Felix Corvus
aeaa5ac6e2
some trick 2020-09-30 15:42:07 +03:00
Felix Corvus
54d4f733ef
Update bundle_ru.properties 2020-09-30 14:35:52 +03:00
Felix Corvus
75d8f93dd9
Update bundle_ru.properties 2020-09-30 14:07:06 +03:00
Felix Corvus
3660f22d96
*Предвестник* 
А потом из ру комьюнити приходят люди и спрашивают, почему **переводчики** испортили игру
 2020-09-30 13:52:09 +03:00
slava0135
d4402ee3bb Merge branch 'master' of https://github.com/Anuken/Mindustry into tsunami 
 Conflicts:
	core/assets/icons/icons.properties
	core/assets/sprites/block_colors.png
	core/assets/sprites/fallback/sprites.atlas
	core/assets/sprites/fallback/sprites3.png
	core/assets/sprites/fallback/sprites4.png
	core/assets/sprites/fallback/sprites5.png
	core/assets/sprites/fallback/sprites7.png
	core/assets/sprites/fallback/sprites8.png
	core/assets/sprites/sprites.atlas
	core/assets/sprites/sprites.png
	core/assets/sprites/sprites2.png
	core/assets/sprites/sprites4.png
	core/assets/sprites/sprites5.png
	core/src/mindustry/content/Blocks.java
 2020-09-30 09:48:18 +03:00
Anuken
2b2a12267a Long-range 4x4 turret (wip) / Java 14 language upgrade 2020-09-29 23:55:55 -04:00
Thomas Widyantoko
d86813bbb3
Merge branch 'master' into patch-1 2020-09-30 07:12:28 +07:00
ballgamer56
49df949967
Update bundle_th.properties 2020-09-28 16:33:34 +07:00
Petr Gašparík
250150a30c Czech cleanup 2020-09-28 10:24:50 +02:00
ballgamer56
6d163e45ac
Update bundle_th.properties 2020-09-28 14:11:15 +07:00
ballgamer56
ced29f3d7b
Update bundle_th.properties 2020-09-28 07:28:22 +07:00
Petr Gašparík
8ce6520fca Czech translation . update up to commit 9e0b29b 2020-09-28 00:03:51 +02:00
Petr Gašparík
53b556941c Merge branch 'master' of https://github.com/Anuken/Mindustry into v106-alpha 2020-09-27 23:50:48 +02:00
ballgamer56
6f36724280
[WIP] Update Thai translation 2020-09-27 21:02:22 +07:00
Prosta4okua
52a610a957
Update bundle_uk_UA.properties 2020-09-25 14:13:06 +03:00
Prosta4okua
13ff69cbca
Update bundle_uk_UA.properties 2020-09-25 14:10:55 +03:00
slava0135
3e81d194cb New liquid turret - Tsunami 2020-09-25 11:49:04 +03:00
YellOw139
08e6b4f2d7
Multiplayer note and the latest cleanup 2020-09-25 10:48:52 +03:00
老滑稽
8132cd9ba7
Update bundle_zh_CN.properties 2020-09-25 12:29:37 +08:00
Felix Corvus
54ce446a7f
nothing 2020-09-25 03:17:32 +03:00
Felix Corvus
38718ddc1d
Update bundle_ru.properties 2020-09-25 03:12:59 +03:00
Anuken
9e0b29b3dd Cleanup 2020-09-24 18:11:10 -04:00
Anuken
504334999d Campaign multiplayer note 2020-09-24 16:49:04 -04:00
老滑稽
1607a96a6a
Update bundle_zh_CN.properties 2020-09-25 00:17:43 +08:00
老滑稽
f5c8d0bf52
Update bundle_zh_CN.properties 2020-09-25 00:12:45 +08:00
老滑稽
f95f6d8c7b
Update bundle_zh_CN.properties 2020-09-25 00:07:24 +08:00
老滑稽
db558672cb
Update bundle_zh_CN.properties 2020-09-24 23:54:52 +08:00
Anuken
db94acdb83 Merge remote-tracking branch 'origin/master' 2020-09-24 09:23:42 -04:00
Anuken
68e708cf9a d 2020-09-24 09:23:38 -04:00
YellOw139
0b4caec004
[Bundle][RO] Translation Update 
This PR was tested in-game and is ready to merge at any time (unless marked as draft).

Changelog:
- Changes up until commit 35460f0b5f
- Typo fixes & various other improvements
 2020-09-24 11:43:16 +03:00
Petr Gašparík
c08875498f Czech update upto commit 35460f0 2020-09-24 07:38:26 +02:00
老滑稽
c2348f9019
Update bundle_zh_CN.properties 2020-09-24 13:10:06 +08:00
Anuken
35460f0b5f
Merge pull request #2692 from Prosta4okua/master 
immediate RU L10n update
 2020-09-23 23:03:54 -04:00
Felix Corvus
90fe7d7e59
immediate RU L10n update 2020-09-24 05:34:37 +03:00
Anuken
75ebaab3a3
Merge pull request #2660 from J-VdS/schematic 
Server disable schematic option (fix #2382)
 2020-09-23 22:01:06 -04:00
Anuken
ada664a2ca Fixed #2690 2020-09-23 21:46:40 -04:00
Anuken
28b7ef53bb Updated bundle contents 2020-09-23 18:28:25 -04:00
Anuken
8efba6ada7
Merge pull request #2564 from Prosta4okua/master 
[Bundle][RU] actual L10n
 2020-09-23 18:25:36 -04:00
Anuken
fcff922370
Merge branch 'master' into patch-2 2020-09-23 18:25:12 -04:00
Anuken
14627dbbf7
Merge pull request #2639 from PetrGasparik/6.0-aplha-2 
Czech translation track for 6.0 aplha 2
 2020-09-23 18:24:48 -04:00
Anuken
5df5a6e39f tweak 2020-09-23 18:01:12 -04:00
Anuken
3db2ffb843 Launch pad destination selection 2020-09-23 18:00:24 -04:00
J-VdS
d0c6f3274b
Merge branch 'master' into schematic 2020-09-23 16:29:41 +02:00
YellOw139
fb42302720
Update bundle_ro.properties 2020-09-23 12:40:27 +03:00
YellOw139
7701368d1b
Main menu adjustments for mobile 2020-09-23 12:39:13 +03:00
Felix Corvus
fe9a44d876
Update bundle_ru.properties 2020-09-23 08:35:28 +03:00
Anuken
f3e08f9cb6 Internal refactoring & cleanup 2020-09-22 15:50:33 -04:00
J-VdS
ba4612ed96
indent 2020-09-22 19:00:25 +02:00
J-VdS
4608697d0d
capitals 2020-09-22 18:59:35 +02:00
J-VdS
f4003fd463 merge 2020-09-22 18:41:24 +02:00
J-VdS
51065b57c4 info popup 2020-09-22 18:40:04 +02:00
YellOw139
5009f3aaf1
Quad, Oct 2020-09-22 07:52:11 +03:00
Felix Corvus
eb0a5d4d14
Update bundle_ru.properties 2020-09-21 19:18:40 +03:00
Anuken
1aa8bb9dd2 T5 air support unit 2020-09-21 11:41:11 -04:00
Felix Corvus
1b38b2d2f9
Lyagushka just kva'd 2020-09-21 16:00:45 +03:00
Petr Gašparík
c122d737c1 Czech translation - fixes 2020-09-21 11:01:53 +02:00
Petr Gašparík
3349764421 Czech translation - from 105 to 6.0 alpha 2020-09-21 10:59:02 +02:00
YellOw139
d6291ea6c5
Merge branch 'master' into patch-2 2020-09-20 17:47:32 +03:00
Felix Corvus
f7b320e838
Update bundle_ru.properties 2020-09-20 17:47:08 +03:00
YellOw139
c82455d994
#2628 2020-09-20 17:42:19 +03:00
Felix Corvus
dd32b4d39d
Merge branch 'master' into master 2020-09-20 16:56:36 +03:00
Félix Córvus
e907d1a23f Updating bundles 2020-09-20 16:43:15 +03:00
YellOw139
a0d81eb18e
[Bundle][RO] Translation Update 
This PR was tested in-game and it's ready to merge at any time (unless marked as draft).

Changelog:
- Changes as per commits c71be9ae32, f53af781ba, 68cf2af6e0, 0bcb48ca31, b4d83f33e9
- Changed Surge Alloy name to 'Supra Aliaj'. 
  The new name is closer to the original, shorter and easier to pronounce. Old name: 'Aliaj de Supratensiune'
- Changed Phase Fabric name to 'Fibră-Fază'.
  It's closer to the original and shorter. Old name: 'Material de Fază'
- Tweaked some stat names
- Tweaked some map editor button names
- Typo fixes & various other improvements
 2020-09-20 12:06:09 +03:00
Anuken
b4d83f33e9
Merge pull request #2395 from genNAowl/ready-to-merge-force-projectors 
F O R C E P R O J E C T O R S
 2020-09-19 21:15:45 -04:00
Anuken
84b1c0348d Merge remote-tracking branch 'origin/master' 2020-09-19 14:11:51 -04:00
Anuken
0bcb48ca31 Costs for unit research 2020-09-19 14:11:48 -04:00
Anuken
c470c0abe1
Merge pull request #2612 from sk7725/patch-17 
[KO] Update bundle_ko.properties
 2020-09-19 13:26:31 -04:00
Felix Corvus
68cf2af6e0
missing keybind lines 2020-09-19 17:34:49 +03:00
Felix Corvus
db3eaf9a33
missing lines 2020-09-19 17:29:33 +03:00
Felix Corvus
48f6ed47a6
Merge branch 'master' into master 2020-09-19 17:01:57 +03:00
Felix Corvus
c1efb69a91
Update bundle_ru.properties 2020-09-19 16:58:22 +03:00
Vanguard
742b171d5c
2 new lines 
unit.sei.name
unit.omura.name
 2020-09-19 16:10:07 +03:00
Sunny Kim
8a4dd09137
Update bundle_ko.properties 
+ Lots of environmental blocks(reflects 74cefb3ec9)!
 2020-09-19 20:49:08 +09:00
Anuken
f53af781ba T4/5 naval / Controversial weapon outlines 2020-09-18 18:54:09 -04:00
Felix Corvus
4cc90c0f4d
Update bundle_ru.properties 2020-09-18 22:25:59 +03:00
Felix Corvus
80490c401a
Update bundle_ru.properties 2020-09-18 21:38:31 +03:00
Anuken
c71be9ae32 Mud 2020-09-18 00:13:08 -04:00
Felix Corvus
e1277da02d
Update bundle_ru.properties 2020-09-17 00:49:02 +03:00
TheSlaylord
7dfe973664
Update bundle_ru.properties 2020-09-16 18:46:04 +03:00
Anuken
90978b54da
Merge pull request #2558 from sk7725/patch-16 
[KO] Unit name changes
 2020-09-16 10:50:39 -04:00
Anuken
edb776a549
Merge pull request #2521 from YellOw139/patch-1 
Create bundle_ro.properties
 2020-09-16 10:29:07 -04:00
Felix Corvus
41f3fcbe16
Update bundle_ru.properties 2020-09-16 16:01:47 +03:00
Felix Corvus
013995b30d
nicknames fixes 2020-09-16 15:13:25 +03:00
YellOw139
66aacd6ef0
Update bundle_ro.properties 2020-09-16 13:39:28 +03:00
YellOw139
703ad61b72
Update bundle_ro.properties 2020-09-16 13:38:54 +03:00
Thomas Widyantoko
22c2d8b010
Update bundle_in_ID.properties to match with v6 
with fixes from PR #2513, completed(?)
 2020-09-16 13:14:11 +07:00
YellOw139
9e81460adb
Update bundle_ro.properties 2020-09-16 08:18:01 +03:00
YellOw139
71df10c6d8
Update bundle_ro.properties 2020-09-16 07:43:07 +03:00
Sunny Kim
3407520645
[KO] Unit name changes 
[KO] Unit name changes, based on community reactions.
 2020-09-16 10:15:38 +09:00
Anuken
2877bdf0d6
Update bundle_ko.properties (#2475) 
* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties
 2020-09-15 20:36:18 -04:00
Anuken
23c56974b2 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	core/assets/bundles/bundle_uk_UA.properties
 2020-09-15 19:28:57 -04:00
Anuken
a5ce57e56d Deployment fixes 2020-09-15 19:28:38 -04:00
Prosta4okua
7e2b3a6e2d
Ukrainian translation (#2492) 
* Український переклад :flag_ua:

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Оновлення перекладу до стану 10.09.2020

* Update bundle_uk_UA.properties

* Оновлення на 15.09.2020

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties
 2020-09-15 18:21:11 -04:00
Anuken
903a2c069e Merge remote-tracking branch 'origin/master' 2020-09-15 18:00:39 -04:00
Anuken
306a660e87 Custom map weather definition 2020-09-15 18:00:29 -04:00
Petr Gašparík
e624c42026
Czech translation - up-to-date! (#2393) 
* Czech translation - up-to-date!

* fix
 2020-09-15 16:44:54 -04:00
Felix Corvus
76ed066a95
[Bundle][RU] actual L10n (#2381) 
* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* *Командный центр*

* Update bundle_ru.properties

* Update bundle_ru.properties

Новые (нет) юниты, Scepter и Reign

* Забыл про Toxopid

* [ru l10n] Обходчик -> Ползун

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* BasedUser was trolled by Anuke

* Update bundle_ru.properties

* Ого, вот это обновление окружения!

* *Ы*

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update achievements.vdf

* Update bundle_ru.properties

* Пункт снаряжения -> Пункт снабжения

Co-authored-by: TheSlaylord <62336673+TheSlaylord@users.noreply.github.com>
 2020-09-15 16:44:29 -04:00
YellOw139
f52693ae88
Update bundle_ro.properties 2020-09-15 21:55:17 +03:00
Anuken
b3d7515dcd Line optimization & cleanup 2020-09-15 13:19:02 -04:00
Anuken
50816deb9e Smarter payload routers / 2x display / Campaign tweaks 2020-09-14 14:09:15 -04:00
YellOw139
ac8c82eaa1
Update bundle_ro.properties 2020-09-14 14:52:45 +03:00
YellOw139
fffa07398e
Update bundle_ro.properties 2020-09-14 10:40:26 +03:00
YellOw139
7021d2b9fd
Update bundle_ro.properties 2020-09-14 09:45:51 +03:00
Anuken
7ce93c7f85 Prototype health/ammo indication 2020-09-13 21:08:24 -04:00
YellOw139
140569238b
Update bundle_ro.properties 2020-09-13 18:59:52 +03:00
YellOw139
12d8cba2a7
Update bundle_ro.properties 2020-09-13 16:11:43 +03:00
YellOw139
a5d36dff7e
Update bundle_ro.properties 2020-09-13 13:59:52 +03:00
Anuken
74cefb3ec9 Dacite decoration block / Environmental renaming 2020-09-10 15:17:10 -04:00
Anuken
aec4a07aec Fixed steam-generator bundle name 2020-09-10 10:29:54 -04:00
Anuken
3b5d6860d6 Bugfixes 2020-09-09 23:39:00 -04:00