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

6279 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuken
c96427c722 Bugfixes 2020-03-04 09:01:41 -05:00
Anuken
503607e36a Fixed #1661 2020-03-04 08:39:48 -05:00
Anuken
64c1800391 Merge remote-tracking branch 'origin/master' 2020-03-03 12:11:49 -05:00
Anuken
2a191a45be Cleanup 2020-03-03 12:11:47 -05:00
Anuken
e8823fab36 More concise stream class 2020-03-03 12:11:35 -05:00
Aldas
cdb8682d43 Updated data.import.confirm lane (#1658) 
Updated data.import.confirm lane
 2020-03-03 10:36:34 -05:00
fuzzbuck
8e9dabb350 Add "pardon" command for votekicks (#1570) 
* Add "pardon" command

Allows players who have been incorrectly votekicked to join again

* isn't hasn't

* getInfoOptional & space

* pardon me

no pun intended

* Update ServerControl.java
 2020-03-02 13:37:04 -05:00
Anuken
ceac809c1d Cleanup 2020-03-02 10:44:56 -05:00
Recessive
b512169d44 Added AA ffa to server list (#1605) 
* Added AA ffa to server list

* Changed ip to use custom domain
 2020-03-02 10:40:50 -05:00
Aldas
d3b7dd973f Grammar corrections (#1656) 
Grammar and logic corrections
 2020-03-02 10:02:56 -05:00
Anuken
f88fe898ff Updated bundle 2020-03-01 21:23:50 -05:00
Lapis+
d93ca520ae Update bundle_ja.properties (#1578) 2020-03-01 21:09:08 -05:00
Vanguard
cdf8514ac8 RU updates (#1584) 
* 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

* 1 changed line

setting.pixelate.name

* 1 line removed

schematic.replace

* 1 new line

rules.solarpowermultiplier

* 2 changed lines

unit.thousands
unit.millions

Co-authored-by: Anuken <arnukren@gmail.com>
Co-authored-by: Prosta4okua <31485341+Prosta4okua@users.noreply.github.com>
 2020-03-01 21:06:16 -05:00
Dexapnow
62c7b5f691 Update bundle_pl.properties (#1643) 2020-03-01 21:04:07 -05:00
AmateurPotion
a6ddb1d187 Update bundle_ko.properties (#1629) 2020-03-01 21:03:41 -05:00
StarMiner99
4c28c30228 [Lang] Changed some nl Translations (#1626) 
* fixed translations till line 180

fixed nl translations

* Fixed most nl translations

* small fixes

suggested by Quezler
 2020-03-01 21:03:00 -05:00
Anuken
c3a790bfd2 2 2020-03-01 16:29:04 -05:00
Anuken
7d84300c31 Updated arc 2020-03-01 16:22:38 -05:00
Anuken
ab7e840eee Cleanup 2020-03-01 16:20:42 -05:00
Anuken
6f5815abc8 Merge remote-tracking branch 'origin/master' 2020-03-01 12:34:07 -05:00
Anuken
c59a3116ad Better JNI error checking (**needs recompilation**) 2020-03-01 12:34:01 -05:00
Aldas
bcc901b3ef Add bundle_lt.properties for lithuanian translation (#1650) 
* Create bundle_lt.properties file

Translated first 480 lines. Soon other half will be translated

* Update bundle_lt.properties

* Update bundle_lt.properties

* Update bundle_lt.properties

* Update bundle_lt.properties

* Update bundle_lt.properties
 2020-02-29 09:02:45 -05:00
b1tt
56b2b8ed79 gp ru full_description.txt grammar fix (#1645) 
unnecessary comma ig
 2020-02-28 15:47:28 -05:00
Anuken
38ab1473f2 Backport of fixed lighting + overflow crash fix 2020-02-28 13:46:16 -05:00
Anuken
bc7671b08d Merge remote-tracking branch 'origin/master' 2020-02-27 10:08:19 -05:00
Anuken
709bd4952f Added PC hardware flag 2020-02-27 10:08:09 -05:00
xaumex
c361e5c26d Update Silicon translation in spanish (#1639) 
Silicone (en) = Silicona (es)
Silicon (en) = Silicio (es)
 2020-02-26 11:01:56 -05:00
Patrick 'Quezler' Mounier
8bbd8489e0 Remember scroll position when a new message gets added (#1638) 2020-02-25 12:06:18 -05:00
Anuken
5f8a0ec12e Tweaks 2020-02-25 10:04:37 -05:00
DeltaNedas
0c01554a6b add floatf/p and func to global.js (#1633) 2020-02-24 15:06:33 -05:00
Ali-C-Ila
251877f561 Update bundle_zh_TW.properties (#1579) 
* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties
 2020-02-24 11:46:20 -05:00
Patrick 'Quezler' Mounier
ce1884512d Null the block as well? (#1630) 2020-02-24 11:44:39 -05:00
soytheLB
c989504bf6 Update bundle_es.properties (#1624) 
Corrected some misspellings.
Added warning text in router.
Changed description of alloy smelter to keep with the translated name of surge alloy.
Added a missed dot from my previous translation.
 2020-02-23 10:44:09 -05:00
Patrick 'Quezler' Mounier
e592d6fe52 Add nydus to global server list (#1625) 2020-02-23 10:34:53 -05:00
Anuken
91f2eaf53a Bugfixes 2020-02-22 20:02:41 -05:00
Anuken
c8a762df42 Minor assignment tweak 2020-02-22 19:53:14 -05:00
Anuken
66bcb294fb Update issue templates 2020-02-22 19:35:14 -05:00
Anuken
501e909039 Merge remote-tracking branch 'origin/master' 2020-02-22 19:32:10 -05:00
Anuken
2cd69230e0 Changed feathub link 2020-02-22 19:32:01 -05:00
Anuken
ae66ca468d Update README.md 2020-02-22 19:30:02 -05:00
Anuken
0846198721 Updated issue templates 2020-02-22 19:25:05 -05:00
GioIacca9
47618ac21f Translated #1593 (#1621) 2020-02-22 10:33:22 -05:00
Patrick 'Quezler' Mounier
f891c42847 Remove bundle key space (#1619) 2020-02-22 08:43:54 -05:00
Petr Gašparík
0a98597ad0 Czech translation - sync with v104 (#1612) 
* Czech translation - sync with changes

* Czech translation - sync with updates

* Czech translation - small fix
 2020-02-21 16:27:05 -05:00
Patrick 'Quezler' Mounier
b7a8fa4191 Fix typo in banned comment (#1617) 2020-02-21 13:49:15 -05:00
DeltaNedas
fe22d334dc Separate ambient light and solar panel efficiency (#1593) 
* new branch

* Separate ambient light and solar panel efficiency

* Made ambient light -> solar efficiency default
 2020-02-21 11:38:56 -05:00
bobthebadguy
de560ac6f8 Fixed small typo (#1613) 
Now there are 70 pull requests.
 2020-02-21 09:58:11 -05:00
Patrick 'Quezler' Mounier
ff652f2515 +1 technical correctness (#1615) 2020-02-21 09:57:48 -05:00
Anuken
abec83a3e1 Merge pull request #1611 from Dexapnow/patch-1 
Update bundle_pl.properties
 2020-02-20 10:46:37 -05:00
Dexapnow
23e4d1dd84 Update bundle_pl.properties 2020-02-20 14:05:38 +01:00