7091cad704
Merge branches '6.0' and 'master' of https://github.com/Anuken/Mindustry into 6.0
2020-04-23 14:05:09 -04:00
cec5c24d69
progress
2020-04-23 13:58:06 -04:00
37240478b8
Update bundle_zh_CN.properties ( #1900 )
...
* Update bundle_zh_CN.properties
* Update bundle_zh_CN.properties
2020-04-23 11:08:33 -04:00
cf69fa1d7c
Update bundle_es.properties ( #1899 )
...
* Update bundle_es.properties
* Update bundle_es.properties
2020-04-22 16:20:07 -04:00
390b5e3b60
Update bundle_pt_BR.properties ( #1881 )
2020-04-21 11:03:25 -04:00
05cfe7a80a
Fixed inconsistencies with the word 'schematic' ( #1892 )
...
설계도 and 회로도 are both schematic.
2020-04-21 11:03:09 -04:00
32e32ecae2
Merge branch '6.0' into crater
...
# Conflicts:
# core/assets/icons/icons.properties
# core/assets/sprites/block_colors.png
# core/assets/sprites/sprites.atlas
# core/assets/sprites/sprites.png
# core/assets/sprites/sprites2.png
# core/assets/sprites/sprites4.png
# core/assets/sprites/sprites6.png
2020-04-16 22:38:51 +02:00
280f3dd428
Added experimental package
2020-04-16 16:31:43 -04:00
1acc6461e6
Grow the circle slightly inward
2020-04-16 22:05:55 +02:00
9864383300
Revert 〃
2020-04-16 21:15:49 +02:00
41eb51a340
Experiment with visible ports
2020-04-16 21:11:59 +02:00
79a095faa8
Merge branch '6.0' into crater
2020-04-16 20:30:13 +02:00
a05f4338c5
Waspify the crater 🐝
2020-04-16 20:24:07 +02:00
2693f9c176
Implemented some PR features
2020-04-16 13:46:45 -04:00
15750b5eb0
Korean localization fixes and changes. ( #1874 )
2020-04-16 13:33:38 -04:00
589d4c92d1
Scale crater from 16x16 to 20x20
2020-04-16 18:39:24 +02:00
83511368f6
Stash shadow draft
2020-04-16 17:44:43 +02:00
a1d4804fae
Merge branch '6.0' into crater
...
# Conflicts:
# core/assets/sprites/block_colors.png
# core/assets/sprites/sprites.atlas
# core/assets/sprites/sprites.png
# core/assets/sprites/sprites2.png
# core/assets/sprites/sprites4.png
# core/assets/sprites/sprites6.png
# core/src/mindustry/ui/fragments/PlayerListFragment.java
2020-04-16 17:13:18 +02:00
a8f4df8030
Merge branches '6.0' and 'master' of https://github.com/Anuken/Mindustry into 6.0
...
# Conflicts:
# core/src/mindustry/ui/fragments/PlayerListFragment.java
2020-04-16 10:14:13 -04:00
256f805754
Payload fixes
2020-04-16 09:55:57 -04:00
7d6e8fdcd1
Update bundle_zh_TW.properties ( #1876 )
...
* Update bundle_zh_TW.properties
* Update bundle_zh_TW.properties
2020-04-16 09:14:36 -04:00
5c28985ee6
Merge branch '6.0' into crater
...
# Conflicts:
# core/assets/icons/icons.properties
# core/assets/sprites/block_colors.png
# core/assets/sprites/sprites.atlas
# core/assets/sprites/sprites.png
# core/assets/sprites/sprites3.png
# core/assets/sprites/sprites5.png
# core/src/mindustry/content/Blocks.java
# core/src/mindustry/ui/fragments/PlayerListFragment.java
# core/src/mindustry/world/BlockStorage.java
2020-04-16 12:39:52 +02:00
424e58ff7d
Merge branch 'master' into crater
2020-04-16 11:20:16 +02:00
0eaf9bc9c6
Various prototypes
2020-04-15 12:44:53 -04:00
305632c002
Update bundle_uk_UA.properties ( #1871 )
2020-04-15 10:36:38 -04:00
18e92f5abf
RU updates ( #1866 )
...
* Update bundle_ru.properties
* Felix alive (phantom description)
* RU bundle Phantom description fix
* 2 lines changed
wave.enemies
wave.enemy
* 6 lines changed
editor.overwrite.confirm
confirmban
confirmkick
confirmvotekick
confirmadmin
confirmunadmin
Co-authored-by: Prosta4okua <31485341+Prosta4okua@users.noreply.github.com >
Co-authored-by: Felix Corvus <remint32@yandex.ru >
2020-04-14 10:04:29 -04:00
a10235d6b0
I18n es tiny fix ( #1865 )
...
* Update some translations into spanish.
* Need a white space between #wave_number and wave word (in spanish).
* Added translation for 'search'.
* Fix translate of 'bleeding edge' is https://www.urbandictionary.com/define.php?term=Bleeding%20edge . It is not a name.
* Fixed some spanish strings about schematic.
* Fixed some translations in spanish.
2020-04-14 10:04:13 -04:00
25bc6ebaf0
Minor changes ( #1858 )
2020-04-13 21:22:49 -04:00
9a0292268e
Minor changes in bundle_es.properties ( #1861 )
...
Added some clarifications in the tutorial and corrected multiple spelling and grammar errors.
2020-04-13 21:21:20 -04:00
91f9ce3098
update ( #1862 )
2020-04-13 21:21:10 -04:00
c717084cb9
Cleanup
2020-04-13 18:07:00 -04:00
2af12a632a
Added basic multi-unit factories
2020-04-13 16:56:33 -04:00
474ddcf989
Update bundle_uk_UA.properties ( #1811 )
2020-04-12 18:06:09 -04:00
8093f69b6a
Update bundle_pt_BR.properties ( #1839 )
...
* Update bundle_pt_BR.properties
* Update bundle_pt_BR.properties
* Update bundle_pt_BR.properties
* Update bundle_pt_BR.properties
2020-04-12 17:43:51 -04:00
bc20967262
Update bundle_ja.properties ( #1848 )
...
* update
* update
* update
2020-04-12 13:36:01 -04:00
501253d13a
added name of player to ban/kick/vote-kick/un-admin/admin confirmation dialog ( #1846 )
...
* added name of player to baning/kicking/vote-kicking/admining
* slight tweaks
* fixed redundant things
2020-04-12 10:52:05 -04:00
603d8b16d0
Various tweaks
2020-04-12 10:26:18 -04:00
9e811be477
Name which map name has a conflict when importing ( #1844 )
2020-04-12 09:56:36 -04:00
b1f32d241b
Merge branches '6.0' and 'master' of https://github.com/Anuken/Mindustry into 6.0
...
# Conflicts:
# core/assets/bundles/bundle_uk_UA.properties
# core/src/mindustry/core/NetClient.java
# core/src/mindustry/ui/fragments/PlayerListFragment.java
# core/src/mindustry/world/blocks/power/ImpactReactor.java
# gradle.properties
2020-04-11 10:37:52 -04:00
9c1730685c
Czech translation - up to date ( #1836 )
2020-04-10 18:45:01 -04:00
67a084a5e7
Cleanup
2020-04-10 13:49:36 -04:00
2395bc9308
Bugfixes / Testing reaper sprite
2020-04-10 12:55:58 -04:00
aedd047c6f
Slightly improved mod dialog
2020-04-10 11:49:22 -04:00
4ec85ae72b
Update bundle_pt_BR.properties ( #1833 )
...
Some changes on turrets description.
2020-04-10 08:34:17 -04:00
5ac8ae2a00
I18n es tiny fix ( #1835 )
...
* Update some translations into spanish.
* Need a white space between #wave_number and wave word (in spanish).
2020-04-10 08:34:09 -04:00
b4739e6036
Simpler sun shader
2020-04-09 21:15:42 -04:00
dedb63e9b6
tweaks
2020-04-09 21:03:16 -04:00
803538d5be
Better detail
2020-04-09 20:55:59 -04:00
1efbd9dcf2
Faster shaders (?)
2020-04-09 20:50:11 -04:00
0a2ff97eb0
Update bundle_pt_BR.properties ( #1830 )
2020-04-09 09:59:03 -04:00
