Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,297 Commits 4 Branches 180 Tags
cffba7b685742938f8a5a753a89f596f82f2d08f
Commit Graph
5129 Commits
Author SHA1 Message Date
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
Anuken 5861fe61b2 Cleanup 2020-10-02 19:51:30 -04:00
Anuken 138434d029 Fixed #2799 / Fixed #2797 2020-10-02 09:54:08 -04:00
老滑稽 04b03b0749 Update bundle_zh_CN.properties 2020-10-02 08:19:31 +08:00
Anuken 68c41774e4 More contrast for specific colors 2020-10-01 14:22:48 -04: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
Patrick 'Quezler' Mounier 8e4d00d594 Move cryofluid mixer emoji back to the old number 2020-10-01 11:03:59 +02:00
Anuken b15cdfef46 sprites repacked 2020-09-30 22:37:32 -04:00
Leonwang4234 9601c81045 change sprite name 2020-09-30 18:05:43 -07: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
Anuken 1697fec311 Tsunami balancing 2020-09-30 16:40:45 -04:00
Anuken d07c74b60f Re-added tap event for servers 2020-09-30 15:01:46 -04:00
Anuken 03d676403f Cleanup 2020-09-30 14:50:05 -04:00
slava0135 feb8202b73 better stats... 2020-09-30 21:17:44 +03:00
slava0135 a806d7c019 Fun fact: 1.0 is smaller than 10 2020-09-30 20:41:56 +03:00
YellOw139 09934d9e12 Foreshadow 2020-09-30 19:15:52 +03:00
LeoDog896 fbb317aa11 Update contributors 2020-09-30 09:30:12 -04: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
slava0135 fb53abe593 Final? design 2020-09-29 21:27:41 +03:00
slava0135 cbc2205347 Merge branch 'master' of https://github.com/Anuken/Mindustry into tsunami 
 Conflicts:
	core/assets/sprites/block_colors.png
	core/assets/sprites/fallback/sprites.atlas
	core/assets/sprites/fallback/sprites.png
	core/assets/sprites/fallback/sprites2.png
	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
 2020-09-29 18:31:42 +03:00
Petr Gašparík de459df26b Merge branch 'master' of https://github.com/Anuken/Mindustry into v106-alpha 2020-09-29 13:43:13 +02:00
Anuken c89d6f6b74 Re-packed sprites from PR 2020-09-28 18:42:09 -04: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
Anuken ff84d72e20 Cleaner wall sprites 2020-09-27 00:43:00 -04:00