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

2881 Commits

Author SHA1 Message Date
Anuken
26676d60e1 Added underflow gates 2020-01-20 18:54:25 -05:00
Anuken
27d6bf067e Added prototype planet sector land system 2020-01-20 12:05:26 -05:00
Anuken
85cf7e9d5c Added previously-missing icons 2020-01-19 18:45:25 -05:00
Anuken
c0844304a6 Merge 2020-01-19 11:10:14 -05:00
Anuken
47695f1f8c Added accurate planet generation 2020-01-18 13:24:14 -05:00
Anuken
f044f30829 Merge 2020-01-18 11:16:03 -05:00
Anuken
95352e1729 Added server descriptions 2020-01-18 10:05:18 -05:00
Anuken
6e6f8f3cdb Icon cleanup 2020-01-17 22:50:27 -05:00
Anuken
ca519a94af Font improvements 2020-01-17 18:29:18 -05:00
Anuken
8d61ddbbd4 Added chat icons for in-game items and blocks 2020-01-17 18:08:23 -05:00
Anuken
d9e5dc8ba2 Added missing icons 2020-01-17 15:24:34 -05:00
Anuken
c3d2351b2d Various icon changes 2020-01-17 13:57:04 -05:00
Anuken
4f29c80814 Single-texture font+UI packing 2020-01-16 22:25:57 -05:00
Anuken
ce18e32826 Added font icon generate+merge pipeline 2020-01-16 17:05:20 -05:00
Anuken
3eaeac3618 Testing icon font 2020-01-16 11:10:53 -05:00
Anuken
ac66ac2c55 Merge remote-tracking branch 'origin/master' 2020-01-14 17:08:16 -05:00
Anuken
eaa86023f9 Visual tweaks 2020-01-14 17:07:39 -05:00
Petr Gašparík
9b663b548b Czech translation total revision DONE, please merge (#1344) 
* 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

* Czech tr. - revision up to line 670 done

* Czech tr. - revisited up to line 748.

* Czech tr. - now it has the same length as English

* Czech translation - polished up to line 1062
Only tutorial left...

* Czech translation - small fixes

* Czech tr. - revisited up to line 1070

* Czech translation - revision done up line 1084.
New: tutorial translated, new key incorporated.

* Czech translation done up to line 1100.

* Czech translation up to line 1105

* Czech translation - small corrections, consistency

* Czech translation up to line 1124

* Czech translation - done up to line 1159

* Czech translation up to line 1071

* Czech translation, up to line 1177

* Czech translation, done up to line 1203

* Czech translation REVISION DONE!
 2020-01-14 16:00:51 -05:00
Vanguard
4452c1b38a 1 changed line 
block.cryofluidmixer.description
 2020-01-12 23:33:59 +03:00
Vanguard
6243b9fa3a 1 new line 
data.openfolder
 2020-01-12 19:56:30 +03:00
Anuken
bbf87df373 a revelation 2020-01-11 23:41:12 -05:00
Anuken
7e7d2019af Made Android files external 2020-01-11 19:21:16 -05:00
Vanguard
9f743ce657 Merge branch 'master' into master 2020-01-11 14:44:27 +03:00
Vanguard
e1130bafc8 3 new lines, 2 removed lines 
New:
setting.bridgeopacity.name
block.liquid-void.name
block.liquid-void.description

Removed:
block.signal
block.editsignal
 2020-01-11 14:41:24 +03: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
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
f7791a2bb2 Merge; internal changes 2020-01-10 11:30:42 -05:00
GioIacca9
87442853bb Added setting.bridgeopacity.name (#1347) 2020-01-10 11:17:48 -05:00
Patrick 'Quezler' Mounier
ed765ad10a Merge branch 'master' into crater 
# 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
 2020-01-10 12:02:07 +01: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