mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-03-12 10:59:22 +07:00
Code Issues Packages Projects Releases Wiki Activity
6,245 Commits 4 Branches 160 Tags 2.3 GiB
8550995c4e
Commit Graph

6245 Commits

Author SHA1 Message Date
Anuken
8550995c4e Fixed compilation 2020-03-10 19:51:31 -04:00
Anuken
f63d1874c2 Merge remote-tracking branch 'origin/master' 2020-03-09 09:41:51 -04:00
Anuken
d7f9090c0b Fixed 2020-03-09 09:41:39 -04:00
DeltaNedas
9ef394a99e
set current mod to required mod () 
or you will need to prefix mod name in requires of the required mod
instead you now need to prefix current mods name after youve required from another mod
 2020-03-07 22:47:12 -05:00
Anuken
7aa71f38c3 Merge remote-tracking branch 'origin/master' 2020-03-07 14:36:50 -05:00
Anuken
8b3d64a29a Better error detection 2020-03-07 14:36:47 -05:00
Anuken
89a5c957fd
add mod name to js print() () 
* add mod name to js print()

* add mod name to errors
 2020-03-05 15:58:10 -05:00
Anuken
0534a4da45
Update bundle_zh_TW.properties () 2020-03-04 13:53:54 -05:00
Anuken
31c9b61358
Updated join.info () 2020-03-04 13:53:47 -05:00
Anuken
ff44b0ca85
Small RU fix () 2020-03-04 13:53:27 -05:00
Anuken
a36a0cad53
RU updates to Android description () 2020-03-04 13:53:19 -05:00
Anuken
0dfb3b1c1b
Update achievements.vdf () 
* Update achievements.vdf

* Update achievements.vdf

* Update achievements.vdf

Co-authored-by: Anuken <arnukren@gmail.com>
 2020-03-04 13:53:12 -05:00
Anuken
c7112a706a
Update bundle_uk_UA.properties () 
* Update bundle_uk_UA.properties

* Update uk metadata

* Update uk bundles

* Update achievemnts
 2020-03-04 13:52:20 -05:00
Anuken
2684a960fa
Create 104.4 () 
* Create 104.4

* Update 104.4
 2020-03-04 13:52:02 -05:00
Anuken
a5e07bfd29
Created fastlane/metadata/android/ru-RU/changelogs () 
* Created fastlane/metadata/android/ru-RU/changelogs

104.4.txt

* Update 104.4.txt
 2020-03-04 13:51:56 -05:00
Patrick 'Quezler' Mounier
3b2b7be72a
Remove nested app.post () 2020-03-04 11:58:16 -05:00
Anuken
c96427c722 Bugfixes 2020-03-04 09:01:41 -05:00
Anuken
503607e36a Fixed 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 () 
Updated data.import.confirm lane
 2020-03-03 10:36:34 -05:00
fuzzbuck
8e9dabb350
Add "pardon" command for votekicks () 
* 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 () 
* Added AA ffa to server list

* Changed ip to use custom domain
 2020-03-02 10:40:50 -05:00
Aldas
d3b7dd973f
Grammar corrections () 
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 () 2020-03-01 21:09:08 -05:00
Vanguard
cdf8514ac8
RU updates () 
* 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 () 2020-03-01 21:04:07 -05:00
AmateurPotion
a6ddb1d187
Update bundle_ko.properties () 2020-03-01 21:03:41 -05:00
StarMiner99
4c28c30228
[Lang] Changed some nl Translations () 
* 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 () 
* 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 () 
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 () 
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 () 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 () 2020-02-24 15:06:33 -05:00
Ali-C-Ila
251877f561
Update bundle_zh_TW.properties () 
* 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? () 2020-02-24 11:44:39 -05:00
soytheLB
c989504bf6
Update bundle_es.properties () 
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 () 2020-02-23 10:34:53 -05:00