Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,012 Commits 4 Branches 180 Tags
525dc0cd7e2d991e10f892c06f59b264201fa77e
Commit Graph
2502 Commits
Author SHA1 Message Date
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íkandRoman Plášil 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