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
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
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
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
Anuken
3f74c61c0a
Map center button
2020-10-10 12:05:11 -04:00
Pietro303HD
2e4cbdcc05
Update bundle_pt_BR.properties
2020-10-10 09:51:23 -03:00
Patrick 'Quezler' Mounier
d776744905
Update leak behaviour in plated conduit description
2020-10-09 19:11:56 +02:00
Anuken
c7f1204119
space
2020-10-08 15:14:28 -04:00
Anuken
7088ae89b3
Logic unit control
2020-10-05 15:42:37 -04: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
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
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
3e81d194cb
New liquid turret - Tsunami
2020-09-25 11:49:04 +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
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
Anuken
f3e08f9cb6
Internal refactoring & cleanup
2020-09-22 15:50:33 -04:00
J-VdS
ba4612ed96
indent
2020-09-22 19:00:25 +02:00
J-VdS
4608697d0d
capitals
2020-09-22 18:59:35 +02:00
J-VdS
f4003fd463
merge
2020-09-22 18:41:24 +02:00
J-VdS
51065b57c4
info popup
2020-09-22 18:40:04 +02:00
