mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-20 17:28:14 +07:00
Code Issues Packages Projects Releases Wiki Activity
6,133 Commits 4 Branches 160 Tags 2.3 GiB
bb380f7feb
Commit Graph

6133 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuken
bb380f7feb Fixed #1555 2020-02-11 23:15:51 -05:00
Anuken
03fe3a04ba
Merge pull request #1553 from heckelson/patch-1 
translated; spelling errors, odd phrases removed
 2020-02-11 21:42:09 -05:00
Alexander H
68e403557a
translated; spelling errors, odd phrases removed 
I've gone through the German translation file looking for missing translations, which I provided, as well as spelling errors and odd phrases, which I continued to remove. I also replaced every [LIGHT_GRAY] tag with [lightgray] for uniformity.
 2020-02-12 01:46:13 +01:00
Anuken
c5b88c2763 Added changelogs 2020-02-11 18:59:09 -05:00
Anuken
0cbd9a1fcc Removed redundant file move code 2020-02-11 18:03:17 -05:00
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
Anuken
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
Anuken
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
Anuken
aafecfebbb
Merge pull request #1468 from Prosta4okua/patch-7 
Update bundle_uk_UA.properties
 2020-02-11 15:45:12 -05:00
Anuken
5bbe4af71b
Merge pull request #1466 from Vam-Jam/PlayerList 
[Added] Dedicated Players command
 2020-02-11 15:45:02 -05:00
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
kf-games
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
Arkanic
91148a7fde
oops wrong branch 2020-02-12 08:04:35 +13:00
Arkanic
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
AmateurPotion
eaa0b53f30
Update README.md (#1548) 
hey?
 2020-02-11 11:13:26 -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
GioIacca9
941449c502 Updated "Full implementation of #1494" (#1541) 2020-02-09 22:26:47 -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
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
Prosta4okua
d7eb0d3ba3 Update bundle_uk_UA.properties 2020-02-08 12:23:50 +02:00
Anuken
3a2fef3bd7 Merge remote-tracking branch 'origin/master' 2020-02-07 20:52:03 -05:00
Anuken
9ccf95971e Fixed small launch items button 2020-02-07 20:51:59 -05:00
valtsu41
9b36125b0c
Finnish translation & grammar update (#1473) 
* Finnish translation & grammar update

* More grammar correcting and making things more native

* Just a little more fine-tuning

* Fixes
 2020-02-07 20:42:14 -05:00
Anuken
0ffcd0b94c Fixed #1507 / Fixed #1504 2020-02-07 20:21:45 -05:00
Anuken
a6801af128 Use zip files when exporting 2020-02-07 20:11:43 -05:00
Anuken
30ea039246 Fixed #1521 2020-02-07 20:11:05 -05:00
Anuken
5a5945cc52 Merge remote-tracking branch 'origin/master' 2020-02-07 20:09:45 -05:00
Anuken
e5fd3dec4c Fixed #1526 2020-02-07 20:09:37 -05:00
扩散性百万甜面包
7b586ea043
Fix a typo (#1528) 
* Fix a typo

* Update core/src/mindustry/mod/Mods.java

Co-Authored-By: Patrick 'Quezler' Mounier <Quezler@me.com>

Co-authored-by: Patrick 'Quezler' Mounier <Quezler@me.com>
 2020-02-07 08:25:26 -05:00