mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-25 22:58:47 +07:00
Code Issues Packages Projects Releases Wiki Activity
9,353 Commits 4 Branches 160 Tags 2.3 GiB
9a7e0fb45e
Commit Graph

3723 Commits

Author SHA1 Message Date
Felix Corvus
e31d293bab
Update bundle_ru.properties 2020-10-16 18:34:29 +03:00
Anuken
2f54edf34f Sector refactoring, invasions and cleanup 2020-10-16 11:02:24 -04:00
Felix Corvus
421fcd5705
Update bundle_ru.properties 2020-10-16 04:55:31 +03:00
Rodrigo
685fd51b6f
S 
completely useless "S"
 2020-10-15 21:43:06 -03:00
Anuken
86c2fe8805 too many things to list 2020-10-15 13:44:20 -04:00
xXextremeduro69420Xx
17725ddfe8
Update bundle_pt_BR.properties 
Small changes and fixed some typos.
 2020-10-14 11:32:37 -03:00
Prosta4okua
592708811b
Update bundle_uk_UA.properties 2020-10-14 14:54:21 +03:00
YellOw139
99b3a224d0
Typo fix 2020-10-14 11:49:13 +03:00
YellOw139
80bf157752
[Bundle][RO] Translation Update 
This PR was tested in-game and is ready to merge at any time (unless marked as draft).

Changelog:

- New strings/changes up to commit 1554fd0394
- Typo fixes & various other improvements
 2020-10-14 11:45:09 +03:00
Petr Gašparík
a85a20b346 Czech translation up to commit 1554fd0 2020-10-14 08:00:43 +02:00
Anuken
bb655100ee
Merge pull request #2865 from sk7725/patch-18 
Update bundle_ko.properties
 2020-10-13 19:38:18 -04:00
Felix Corvus
4b0c34c5c9
Перевод небесных тел 2020-10-14 02:03:10 +03:00
Anuken
1554fd0394 Planet selection for mods 2020-10-13 18:50:18 -04:00
Anuken
6bfae1c34f
Merge pull request #2932 from Prosta4okua/master 
Update bundle_ru.properties
 2020-10-13 18:09:59 -04:00
Anuken
cce8b5a530 Merge remote-tracking branch 'origin/master' 2020-10-13 18:09:49 -04:00
Anuken
a8b55c27e8 x 2020-10-13 18:09:46 -04:00
Anuken
41c08a64e2
Merge pull request #2724 from Prosta4okua/patch-6 
Ukrainian localisation
 2020-10-13 18:07:35 -04:00
Felix Corvus
f846125e78
Update bundle_ru.properties 2020-10-14 01:07:32 +03:00
Anuken
caab6c1fa3
Merge pull request #2720 from Prosta4okua/master 
[Bundle][RU] actual L10n
 2020-10-13 18:06:45 -04:00
Anuken
7a770d8aed
Merge pull request #2696 from YellOw139/patch-4 
[Bundle][RO] Translation Update
 2020-10-13 18:06:31 -04:00
Anuken
77458e1e4d
Merge pull request #2694 from PetrGasparik/v106-alpha 
[v107-alpha] Czech translation - update
 2020-10-13 18:06:16 -04:00
Anuken
64cae7d877
Merge pull request #2693 from laohuaji233/patch-38 
Update bundle_zh_CN.properties(finished)
 2020-10-13 18:06:07 -04:00
Anuken
0e544825f9
Merge pull request #2481 from Pietro303HD/patch-2 
some small changes, and also removed a typo
 2020-10-13 18:03:56 -04:00
Anuken
3bf80e6732
Merge pull request #2420 from DaGamerFiles/patch-1 
Indonesian translation
 2020-10-13 18:03:47 -04:00
Felix Corvus
e612213969
Update bundle_ru.properties 2020-10-14 00:44:10 +03:00
Summet
37cafe5081
Бета 2020-10-13 23:31:41 +03:00
Anuken
4bf2b3b43e Now in beta 2020-10-13 16:18:11 -04:00
Anuken
d4c72b2a9c
Merge pull request #2915 from genNAowl/pierce-cap-info 
Add `pierceCap` Info
 2020-10-13 10:53:17 -04:00
Leonwang4234
24d295a924 add infinitepierce + bugfixes 2020-10-12 17:57:00 -07:00
Felix Corvus
7564f93445
Merge branch 'master' into master 2020-10-12 22:11:18 +03:00
Vanguard
e2403b96e6
3 changed lines 
indev.popup
block.silicon-smelter.description
block.alloy-smelter.description
 2020-10-12 17:38:56 +03:00
Summet
2a1ce6109e
Дацитовый валун (#23) 2020-10-12 17:25:13 +03:00
Vanguard
eec7408b0e
3 lines added; 1 line changed 
Added:
wave.guardianwarn
wave.guardianwarn.one
lastaccessed

Changed:
block.silicon-smelter.description
 2020-10-12 17:08:57 +03:00
Anuken
f10c5c1ca8 Merge remote-tracking branch 'origin/master' 2020-10-12 10:06:41 -04:00
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
Anuken
fb831e8fef Better cliff sprites 2020-10-10 11:37:58 -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
Anuken
81633dace4 Merge remote-tracking branch 'origin/master' 2020-10-09 13:52:15 -04:00
Anuken
c78088ab5f Harder default waves 2020-10-09 13:52:07 -04:00
Patrick 'Quezler' Mounier
d776744905
Update leak behaviour in plated conduit description 2020-10-09 19:11:56 +02:00
Anuken
22f1c3b2d1 Bugfixes 2020-10-09 10:02:08 -04:00
Sunny Kim
30a5c6631b
consistency 2020-10-09 15:50:27 +09:00
Anuken
0a0af9c291 Random derelicts in sectors 2020-10-08 19:11:20 -04:00
Felix Corvus
fcb027f3e5
Космос ✨ 2020-10-09 00:56:42 +03:00
Anuken
c7f1204119 space 2020-10-08 15:14:28 -04:00
Anuken
d06449f311 space 2020-10-08 14:06:07 -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
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
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
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
Anuken
0a07458186 Power-based ammo / Refactoring / IP kicks / Fixes 2020-09-24 13:05:39 -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
764b93154e Turret sprite tweaks 2020-09-23 19:16:33 -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
Anuken
1cc8d7e3f4 Balance 2020-09-23 15:21:06 -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