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

6261 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuken
d346442e86 Changed "global" -> "community" servers 2020-03-26 12:39:54 -04:00
Anuken
3a7d3f4973 Merge remote-tracking branch 'origin/master' 2020-03-25 11:06:56 -04:00
Anuken
6cc2719ed7 Updated FBO method names 2020-03-25 11:06:52 -04:00
Dexapnow
d18697a504 Update bundle_pl.properties (#1742) 
Based of "missing tags"
 2020-03-24 11:18:06 -04:00
Anuken
a1b64900ab 2 2020-03-24 00:33:59 -04:00
Anuken
2b4ce01fac Updated arc 2020-03-24 00:25:36 -04:00
Anuken
52b6e756bc Fixed some issues with scaled ninepatches 2020-03-24 00:22:28 -04:00
Anuken
c4d5314a1a Color script fixes 2020-03-19 20:15:41 -04:00
Anuken
966321baca Merge remote-tracking branch 'origin/master' 2020-03-19 20:02:48 -04:00
Anuken
f2f39573bb Color cleanup 2020-03-19 20:02:43 -04:00
Anuken
71f20f928a Update build.gradle 2020-03-17 20:01:44 -04:00
Ali-C-Ila
0d19068219 Update bundle_zh_TW.properties (#1718) 
* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties
 2020-03-17 12:02:56 -04:00
TheJaaju
b0dddb2a7c Update bundle_fi.properties (#1720) 
added translations and fixed a typo
 2020-03-17 12:02:47 -04:00
Anuken
2250f2f0bc Stack trace 2020-03-16 01:08:45 -04:00
ma44
ec34e27102 map setting refund (#1709) 2020-03-15 14:02:47 -04:00
Anuken
6079980a50 Fixed content loading crash 2020-03-15 09:08:27 -04:00
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 #1672 2020-03-09 09:41:39 -04:00
DeltaNedas
9ef394a99e set current mod to required mod (#1684) 
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() (#1677) 
* 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 (#1665) 2020-03-04 13:53:54 -05:00
Anuken
31c9b61358 Updated join.info (#1666) 2020-03-04 13:53:47 -05:00
Anuken
ff44b0ca85 Small RU fix (#1670) 2020-03-04 13:53:27 -05:00
Anuken
a36a0cad53 RU updates to Android description (#1663) 2020-03-04 13:53:19 -05:00
Anuken
0dfb3b1c1b Update achievements.vdf (#1668) 
* 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 (#1636) 
* 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 (#1671) 
* Create 104.4

* Update 104.4
 2020-03-04 13:52:02 -05:00
Anuken
a5e07bfd29 Created fastlane/metadata/android/ru-RU/changelogs (#1669) 
* 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 (#1667) 2020-03-04 11:58:16 -05:00
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