Anuken
c250b1d24a
Fixes
2019-12-28 11:16:35 -05:00
Patrick 'Quezler' Mounier
5d62b1b318
Merge branch 'master' into crater
2019-12-28 09:39:21 +01:00
Patrick 'Quezler' Mounier
e0cfbc7609
All hail the cuteness of this crater roomba critter
2019-12-27 20:45:27 +01:00
Anuken
186a2aaa45
Merge branches 'master' and 'mech-rework' of https://github.com/Anuken/Mindustry into mech-rework
...
# Conflicts:
# 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/ai/BlockIndexer.java
# core/src/mindustry/core/World.java
# core/src/mindustry/entities/traits/Entity.java
# core/src/mindustry/entities/type/BaseEntity.java
# core/src/mindustry/entities/type/TileEntity.java
# core/src/mindustry/world/blocks/defense/MendProjector.java
# core/src/mindustry/world/blocks/defense/OverdriveProjector.java
# core/src/mindustry/world/blocks/production/Drill.java
# gradle.properties
2019-12-27 01:41:06 -05:00
Anuken
98f8a1732e
Renamed Calls -> Call
2019-12-26 23:00:26 -05:00
Anuken
1e7c83f0c9
Partial merge
2019-12-25 13:22:36 -05:00
Anuken
ee429ef4f2
Merge branches 'kill-packages' and 'master' of https://github.com/Anuken/Mindustry
2019-12-25 12:55:38 -05:00
Anuken
c7ea4e85c9
Serialize fixes
2019-12-25 12:47:14 -05:00
Anuken
32d28a4070
Merge branches '6.0' and 'master' of https://github.com/Anuken/Mindustry into 6.0
...
# 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/sprites3.png
# core/assets/sprites/sprites5.png
# core/src/io/anuke/mindustry/ctype/ContentType.java
# core/src/io/anuke/mindustry/ctype/UnlockableContent.java
# core/src/io/anuke/mindustry/io/LegacyMapIO.java
# core/src/io/anuke/mindustry/type/WeatherEvent.java
# gradle.properties
2019-12-24 12:40:23 -05:00
Vanguard and GitHub
341121f655
1 changed line
...
block.mass-driver.description
2019-12-24 14:01:38 +03:00
Patrick 'Quezler' Mounier and Anuken
f89af1b26a
Override inverted sorter arrow colours ( #1252 )
...
Override hex’s of the arrows by those of the unloader.
2019-12-24 00:32:04 -05:00
Patrick 'Quezler' Mounier
c279fda5e4
Suggest liquid void sprite
...
Uses the color of the corner(s) for the inner ring, just like how the item void is colored based on the item source.
2019-12-23 17:24:38 +01:00
Ali-C-Ila and Anuken
41e4187193
Added Chinese translator ( #1250 )
2019-12-22 12:01:41 -05:00
Ali-C-Ila and Anuken
ba7cf94a6b
Update bundle_zh_TW.properties ( #1211 )
...
* Update bundle_zh_TW.properties
* Update bundle_zh_TW.properties
* Update bundle_zh_TW.properties
* Update bundle_zh_TW.properties
* Update bundle_zh_TW.properties
2019-12-22 12:01:27 -05:00
Vanguard and Anuken
01de18b663
RU updates ( #1225 )
...
* 1 changed line, 1 removed line
Changed:
keybind.zoom.name
Removed:
keybind.zoom_hold.name
Moved some lines around to keep them in the same order with bundle.properties
* 1 changed line
tutorial.intro
* 3 new lines, 3 changed lines
New:
mod.erroredcontent
mod.errors
mod.noerrorplay
Changed:
mod.requiresversion
mod.remove.confirm
details
* 2 changed lines
mods.guide
mod.import.github
* 1 new line
link.feathub.description
* 1 changed line
item.graphite.description
2019-12-22 12:01:03 -05:00
Wina and Anuken
41a5c4daf3
Updated Spanish translation ( #1227 )
...
Translated a few items more and fixed gramatical mistakes of the old translation.
2019-12-22 11:20:59 -05:00
stuffyAI and Anuken
07e58dc14b
Update german language bundle ( #1226 )
...
Mostly adding new things to translate from last few updates, also some missing stuff
2019-12-22 11:13:38 -05:00
Vanguard and GitHub
196f37eff1
1 changed line
...
item.graphite.description
2019-12-22 15:27:39 +03:00
Anuken and GitHub
ede002878e
problem solved
2019-12-21 21:11:30 -08:00
Vanguard and GitHub
2e110bff20
1 new line
...
link.feathub.description
2019-12-20 18:20:07 +03:00
Anuken
adb12dcbb8
Bugfix
2019-12-19 21:58:43 -05:00
ado1928 and Anuken
5e568eac0d
Added Feathub to the "About" tab ( #1234 )
...
* Add files via upload
* Add files via upload
* Add files via upload
* Add files via upload
* Update Links.java
2019-12-19 19:33:24 -05:00
Vanguard and GitHub
f5b21c954e
Merge branch 'master' into master
2019-12-18 13:22:37 +03:00
Vanguard and GitHub
040f3d0254
2 changed lines
...
mods.guide
mod.import.github
2019-12-18 13:19:33 +03:00
Vanguard and GitHub
f2687e4a1a
3 new lines, 3 changed lines
...
New:
mod.erroredcontent
mod.errors
mod.noerrorplay
Changed:
mod.requiresversion
mod.remove.confirm
details
2019-12-17 21:27:48 +03:00
Anuken
6971a76c8e
І
2019-12-16 12:50:18 -05:00
Anuken
3cefc085bd
Tentative RU bundle changes
2019-12-15 22:11:07 -05:00
Anuken
3d8e5bd36a
Added new Cyrillic font
2019-12-15 21:31:55 -05:00
Anuken
d78d3daaf9
Updated script stub
2019-12-15 13:56:01 -05:00
Anuken
976d0f54b3
Merge branches 'master' and 'safe-mod-loading' of https://github.com/Anuken/Mindustry
...
# Conflicts:
# core/src/io/anuke/mindustry/mod/Mods.java
2019-12-15 13:55:30 -05:00
Anuken
1c1db3990f
Fully implemented safe content loading
2019-12-15 13:54:51 -05:00
Vanguard and GitHub
17ae17dced
1 changed line
...
tutorial.intro
2019-12-15 16:15:51 +03:00
Anuken
58e3143e2a
Content cleaning
2019-12-14 09:33:07 -05:00
71eb19d4f3
Update core/assets/bundles/bundle_fr.properties
...
Co-Authored-By: YaFou <33806646+YaFou@users.noreply.github.com >
2019-12-14 11:12:12 +01:00
TsjipTsjip
472069855c
Apply French localization.
2019-12-13 19:33:34 +01:00
Vanguard and GitHub
601f6af3c8
1 changed line, 1 removed line
...
Changed:
keybind.zoom.name
Removed:
keybind.zoom_hold.name
Moved some lines around to keep them in the same order with bundle.properties
2019-12-13 19:10:59 +03:00
TsjipTsjip
7f5e494709
Update bundle.properties
2019-12-13 14:52:15 +01:00
Anuken and GitHub
7b1a0a42d4
Merge pull request #1206 from joshuaptfan/zoom-no-hold
...
Make scroll zoom by default, remove zoom hold keybind
2019-12-12 18:35:29 -05:00
Anuken and GitHub
8c1c54d49a
Merge pull request #1207 from Prosta4okua/master
...
1 new line
2019-12-12 16:31:04 -05:00
Vanguard and GitHub
e22f853a31
1 new line
...
mod.scripts.unsupported
2019-12-13 00:08:23 +03:00
Anuken
1ae20553ff
Merge remote-tracking branch 'origin/master'
2019-12-12 16:07:40 -05:00
Anuken and GitHub
c68eaade94
Merge pull request #1204 from Prosta4okua/master
...
Ukrainian translation.
2019-12-12 16:07:29 -05:00
Anuken and GitHub
1461b5b357
Merge pull request #1205 from Prosta4okua/patch-2
...
True Ukrainian translation
2019-12-12 16:07:05 -05:00
Anuken and GitHub
f0dd3b3a39
Merge pull request #1109 from ballgamer56/patch-1
...
Thai translation
2019-12-12 15:54:50 -05:00
Anuken
61d724ee2b
Added Thai font
2019-12-12 15:54:25 -05:00
Prosta4okua and GitHub
d60c2c5b63
Merge branch 'master' into patch-2
2019-12-12 22:40:30 +02:00
Prosta4okua and GitHub
7e696cadaf
Update bundle_uk_UA.properties
2019-12-12 22:36:54 +02:00
Anuken and GitHub
0f23bf9d08
Merge pull request #1156 from martin-mfg/master
...
add and fix some German translations
2019-12-12 15:34:44 -05:00
Anuken and GitHub
202d79817a
Merge pull request #1149 from itskatt/french-translation
...
Update the French Translation
2019-12-12 15:34:06 -05:00
joshuaptfan
736737f151
Make scroll zoom by default, remove zoom hold keybind
2019-12-12 12:23:32 -08:00
Anuken
Patrick 'Quezler' Mounier
VanguardandGitHub
Ali-C-IlaandAnuken
WinaandAnuken
stuffyAIandAnuken
ado1928andAnuken
Prosta4okuaandGitHub
joshuaptfan