Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,891 Commits 4 Branches 180 Tags
6f3c771d733c150c8bea787722511914f20bef62
Commit Graph

2453 Commits

Author SHA1 Message Date
Anuken
f7791a2bb2 Merge; internal changes 2020-01-10 11:30:42 -05:00
Artur Quaresma
f183cf1882 Rename bundle_pt.properties to bundle_pt_PT.properties (#1339) 
It´s better since theres is a bundle_pt_BR, and not being confuse for some
 2020-01-09 08:56:00 -05:00
J-VdS
9b82333a69 typo (#1343) 2020-01-08 17:36:58 -05:00
GioIacca9
08bae1fa15 Updated liquid void name and description (#1341) 2020-01-08 16:57:36 -05:00
Anuken
a7cddf97b8 Implemented bridge opacity from #1006 2020-01-08 16:16:19 -05:00
Anuken
8f208920f7 Merged in liquid void 2020-01-08 11:04:12 -05:00
Anuken
1193e18ee1 Updated bundles post-merge 2020-01-08 11:01:12 -05:00
Anuken
c04c825cec Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	core/assets/bundles/bundle_cs.properties
#	core/assets/bundles/bundle_fr.properties
#	core/assets/bundles/bundle_it.properties
#	core/assets/bundles/bundle_nl.properties
#	core/assets/bundles/bundle_pt.properties
#	core/assets/bundles/bundle_ru.properties
#	core/assets/bundles/bundle_zh_TW.properties
 2020-01-08 11:00:19 -05:00
Anuken
5ad09d6d80 Updated bundles with proper spacing 2020-01-08 10:59:29 -05:00
Patrick 'Quezler' Mounier
4a94a6c059 Update dutch localization (#1315) 
* Run gradle tools:updatebundles for nl

* Update 🇳🇱 bundle

Wow this took several hours, didn’t expect that. 🙈

* Implement @TsjipTsjip’s review

* Oops

* 〃

* 〃

* 〃

* 〃

* 〃

* 〃

* 〃
 2020-01-08 10:52:43 -05:00
Valentin Lorentz
379f0b1c71 Fix translation of "silicon" in fr_BE (#1298) 
This was fixed by 3b9980c01e in the fr translation, but not this one.
 2020-01-08 10:52:19 -05:00
Ali-C-Ila
45aa23f94d Update bundle_zh_TW.properties (#1303) 2020-01-08 10:52:07 -05:00
Petr Gašparík
27f396a1e0 Revision of Czech translation [up to line 564]: consistency with English file, terms, grammar, semantics (#1284) 
* Improving Czech translation, up to line  374 now

* Czech translation, revisited up to line 468

* Translation revision up to line 510.

* Czech translation - small fixes here and there.

* Czech translation - small fixes here and there.

* Czech lang. - Fixed some typos found by @dusekdan

* Czech - revision up to line 564

* Czech tr. - small fixes to fit into GUI

* Czech tr. - small fixes after checking GUI
 2020-01-08 10:51:48 -05:00
Artur Quaresma
b44aa8e23a Update bundle_pt.properties (#1334) 2020-01-08 10:30:27 -05:00
Alessandro Maurizio
b5d5bb21b1 Fix Steam Achievement italian translation error (#1324) 
* Fix Steam Achievement italian translation error

* Fix wrong Revenant Factory italian description
 2020-01-08 10:30:11 -05:00
itskatt
3cc0990a94 translate (#1311) 2020-01-08 10:22:15 -05:00
Vanguard
2692b60d21 RU updates (#1277) 
* 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

* 1 changed line

block.mass-driver.description

* 9 new lines, 1 changed line

New:
be.update
be.update.confirm
be.updating
be.ignore
be.noupdates
be.check
server.kicked.serverRestarting
setting.coreselect.name
rules.blockhealthmultiplier

Changed:
wave.enemy

* 3 changed lines

quit.confirm.tutorial
setting.coreselect.name
public.confirm

* 22 changed lines

mod.missing
item.plastanium.name
block.plastanium-wall.name
block.plastanium-wall-large.name
block.plastanium-compressor.name
item.scrap.description
item.spore-pod.description
item.blast-compound.description
liquid.oil.description
unit.revenant.description
block.multi-press.description
block.plastanium-compressor.description
block.spore-press.description
block.power-source.description
block.force-projector.description
block.conveyor.description
block.mass-driver.description
block.liquid-junction.description
block.phase-conduit.description
block.thorium-reactor.description
block.blast-drill.description
block.cyclone.description
 2020-01-08 10:21:21 -05:00
GioIacca9
3e636b73ce Updated Italian translations (#1297) 
* Update it-IT translation

* Update bundle_it.properties
 2020-01-08 10:21:09 -05:00
Aaron B
24adec99f4 Updated some german translations (#1295) 
block.tar.name = Teer is right, but the only thing you get from tar is oil so why not name it oil?
 2020-01-08 10:20:56 -05:00
Spico (Spirit Guy)
af1b73be69 Update bundle_tr.properties (#1293) 
Fixed Line 418 not appearing at the right colour
 2020-01-08 10:20:21 -05:00
Rasangus
44e745ac37 Update bundle_pt_BR.properties (#1281) 2020-01-07 19:42:48 -05:00
Anuken
854e69322b Merge remote-tracking branch 'origin/master' 2020-01-06 08:38:13 -05:00
Anuken
03286b29e8 Changed Cyrillic font 2020-01-06 08:37:19 -05:00
Daniel Dušek
9d9e31948d Add - tutorial localized, description coverage++, fix broken translations (#1327) 2020-01-05 17:41:41 -05:00
CinExPL
62947b9417 Update bundle_pl.properties (#1285) 
- reverted back some changes made by @FarmerThanos,
- fixed some errors,
- compared to english file.
 2019-12-30 23:03:46 -05:00
FarmerThanos
565064cd64 Updated bundle_pl.properties (#1273) 
* Updated bundle_pl.properties

Corrected some translations, translated some options and added a description to the Battery Diode.

* Update bundle_pl.properties

Reverted some changes
 2019-12-29 18:52:44 -05:00
Petr Gašparík
9d2e356996 Update bundle_cs.properties (#1267) 
Rewamping Czech translation. First part.
 2019-12-29 18:52:06 -05:00
Ali-C-Ila
ae5685ae46 Update bundle_zh_TW.properties (#1263) 
* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties
 2019-12-29 18:51:58 -05:00
Predator127
2b46b0e38e Update bundle_pt_BR.properties (#1253) 
* Update bundle_pt_BR.properties

Hi there! my name is Zero! also known as Hanko, I've translated for a long time since then.
I've been lookin through the new translations since i've been out for quite a long time, but dont think i forgot that i was a translator!

* Update bundle_pt_BR.properties
 2019-12-29 18:51:52 -05:00
GioIacca9
e200dcee33 Update bundle_it.properties (#1240) 2019-12-29 18:51:45 -05:00
PlayerBrasil13
fe63b46b67 Update bundle_pt_BR.properties (#1232) 2019-12-29 18:51:37 -05:00
SpiffyBadGaster
698e83a28a Make translation better (#1222) 
* Make translation better

* Make something better

* Fix that javaline

* Make Translate better

Not finish

* Make Translate better

Not finish
 2019-12-29 18:51:30 -05:00
Prosta4okua
150d0bf513 [WIP]Update bundle_uk_UA.properties (#1220) 
* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* 17.12.2019
 2019-12-29 18:51:22 -05:00
Prosta4okua
5af7cd1d55 Update bundle_uk_UA.properties (#1275) 2019-12-29 18:50:59 -05:00
Anuken
670f085f78 New, improved minimap / Bugfixes 2019-12-29 17:56:10 -05:00
Anuken
6edcbb9120 Bugfixes 2019-12-29 14:38:03 -05:00
Anuken
566052cabf Fixed #1272 2019-12-29 12:24:51 -05:00
Anuken
730d30ef98 Added core schematic selection setting 2019-12-29 11:40:52 -05:00
Anuken
8c941c7165 Added update trigger / Server moddability tweaks 2019-12-28 21:34:20 -05:00
Anuken
16ddb91466 Merge remote-tracking branch 'origin/master' 2019-12-28 16:30:46 -05:00
Anuken
e1bf8bdab1 Added BE auto-updater / Server config / Fixed #1266 2019-12-28 16:30:40 -05:00
AmateurPotion
d43b40fab5 Update bundle_ko.properties (#1262) 2019-12-28 11:21:55 -05:00
Anuken
c250b1d24a Fixes 2019-12-28 11:16:35 -05: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
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
Patrick 'Quezler' Mounier
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
41e4187193 Added Chinese translator (#1250) 2019-12-22 12:01:41 -05:00