16055 Commits
Author SHA1 Message Date
Anuken 3102931cb4 Removed script wrapper 2020-02-11 17:50:16 -05:00
Anuken fb302d49c7 Improved battery brightness display / Palette tweak / Diffgen buff 2020-02-11 17:27:33 -05:00
AnukenandGitHub a4a3e7fc48 Merge pull request #1514 from Arkanic/patch-7
make batteries glow based on power contents (a redo that works)
2020-02-11 16:31:14 -05:00
Anuken eb87e5f265 Single-script mod case 2020-02-11 16:14:01 -05:00
AnukenandGitHub 9c2569d4f5 Merge pull request #1477 from DeltaNedas/patch-5
controlled script loading
2020-02-11 16:03:38 -05:00
Anuken ce3f4ed0fb Merge remote-tracking branch 'origin/master' 2020-02-11 15:54:23 -05:00
Anuken 1b94eed9d3 Fixed conveyors blending with enemy teams 2020-02-11 15:54:16 -05:00
AnukenandGitHub aafecfebbb Merge pull request #1468 from Prosta4okua/patch-7
Update bundle_uk_UA.properties
2020-02-11 15:45:12 -05:00
AnukenandGitHub 5bbe4af71b Merge pull request #1466 from Vam-Jam/PlayerList
[Added] Dedicated Players command
2020-02-11 15:45:02 -05:00
AnukenandGitHub 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-IlaandGitHub 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
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
AmateurPotionandGitHub 5611a8684c Update bundle_ko.properties (#1490)
* Update bundle_ko.properties

Finish! yeeeee!

* Update bundle_ko.properties
2020-02-11 15:33:25 -05:00
LauweJosterandGitHub f06550fc3c Update bundle_nl.properties (#1501)
Grammar and sentence improvements. Also added translations
2020-02-11 15:32:18 -05:00
Ali-C-IlaandGitHub 652c143ff6 Update bundle_zh_TW.properties (#1519) 2020-02-11 15:25:53 -05:00
RasangusandGitHub 64ade54336 Update bundle_pt_BR.properties (#1525) 2020-02-11 15:25:38 -05:00
kf-gamesandGitHub e6507a84ef Update Servers.json, Add PvP server MINDUSTRY.RU:7000 (#1533)
Add PvP server MINDUSTRY.RU:7000
2020-02-11 15:25:30 -05:00
ArkanicandGitHub 91148a7fde oops wrong branch 2020-02-12 08:04:35 +13:00
ArkanicandGitHub e02f370228 Update README.md 2020-02-12 08:01:49 +13: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 e173eb55ca Merge remote-tracking branch 'origin/master' 2020-02-11 11:30:25 -05:00
Anuken d6b5f6a311 buildTable improvements 2020-02-11 11:30:22 -05:00
Petr Gašparík bd6b84dc23 Merge branch 'master' of https://github.com/Anuken/Mindustry into v103.3 2020-02-11 17:20:40 +01:00
AmateurPotionandGitHub eaa0b53f30 Update README.md (#1548)
hey?
2020-02-11 11:13:26 -05:00
fuzzbuckandGitHub 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
GioIacca9andGitHub 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