Commit Graph

5907 Commits

Author SHA1 Message Date
Anuken
bbf87df373 a revelation 2020-01-11 23:41:12 -05:00
Anuken
dbc45985ce Added log file 2020-01-11 20:09:20 -05:00
Anuken
d6dec002c1 Added remote tile set/remove methods 2020-01-11 19:32:08 -05:00
Anuken
4aa4e15de5 Arc 2020-01-11 19:21:37 -05:00
Anuken
7e7d2019af Made Android files external 2020-01-11 19:21:16 -05:00
Anuken
10634af104 Fixed #1360 2020-01-11 17:11:51 -05:00
Anuken
15f5f2fad9 Cleanup 2020-01-11 14:08:03 -05:00
Anuken
6d30840eb1 Fixed #1358 2020-01-11 12:57:21 -05:00
Anuken
7437100c96 Merge remote-tracking branch 'origin/master' 2020-01-11 12:50:08 -05:00
Anuken
35835cacd3 Fixed #1355 2020-01-11 12:47:54 -05:00
Anuken
fbedc95ad9 Mesh-based rendering 2020-01-11 10:44:07 -05:00
Anuken
f26e0b4609 Hexagonal planet 2020-01-11 00:39:37 -05:00
FranLamark
1d8de2d222 Update bundle_es.properties (NEW!) (#1352)
(Nuevas cosas agregadas dentro del juego (Por Anuke) y traducidas al español por mi y otros, aparte de un retoque en algunas traducciones con errores/letras de más)
Solo para la versión en español.
(New things added within the game (By Anuke) and translated into Spanish by me and others, apart from a touch-up in some translations with more errors / lyrics)
Only for the Spanish version.
2020-01-10 22:16:06 -05:00
Anuken
f918cdeced More rendering stuff 2020-01-10 20:27:10 -05:00
Anuken
49137d4f58 an actual planet 2020-01-10 15:54:39 -05:00
Anuken
eebbf9bbf4 Merge branches '6.0' and 'master' of https://github.com/Anuken/Mindustry into 6.0 2020-01-10 15:23:19 -05:00
Anuken
647ae27020 Fixes 2020-01-10 15:20:48 -05:00
Anuken
e45df98f26 Merge branch 'master' of https://github.com/Anuken/Mindustry into 6.0
# Conflicts:
#	core/src/mindustry/graphics/Bloom.java
#	gradle.properties
2020-01-10 15:19:07 -05:00
Anuken
677aa0d0bf Shortening of a few classes 2020-01-10 15:13:34 -05:00
Anuken
6cf7651069 Merge remote-tracking branch 'origin/master' 2020-01-10 11:39:48 -05:00
Anuken
18e73b1a4a Fixed mech pad indicators displaying onscreen 2020-01-10 11:39:38 -05:00
GioIacca9
87442853bb Added setting.bridgeopacity.name (#1347) 2020-01-10 11:17:48 -05:00
Anuken
5675565c96 Merge remote-tracking branch 'origin/master' 2020-01-09 14:56:26 -05:00
Anuken
6050274c0f Bugfixes 2020-01-09 14:56:21 -05:00
Anuken
75f8a495e7
Update feature_request.md 2020-01-09 14:35:33 -05:00
Anuken
5d6b8acf4c
Update feature_request.md 2020-01-09 14:35:09 -05:00
Anuken
65ee2d2b9e Merge remote-tracking branch 'origin/master' 2020-01-09 12:07:41 -05:00
Anuken
e06f514023 Added basic subnet bans 2020-01-09 12:03:45 -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
Anuken
2345b48e97 Merge remote-tracking branch 'origin/master' 2020-01-08 23:35:27 -05:00
Anuken
50355b45d5 Tech tree balance 2020-01-08 23:28:25 -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
7b4ee27fe4 Bugfixes 2020-01-08 11:37:12 -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
Patrick 'Quezler' Mounier
406c11a14d Make rebuildable a block attribute (#1338) 2020-01-08 10:28:28 -05:00
Jeff Huang
105aeade1f Add zh-tw translations for Steam metadata. (#1288)
* Add zh-tw translations for Steam metadata.

* Updated language name to fit Steam requirements

Co-authored-by: Anuken <arnukren@gmail.com>
2020-01-08 10:27:50 -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