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
55be1fd969
Apply suggestions from code review
...
Co-authored-by: Roman Plášil <me@rplasil.name >
2020-10-05 11:55:01 +02:00
TheMrAlbert and GitHub
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 and GitHub
5d2c36f186
Small changes ( #1 )
...
* Small changes
* Capitalizations
2020-10-04 10:48:48 +07:00
Thomas Widyantoko and GitHub
3e49c68ec2
Updated for missing lines
2020-10-04 10:08:42 +07: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
老滑稽 and GitHub
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
老滑稽 and GitHub
b7b2da6bbd
Update bundle_zh_CN.properties
2020-10-01 21:01:30 +08:00
Vanguard and GitHub
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 and GitHub
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 and GitHub
09934d9e12
Foreshadow
2020-09-30 19:15:52 +03:00
LeoDog896
fbb317aa11
Update contributors
2020-09-30 09:30:12 -04:00
Felix Corvus and GitHub
aeaa5ac6e2
some trick
2020-09-30 15:42:07 +03:00
Felix Corvus and GitHub
54d4f733ef
Update bundle_ru.properties
2020-09-30 14:35:52 +03:00
Felix Corvus and GitHub
75d8f93dd9
Update bundle_ru.properties
2020-09-30 14:07:06 +03:00
Felix Corvus and GitHub
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 and GitHub
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
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
Anuken
ff84d72e20
Cleaner wall sprites
2020-09-27 00:43:00 -04:00
Anuken
ae46535365
Sprite cleanup
2020-09-26 22:31:49 -04:00
Anuken
0c7ce94b13
Sprite cleanup
2020-09-26 22:29:15 -04:00
Anuken
7b98628084
Unbroke wave sprite
2020-09-26 22:20:02 -04:00
Anuken
d4d3b71d7d
Fixed #2735
2020-09-26 09:46:16 -04:00
Prosta4okua and GitHub
52a610a957
Update bundle_uk_UA.properties
2020-09-25 14:13:06 +03:00
Prosta4okua and GitHub
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 and GitHub
08e6b4f2d7
Multiplayer note and the latest cleanup
2020-09-25 10:48:52 +03:00
老滑稽 and GitHub
8132cd9ba7
Update bundle_zh_CN.properties
2020-09-25 12:29:37 +08:00
Felix Corvus and GitHub
54ce446a7f
nothing
2020-09-25 03:17:32 +03:00
Petr Gašparík
TheMrAlbertandGitHub
grimsoul10andGitHub
Thomas WidyantokoandGitHub
Anuken
老滑稽andGitHub
VanguardandGitHub
Patrick 'Quezler' MounierandGitHub
Leonwang4234
slava0135
YellOw139andGitHub
LeoDog896
Felix CorvusandGitHub
Prosta4okuaandGitHub