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

5265 Commits

Author SHA1 Message Date
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
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
Anuken
6e5d506a35 Stub implementation of action filters 2020-01-08 09:37:18 -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
Anuken
f8f3ecd451 Merge remote-tracking branch 'origin/master' 2020-01-07 20:15:09 -05:00
Anuken
f4a819ba28 Fixed text wrapping for credits in Russian 2020-01-07 20:14:11 -05:00
Rasangus
44e745ac37 Update bundle_pt_BR.properties (#1281) 2020-01-07 19:42:48 -05:00
Anuken
c183b2dac4 Fixed incorrect variable usage 2020-01-07 15:54:51 -05:00
Anuken
1f3bab5fa3 Added untested rate limits 2020-01-07 14:16:48 -05:00
Anuken
3e0556de05 Merge remote-tracking branch 'origin/master' 2020-01-07 10:32:39 -05:00
Anuken
7a71468388 Updated arc hash just in case 2020-01-07 10:32:34 -05:00
DeltaNedas
b0d65dcedb let mechs override drawStats and do custom power cell stuff (#1309) 
* let mechs override drawStats and do custom power cell stuff

* Update Player.java

* Update Mech.java

* Update Player.java
 2020-01-07 09:30:18 -05:00
Patrick 'Quezler' Mounier
8fc84fad0a Scale foobar correctly with different capacities 2020-01-07 10:48:31 +01:00
Patrick 'Quezler' Mounier
12c3b22b7c Fix poofing ¬ working if conveyor was backed up 2020-01-07 10:44:37 +01:00
Patrick 'Quezler' Mounier
252817abb7 Bar 2020-01-07 10:33:58 +01:00
Patrick 'Quezler' Mounier
781fbb6255 Foo 2020-01-07 10:33:04 +01:00
Patrick 'Quezler' Mounier
add19ed7f1 Start rotating 50% through reload 2020-01-07 10:17:24 +01:00
Anuken
81602dc3d5 Cleanup 2020-01-07 00:25:33 -05:00
Anuken
b730cd52d5 GL cleanup 2020-01-06 23:47:29 -05:00
Anuken
7f23803db1 Visual changes 2020-01-06 16:25:08 -05:00
Patrick 'Quezler' Mounier
ecae603f50 Prevent (world border) crash 
Learned my lesson from the diode :)
 2020-01-06 18:13:40 +01:00
Patrick 'Quezler' Mounier
0b3d4da92d Block trading 2020-01-06 18:12:10 +01:00
Patrick 'Quezler' Mounier
6e8ba927dd Final cleanup before the draft phase ends ❤️ 2020-01-06 18:09:19 +01: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
78951113d6 Remove maxunits stat entry 2020-01-06 17:55:02 +01:00
Patrick 'Quezler' Mounier
58e5931b83 Fix caveat of 〃 2020-01-06 17:51:12 +01:00
Patrick 'Quezler' Mounier
9891e971ea Only unload if its ¬ the tile it spawned on 
¬ loading if it both start & end plays weird
¬ unloading if it both start & end plays weird
——
so only unloading if the origin tile is ¬ the unload tile is the only smooth option

sadly this does block player feeding the conveyor at the last tile in the chain
 2020-01-06 17:47:22 +01:00
Patrick 'Quezler' Mounier
6b3dc669eb Merge branch 'master' into crater 2020-01-06 17:37:47 +01:00
Patrick 'Quezler' Mounier
dd3c4d06ac Mass driver place range assist (#1331) 2020-01-06 11:32:18 -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
Patrick 'Quezler' Mounier
c6299c8f2c Add throughput stat entry 2020-01-05 15:28:28 +01:00
Patrick 'Quezler' Mounier
76fa8bef81 Add fixme 2020-01-05 10:37:32 +01:00
Patrick 'Quezler' Mounier
2ce30ece6c Prevent smoke while placing 2020-01-05 10:35:15 +01:00
Patrick 'Quezler' Mounier
2b4401c753 Prevent accepting items from the front 2020-01-05 10:32:58 +01:00