Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,303 Commits 4 Branches 180 Tags
e8eecf8a1fa4a5ca1663447df31b4f80dc7cce7b
Commit Graph

6249 Commits

Author SHA1 Message Date
Anuken
de9a14c903 Czech translation for 103.x changelog (#1455) 
* Czech translation for 103.x changelog

* Czech translation - mod display

* Czech translation - fix typos

* Czech: added Time played + small format corr.

* Czech for server categories!
 2020-02-11 15:40:33 -05:00
Ali-C-Ila
5ab47f4fe0 Update bundle_zh_TW.properties (#1454) 
* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties
 2020-02-11 15:40:24 -05:00
Vanguard
435860eda4 RU updates (#1442) 
* 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

* 3 new lines, 2 removed lines

New:
setting.bridgeopacity.name
block.liquid-void.name
block.liquid-void.description

Removed:
block.signal
block.editsignal

* 1 new line

data.openfolder

* 1 changed line

block.cryofluidmixer.description

* 2 new lines

block.underflow-gate.name
block.underflow-gate.description

* 2 changed lines

unit.thousands
unit.millions

* 3 new lines

blocks.tiles
blocks.affinities
setting.playerlimit.name

* 1 changed line

block.underflow-gate.name

* 1 changed line

unit.thousands

* 1 changed line

blocks.affinities

* 1 changed line (reverted)

unit.thousands

* Update bundle_ru.properties

* 1 new line

mod.display

* 1 changed line

techtree

* 1 changed line (new approach)

techtree

* 1 changed line

editor.generate

* 1 new line

stat.playtime

* 3 new lines

servers.local
servers.remote
servers.global

* 3 changed lines

servers.local
servers.remote
servers.global

Co-authored-by: Anuken <arnukren@gmail.com>
Co-authored-by: Prosta4okua <31485341+Prosta4okua@users.noreply.github.com>
 2020-02-11 15:40:17 -05:00
AmateurPotion
5611a8684c Update bundle_ko.properties (#1490) 
* Update bundle_ko.properties

Finish! yeeeee!

* Update bundle_ko.properties
 2020-02-11 15:33:25 -05:00
LauweJoster
f06550fc3c Update bundle_nl.properties (#1501) 
Grammar and sentence improvements. Also added translations
 2020-02-11 15:32:18 -05:00
Ali-C-Ila
652c143ff6 Update bundle_zh_TW.properties (#1519) 2020-02-11 15:25:53 -05:00
Rasangus
64ade54336 Update bundle_pt_BR.properties (#1525) 2020-02-11 15:25:38 -05:00
Anuken
5aa1e30006 Bugfix 2020-02-11 13:08:42 -05:00
Anuken
ad7c72015c Better admin management 2020-02-11 13:06:52 -05:00
Anuken
d99f9740e8 USID fixes 2020-02-11 12:36:28 -05:00
Anuken
d1840e7c2a Item selection scrolling 2020-02-11 11:55:38 -05:00
Anuken
d6b5f6a311 buildTable improvements 2020-02-11 11:30:22 -05:00
fuzzbuck
f14df52490 Allow admins to bypass the playerlimit [server] (#1549) 2020-02-11 11:10:50 -05:00
Petr Gašparík
29a6b1a8da Merge branch 'master' of https://github.com/Anuken/Mindustry into v103.3 2020-02-11 11:18:54 +01:00
Anuken
b15a40fcbd Cleanup / Fixed desktop IDs resetting 2020-02-10 23:26:22 -05:00
Anuken
9da2d1ee9a Merge remote-tracking branch 'origin/master' 2020-02-10 20:22:09 -05:00
Anuken
6882a9a355 Added persistent message server function 2020-02-10 20:22:03 -05:00
Anuken
47023af3d5 cleanup 2020-02-10 15:51:01 -05:00
Anuken
86d5842868 Testing new quadtree 2020-02-10 11:29:58 -05:00
Anuken
81990cf16c Optimizations 2020-02-10 11:07:10 -05:00
Anuken
6c6861a97a Cleanup 2020-02-10 10:47:21 -05:00
Anuken
0ad8408ba9 Collisions, lots of bugfixes 2020-02-10 09:58:00 -05:00
Anuken
fbadb9f4aa Group collisions 2020-02-10 09:22:19 -05:00
Patrick 'Quezler' Mounier
4bb9a93ff9 Do as i say, ¬ do as i do 2020-02-10 13:14:48 +01:00
Patrick 'Quezler' Mounier
ac3ab6971d Undo the last 5 2020-02-10 13:11:49 +01:00
Patrick 'Quezler' Mounier
66c81246b6 Fix single tile check if blendbit is 0 2020-02-10 13:02:21 +01:00
Patrick 'Quezler' Mounier
656c37372d Wrap upstream tile thingie 2020-02-10 12:57:21 +01:00
Patrick 'Quezler' Mounier
b89078733e Revert "Stash revertable" 
This reverts commit 158241b8e2.
 2020-02-10 12:49:44 +01:00
Patrick 'Quezler' Mounier
158241b8e2 Stash revertable 2020-02-10 12:49:36 +01:00
Patrick 'Quezler' Mounier
2bd7c92b9e Allow sideloading the unloader 
Main reason for blendbits > 1 & 2
 2020-02-10 12:38:48 +01:00
Patrick 'Quezler' Mounier
562fa07755 Merge branch 'master' into crater 2020-02-10 12:09:14 +01:00
Anuken
e9b066b866 Fires, puddles, feature reimplementations 2020-02-09 23:43:08 -05:00
Anuken
3feca9bbf8 Minor tweaks 2020-02-09 22:27:16 -05:00
GioIacca9
941449c502 Updated "Full implementation of #1494" (#1541) 2020-02-09 22:26:47 -05:00
Anuken
d89189debd Fixed server 2020-02-09 15:40:03 -05:00
Anuken
ae7a8e1f65 Minor tweaks 2020-02-09 14:35:22 -05:00
Anuken
c23e923ffb Merged with master 2020-02-09 12:32:29 -05:00
Anuken
a2706a80b1 Merged with master 2020-02-09 12:27:44 -05:00
Anuken
d2ab316072 ?? 2020-02-09 12:25:13 -05:00
Anuken
f9bc4a30f0 Merge 2020-02-09 12:16:12 -05:00
Anuken
d45d7f21b6 Procedural scorch marks / Bugfixes 2020-02-09 12:07:36 -05:00
Anuken
8e976c20a1 Hitbox fixes 2020-02-08 23:00:26 -05:00
Anuken
e23119e330 Feature re-implementations 2020-02-08 21:54:41 -05:00
Daniel Jennings
baab36bfc5 Trim schematic string before calling Base64Decoder (#1537) 
This fixes getting the "Length of Base64 encoded input string is not a multiple of 4." error when importing schematics that have whitespace at the start/end of them, which is easy to accidentally have without knowing by when copying the schematic codes from random different web pages.
 2020-02-08 16:41:33 -05:00
Anuken
5169e197b6 Bugfixes 2020-02-08 16:00:54 -05:00
Anuken
ba1f59aa71 Better physics 2020-02-08 15:39:27 -05:00
Anuken
8814dbe29a Sprite cleanup / Bullets 2020-02-08 14:48:04 -05:00
Anuken
f46be924b9 Effects, collisions, method overrides 2020-02-08 13:14:23 -05:00
Anuken
f3893533a4 Cleanup 2020-02-08 11:08:31 -05:00
Prosta4okua
0a53c4c1be Update bundle_uk_UA.properties 2020-02-08 12:26:09 +02:00