mirrors/Mindustry
1
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2026-03-29 10:10:42 -07:00
Code Issues Projects Releases Wiki Activity
9277 commits 4 branches 183 tags 2.4 GiB
Commit graph

3704 commits

Author SHA1 Message Date
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
Patrick 'Quezler' Mounier
5f047603bf
Revert "Blend prototype" 
This reverts commit 35afc94d34.

# Conflicts:
#	core/assets/sprites/sprites.png
 2020-01-08 12:17:28 +01:00
Patrick 'Quezler' Mounier
5c485eff04
Ressurect OG corner 2020-01-08 10:58:05 +01:00
Patrick 'Quezler' Mounier
0f2f8f2411
Revert "Stash cursed loading dock" 
This reverts commit 9bdf475049.
 2020-01-08 10:42:34 +01:00
Patrick 'Quezler' Mounier
9bdf475049
Stash cursed loading dock 2020-01-08 10:41:09 +01:00
Patrick 'Quezler' Mounier
35afc94d34
Blend prototype 2020-01-08 10:27:06 +01:00
Rasangus
44e745ac37 Update bundle_pt_BR.properties (#1281) 2020-01-07 19:42:48 -05:00
Anuken
3ae8065cf1 Merge 2020-01-06 17:20:16 -05:00
Patrick 'Quezler' Mounier
9b55eeaa38
Rename batches to something simpler 2020-01-06 18:04:56 +01:00
Patrick 'Quezler' Mounier
1a177ef239
Rephase dotted 2020-01-06 18:00:43 +01:00
Patrick 'Quezler' Mounier
207d95dbd8
Refractor away throughput stat 2020-01-06 17:57:14 +01:00
Patrick 'Quezler' Mounier
6b3dc669eb
Merge branch 'master' into crater 2020-01-06 17:37:47 +01: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
Patrick 'Quezler' Mounier
c6299c8f2c
Add throughput stat entry 2020-01-05 15:28:28 +01:00
Patrick 'Quezler' Mounier
095c65f36c
Remove crater from bundle 2020-01-04 21:10:09 +01:00
Patrick 'Quezler' Mounier
e2d0ab5161
Move bundle entries around 2020-01-03 17:42:05 +01:00
Patrick 'Quezler' Mounier
73040de839
Change bundle description 2020-01-03 17:41:05 +01:00
Patrick 'Quezler' Mounier
f6af699428
Revert "🎩" 
This reverts commit 10e4268dd5.

# Conflicts:
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
 2020-01-03 17:26:19 +01:00
Patrick 'Quezler' Mounier
0b0007502f
Revert "Differentiate texture from armored conveyor" 
This reverts commit 59451fcc0b.
 2020-01-03 17:09:13 +01:00
Patrick 'Quezler' Mounier
59451fcc0b
Differentiate texture from armored conveyor 
By removing the turtleshell it looks less armored while still somewhat high-tech (ish)
 2020-01-03 17:09:06 +01:00
Vanguard
2e114d09ea
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-03 07:27:50 +03:00
Patrick 'Quezler' Mounier
f0bfe24008
Remove crater bundle entry 2020-01-02 21:34:56 +01:00
Patrick 'Quezler' Mounier
0ae6527584
Sacrifice hivemind to convert craters to drawings 
Sad, yes, but crater units would never sync well over the net in its current state, so faking them unto conveyors is the only real option.

Forgive me future ai overlord <3
 2020-01-02 21:29:19 +01:00
Patrick 'Quezler' Mounier
10e4268dd5
🎩 
Leaving this here until it gets merged or something :)
 2020-01-02 09:02:37 +01:00
Vanguard
b44b0f9992
3 changed lines 
quit.confirm.tutorial
setting.coreselect.name
public.confirm
 2020-01-01 18:41:21 +03:00
Patrick 'Quezler' Mounier
1bcfc69206
Tweak stat pages 2020-01-01 14:01:54 +01:00