Summet
|
37cafe5081
|
Бета
|
2020-10-13 23:31:41 +03: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 |
|
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 |
|
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 |
|
Felix Corvus
|
fcb027f3e5
|
Космос ✨
|
2020-10-09 00:56:42 +03:00 |
|
Anuken
|
c7f1204119
|
space
|
2020-10-08 15:14:28 -04: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 |
|
Anuken
|
7088ae89b3
|
Logic unit control
|
2020-10-05 15:42:37 -04: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 |
|
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 |
|
slava0135
|
3e81d194cb
|
New liquid turret - Tsunami
|
2020-09-25 11:49:04 +03: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
|
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 |
|
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
|
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 |
|
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 |
|