Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,142 Commits 4 Branches 180 Tags
9060a9518a34586e13b59d5d069784d83bbbb093
Commit Graph
2232 Commits
Author SHA1 Message Date
VanguardandGitHub 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íkGitHubRoman 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
TheMrAlbertandGitHub 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
grimsoul10andGitHub 5d2c36f186 Small changes (#1) 
* Small changes
* Capitalizations
 2020-10-04 10:48:48 +07:00
Thomas WidyantokoandGitHub 3e49c68ec2 Updated for missing lines 2020-10-04 10:08:42 +07:00
ThePythonGuyandGitHub 50491755d1 typo and stuff 2020-10-03 16:59:39 +02:00
老滑稽andGitHub 04b03b0749 Update bundle_zh_CN.properties 2020-10-02 08:19:31 +08:00
老滑稽andGitHub b7b2da6bbd Update bundle_zh_CN.properties 2020-10-01 21:01:30 +08:00
VanguardandGitHub 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
YellOw139andGitHub 09934d9e12 Foreshadow 2020-09-30 19:15:52 +03:00
Felix CorvusandGitHub aeaa5ac6e2 some trick 2020-09-30 15:42:07 +03:00
Felix CorvusandGitHub 54d4f733ef Update bundle_ru.properties 2020-09-30 14:35:52 +03:00
Felix CorvusandGitHub 75d8f93dd9 Update bundle_ru.properties 2020-09-30 14:07:06 +03:00
Felix CorvusandGitHub 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 WidyantokoandGitHub d86813bbb3 Merge branch 'master' into patch-1 2020-09-30 07:12:28 +07:00
Petr Gašparík 250150a30c Czech cleanup 2020-09-28 10:24:50 +02: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
Prosta4okuaandGitHub 52a610a957 Update bundle_uk_UA.properties 2020-09-25 14:13:06 +03:00
Prosta4okuaandGitHub 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
YellOw139andGitHub 08e6b4f2d7 Multiplayer note and the latest cleanup 2020-09-25 10:48:52 +03:00
老滑稽andGitHub 8132cd9ba7 Update bundle_zh_CN.properties 2020-09-25 12:29:37 +08:00
Felix CorvusandGitHub 54ce446a7f nothing 2020-09-25 03:17:32 +03:00
Felix CorvusandGitHub 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
老滑稽andGitHub 1607a96a6a Update bundle_zh_CN.properties 2020-09-25 00:17:43 +08:00
老滑稽andGitHub f5c8d0bf52 Update bundle_zh_CN.properties 2020-09-25 00:12:45 +08:00
老滑稽andGitHub f95f6d8c7b Update bundle_zh_CN.properties 2020-09-25 00:07:24 +08:00
老滑稽andGitHub 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
YellOw139andGitHub 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
老滑稽andGitHub c2348f9019 Update bundle_zh_CN.properties 2020-09-24 13:10:06 +08:00
AnukenandGitHub 35460f0b5f Merge pull request #2692 from Prosta4okua/master 
immediate RU L10n update
 2020-09-23 23:03:54 -04:00
Felix CorvusandGitHub 90fe7d7e59 immediate RU L10n update 2020-09-24 05:34:37 +03:00
AnukenandGitHub 75ebaab3a3 Merge pull request #2660 from J-VdS/schematic 
Server disable schematic option (fix #2382)
 2020-09-23 22:01:06 -04:00